Merge branch 'main' into windows

creek-service · Jan 31, 2024 · b707116 · b707116
2 parents c7304b0 + 7ce24e2
commit b707116
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -77,7 +77,6 @@ subprojects {
         testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion")
         testImplementation("org.hamcrest:hamcrest-core:$hamcrestVersion")
         testImplementation("com.google.guava:guava-testlib:$guavaVersion")
-        testImplementation("org.apache.logging.log4j:log4j-core:$log4jVersion")
         testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVersion")
         testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
     }

diff --git a/util/src/main/java/org/creekservice/api/test/util/TestPaths.java b/util/src/main/java/org/creekservice/api/test/util/TestPaths.java
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.FileVisitOption;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
@@ -94,6 +95,25 @@ public static Stream<Path> listDirectory(final Path path) {
         }
     }
 
+    /**
+     * List directory content, recursive.
+     *
+     * <p>Strictly speaking, the returned stream should have {@link Stream#close()} called on it.
+     *
+     * @param path the directory to list
+     * @param options the walk options
+     * @return stream of entries in the directory
+     */
+    @SuppressWarnings("resource")
+    public static Stream<Path> listDirectoryRecursive(
+            final Path path, final FileVisitOption... options) {
+        try {
+            return Files.walk(path, options).filter(p -> !path.equals(p));
+        } catch (final IOException e) {
+            throw new AssertionError("Failed to list directory: " + path, e);
+        }
+    }
+
     /**
      * Create a directory and all parent directories if they don't exist.
      *

diff --git a/util/src/test/java/org/creekservice/api/test/util/TestPathsTest.java b/util/src/test/java/org/creekservice/api/test/util/TestPathsTest.java
@@ -22,6 +22,7 @@
 import static org.creekservice.api.test.util.TestPaths.copy;
 import static org.creekservice.api.test.util.TestPaths.ensureDirectories;
 import static org.creekservice.api.test.util.TestPaths.listDirectory;
+import static org.creekservice.api.test.util.TestPaths.listDirectoryRecursive;
 import static org.creekservice.api.test.util.TestPaths.moduleRoot;
 import static org.creekservice.api.test.util.TestPaths.projectRoot;
 import static org.creekservice.api.test.util.TestPaths.readBytes;
@@ -121,6 +122,31 @@ void shouldThrowOnErrorListingDirectory() {
         assertThrows(AssertionError.class, () -> listDirectory(tempDir.resolve("I do not exist")));
     }
 
+    @Test
+    void shouldListDirectoryRecursively() {
+        // Given:
+        ensureDirectories(tempDir.resolve("child1/subChild1"));
+        write(tempDir.resolve("child2"), "some-content");
+        write(tempDir.resolve("child1/subChild2"), "some-content");
+
+        // When:
+        final Stream<Path> result = listDirectoryRecursive(tempDir);
+
+        // Then:
+        final List<String> children =
+                result.map(tempDir::relativize).map(Objects::toString).collect(Collectors.toList());
+        assertThat(
+                children,
+                containsInAnyOrder("child1", "child2", "child1/subChild1", "child1/subChild2"));
+    }
+
+    @Test
+    void shouldThrowOnErrorListingDirectoryRecursively() {
+        assertThrows(
+                AssertionError.class,
+                () -> listDirectoryRecursive(tempDir.resolve("I do not exist")));
+    }
+
     @Test
     void shouldEnsureDirectories() {
         // Given: