Add tests for resources with spaces in their path

Author: zakkak

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NativeImageResourceFileSystemProviderTest.java

@@ -26,6 +26,7 @@
 package com.oracle.svm.test;
 
 import static com.oracle.svm.test.NativeImageResourceUtils.RESOURCE_DIR;
+import static com.oracle.svm.test.NativeImageResourceUtils.RESOURCE_DIR_WITH_SPACE;
 import static com.oracle.svm.test.NativeImageResourceUtils.RESOURCE_EMPTY_DIR;
 import static com.oracle.svm.test.NativeImageResourceUtils.RESOURCE_FILE_1;
 import static com.oracle.svm.test.NativeImageResourceUtils.RESOURCE_FILE_2;
@@ -231,6 +232,20 @@ public void queryEmptyDir() {
         }
     }
 
+    /**
+     * Query a directory with spaces in its name
+     */
+    @Test
+    public void queryDirWithSpaces() {
+        Path dirWithSpaces = fileSystem.getPath(RESOURCE_DIR_WITH_SPACE);
+        try (Stream<Path> stream = Files.walk(dirWithSpaces)) {
+            Assert.assertEquals(1, stream.count());
+        } catch (IOException e) {
+            e.printStackTrace();
+            Assert.fail("IOException occurred during file system walk, starting from the root.");
+        }
+    }
+
     /**
      * Reading from file using {@link java.nio.channels.ByteChannel}.
      */

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NativeImageResourceTest.java

@@ -26,6 +26,7 @@
 package com.oracle.svm.test;
 
 import static com.oracle.svm.test.NativeImageResourceUtils.RESOURCE_DIR;
+import static com.oracle.svm.test.NativeImageResourceUtils.RESOURCE_DIR_WITH_SPACE;
 import static com.oracle.svm.test.NativeImageResourceUtils.RESOURCE_FILE_1;
 import static com.oracle.svm.test.NativeImageResourceUtils.RESOURCE_FILE_2;
 import static com.oracle.svm.test.NativeImageResourceUtils.RESOURCE_FILE_3;
@@ -131,6 +132,19 @@ public void classGetDirectoryResource() {
         resourceNameToURL(nonCanonicalResourceDirectoryName, false);
     }
 
+    @Test
+    public void classGetDirectoryWithSpaceResource() {
+        URL url1 = resourceNameToURL(RESOURCE_DIR_WITH_SPACE + "/", true);
+        Assert.assertTrue("The URL should end with slash!", url1.toString().endsWith("/"));
+
+        URL url2 = resourceNameToURL(RESOURCE_DIR_WITH_SPACE, true);
+        Assert.assertFalse("The URL should not end with slash!", url2.toString().endsWith("/"));
+        Assert.assertTrue("Two URLs must be the same!", compareTwoURLs(url1, url2));
+
+        String nonCanonicalResourceDirectoryName = RESOURCE_DIR_WITH_SPACE + "/./";
+        resourceNameToURL(nonCanonicalResourceDirectoryName, false);
+    }
+
     @Test
     public void registeredResourceDirectoryHasContent() throws IOException {
         URL directory = NativeImageResourceUtils.class.getResource(SIMPLE_RESOURCE_DIR);

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NativeImageResourceUtils.java

@@ -44,6 +44,7 @@ public class NativeImageResourceUtils {
     public static final String RESOURCE_DIR = "/resources";
     public static final String SIMPLE_RESOURCE_DIR = "/simpleDir";
     public static final String RESOURCE_EMPTY_DIR = RESOURCE_DIR + "/empty";
+    public static final String RESOURCE_DIR_WITH_SPACE = RESOURCE_DIR + "/dir with space";
     public static final String RESOURCE_FILE_1 = RESOURCE_DIR + "/resource-test1.txt";
     public static final String RESOURCE_FILE_2 = RESOURCE_DIR + "/resource-test2.txt";
     public static final String RESOURCE_FILE_3 = RESOURCE_DIR + "/resource-test3.html";
@@ -58,6 +59,7 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
             RuntimeResourceAccess.addResource(resourceModule, RESOURCE_DIR.substring(1));
             RuntimeResourceAccess.addResource(resourceModule, SIMPLE_RESOURCE_DIR.substring(1));
             RuntimeResourceAccess.addResource(resourceModule, RESOURCE_EMPTY_DIR.substring(1));
+            RuntimeResourceAccess.addResource(resourceModule, RESOURCE_DIR_WITH_SPACE.substring(1));
             RuntimeResourceAccess.addResource(resourceModule, RESOURCE_FILE_1.substring(1));
             RuntimeResourceAccess.addResource(resourceModule, RESOURCE_FILE_2.substring(1));
             RuntimeResourceAccess.addResource(resourceModule, RESOURCE_FILE_3.substring(1));

substratevm/src/com.oracle.svm.test/src/resources/dir with space/.mxkeep

@@ -0,0 +1 @@
+This file instructs mx to create a jar entry for the parent directory