Merge branch 'jruby-1_7'

jruby · Sep 23, 2015 · 437ecb2 · 437ecb2
2 parents 76b59c4 + 5302de7
commit 437ecb2
Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/core/src/test/java/org/jruby/util/URLResourceTest.java b/core/src/test/java/org/jruby/util/URLResourceTest.java
@@ -32,6 +32,18 @@ public void testDirectoryWithTrailingSlash(){
                 Arrays.asList(new String[] {".", "dir_without_listing", "dir_with_listing"}));
     }
 
+    public void testDirectoryWithTrailingSlash(){
+        String uri = Thread.currentThread().getContextClassLoader().getResource( "somedir" ).toExternalForm();
+        FileResource resource = URLResource.create((Ruby) null, "uri:" + uri + "/");
+
+        assertNotNull(resource );
+        assertFalse(resource.isFile());
+        assertTrue(resource.isDirectory());
+        assertTrue(resource.exists());
+        assertEquals(Arrays.asList(resource.list()),
+                Arrays.asList(new String[] {".", "dir_without_listing", "dir_with_listing"}));
+    }
+
     public void testNoneDirectory(){
         String uri = Thread.currentThread().getContextClassLoader().getResource( "somedir/dir_without_listing" ).toExternalForm();
         FileResource resource = URLResource.create((Ruby) null, "uri:" + uri, false);
@@ -83,6 +95,20 @@ public void testDirectoryWithTrailingClassloader()
         FileResource resource = URLResource.create((Ruby) null,
                 "uri:classloader:/somedir/", false);
 
+        assertNotNull(resource);
+        assertFalse(resource.isFile());
+        assertTrue(resource.isDirectory());
+        assertTrue(resource.exists());
+        assertEquals(Arrays.asList(resource.list()),
+                Arrays.asList(new String[]{".", "dir_without_listing",
+                        "dir_with_listing"}));
+    }
+
+    public void testDirectoryWithTrailingClassloader()
+    {
+        FileResource resource = URLResource.create((Ruby) null,
+                "uri:classloader:/somedir/");
+
         assertNotNull( resource );
         assertFalse( resource.isFile() );
         assertTrue( resource.isDirectory() );

diff --git a/maven/jruby-complete/src/it/integrity/verify.bsh b/maven/jruby-complete/src/it/integrity/verify.bsh
@@ -53,6 +53,7 @@ if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
 }
+
 File file = new File(basedir, "bin/.jrubydir");
 if ( !file.exists() )
 {