1466-instantiate-csv-data-as-rdf: Added tests for the FileUtils::listFiles methods.

Author: gpeb2

stack-clients/src/main/java/com/cmclinnovations/stack/clients/utils/FileUtils.java

@@ -73,15 +73,15 @@ public static boolean filterOnExtension(Path path, String extension) {
 
     public static Collection<URI> listFiles(URL dirURL, String fileExtension) throws IOException, URISyntaxException {
         return listFiles(dirURL).stream().filter(uri -> uri.toString().endsWith(fileExtension))
-                .collect(Collectors.toList());
+                .collect(Collectors.toSet());
     }
 
     public static Collection<URI> listFiles(URL dirURL) throws IOException, URISyntaxException {
         if (dirURL != null) {
             switch (dirURL.getProtocol()) {
                 case "file":
                     // A file path: easy enough
-                    return listFileFromPath(Path.of(dirURL.toURI()));
+                    return listFilesFromPath(Path.of(dirURL.toURI()));
                 case "jar":
                     // A JAR path
                     return listFilesFromJar(dirURL);
@@ -93,7 +93,7 @@ public static Collection<URI> listFiles(URL dirURL) throws IOException, URISynta
                 "Cannot load config files from URL '" + dirURL + "'. Only 'file' and 'jar' protocols are supported.");
     }
 
-    private static Set<URI> listFileFromPath(Path configDir) throws IOException {
+    private static Set<URI> listFilesFromPath(Path configDir) throws IOException {
         try (Stream<Path> stream = Files.list(configDir)) {
             return stream.map(Path::toUri).collect(Collectors.toSet());
         }

stack-clients/src/test/java/com/cmclinnovations/stack/clients/utils/FileUtilsTest.java

@@ -1,33 +1,34 @@
 package com.cmclinnovations.stack.clients.utils;
 
-import static org.junit.jupiter.api.Assertions.fail;
-
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-public class FileUtilsTest {
+class FileUtilsTest {
     @Test
-    public void testEnsureScriptsExecutable() {
+    void testEnsureScriptsExecutable() {
 
     }
 
     @Test
-    public void testSanitiseFilename() {
+    void testSanitiseFilename() {
         Path path = Paths.get("abc", "efg", "+Hello()World-123.csv");
-        Assert.assertEquals("_Hello__World_123.csv", FileUtils.sanitiseFilename(path));
+        Assertions.assertEquals("_Hello__World_123.csv", FileUtils.sanitiseFilename(path));
     }
 
     @Test
-    public void testFilterOnExtension() {
-        Assert.assertEquals(List.of(
+    void testFilterOnExtension() {
+        Assertions.assertEquals(List.of(
                 Paths.get("abc", "efg", "123.csv"),
                 Paths.get("abc", "efg", "345.csv")),
                 Stream.of(
@@ -39,8 +40,8 @@ public void testFilterOnExtension() {
     }
 
     @Test
-    public void testGetFileNameWithoutExtension() {
-        Assert.assertEquals(List.of(
+    void testGetFileNameWithoutExtension() {
+        Assertions.assertEquals(List.of(
                 "123", "345", "678"),
                 Stream.of(
                         Paths.get("abc", "efg", "123.csv"),
@@ -51,14 +52,55 @@ public void testGetFileNameWithoutExtension() {
     }
 
     @Test
-    public void testAppendDirectoryPath() throws URISyntaxException {
-        Assert.assertEquals(List.of(
-                "/dataset/123.csv", "/dataset/345.csv", "/dataset/678.csv"),
+    void testAppendDirectoryPath() throws URISyntaxException {
+        Assertions.assertEquals(Stream.of(
+                "dataset/123.csv", "dataset/345.csv", "dataset/678.csv")
+                .map(Path::of)
+                .collect(Collectors.toList()),
                 Stream.of(
                         new URI("123.csv"),
                         new URI("345.csv"),
                         new URI("678.csv"))
-                        .map(path -> FileUtils.appendDirectoryPath(path, "/dataset").toAbsolutePath().toString())
+                        .map(path -> FileUtils.appendDirectoryPath(path, "dataset"))
                         .collect(Collectors.toList()));
     }
+
+    private Collection<URI> getExpectedURIs(URL dirURL, Collection<String> expectedFiles)
+            throws URISyntaxException, IOException {
+        return expectedFiles.stream().map(file -> {
+            try {
+                return new URI(dirURL.toString() + "/" + file);
+            } catch (URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
+        }).collect(Collectors.toSet());
+    }
+
+    @Test
+    void listFilesFromPath() throws IOException, URISyntaxException {
+        URL dirURL = FileUtilsTest.class.getResource("files");
+        Collection<URI> expectedURIs = getExpectedURIs(dirURL, List.of("123.csv", "abc.txt"));
+        Assertions.assertEquals(expectedURIs, FileUtils.listFiles(dirURL));
+    }
+
+    @Test
+    void listFilesFromPathFiltered() throws IOException, URISyntaxException {
+        URL dirURL = FileUtilsTest.class.getResource("files");
+        Collection<URI> expectedURIs = getExpectedURIs(dirURL, List.of("123.csv"));
+        Assertions.assertEquals(expectedURIs, FileUtils.listFiles(dirURL, ".csv"));
+    }
+
+    @Test
+    void listFilesFromJar() throws IOException, URISyntaxException {
+        URL dirURL = new URL("jar", "", FileUtilsTest.class.getResource("files.jar").getPath() + "!/files");
+        Collection<URI> expectedURIs = getExpectedURIs(dirURL, List.of("123.csv", "abc.txt"));
+        Assertions.assertEquals(expectedURIs, FileUtils.listFiles(dirURL));
+    }
+
+    @Test
+    void listFilesFromJarFiltered() throws IOException, URISyntaxException {
+        URL dirURL = new URL("jar", "", FileUtilsTest.class.getResource("files.jar").getPath() + "!/files");
+        Collection<URI> expectedURIs = getExpectedURIs(dirURL, List.of("abc.txt"));
+        Assertions.assertEquals(expectedURIs, FileUtils.listFiles(dirURL, ".txt"));
+    }
 }