Merge pull request #2973 from gpbowman-git/master

headius · headius · commit 61ba53c2c0ba · 2015-07-07T18:19:01.000-05:00
This is a fix for bug ID 2964.  The URL to see the write up is here:
diff --git a/core/src/main/java/org/jruby/util/JRubyFile.java b/core/src/main/java/org/jruby/util/JRubyFile.java
@@ -120,7 +120,7 @@ private static FileResource createResource(Ruby runtime, String cwd, String path
 
     public static String normalizeSeps(String path) {
         if (Platform.IS_WINDOWS) {
-            return path.replace(File.separatorChar, '/');
+            return path.replace('/', File.separatorChar);
         } else {
             return path;
         }
diff --git a/core/src/test/java/org/jruby/test/TestKernel.java b/core/src/test/java/org/jruby/test/TestKernel.java
@@ -31,8 +31,7 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby.test;
 
-import java.util.ArrayList;
-
+import java.io.File;
 import org.jruby.Ruby;
 import org.jruby.RubyException;
 import org.jruby.RubyFixnum;
@@ -61,15 +60,17 @@ public void testLoad() throws Exception {
         assertEquals("load did not load the same file several times", "1", eval("load '../test/loadTest.rb'"));
     }
 
+
     public void testRequire() throws Exception {
+        char s = File.separatorChar;
         //reset the $loadTestvar
         eval("$loadTest = nil");
         assertEquals("failed to load the file test/loadTest", "0", eval("require '../test/loadTest'"));
         assertEquals("incorrectly reloaded the file test/loadTest", "", eval("require '../test/loadTest'"));
-
-        assertEquals("incorrect value for $\" variable", "true", eval("print $\"[-1].end_with?('test/loadTest.rb')"));
+        assertEquals("incorrect value for $\" variable", "true", eval("print $\"[-1].end_with?('test" + s + "loadTest.rb')"));
     }
 
+
     public void testPrintf() throws Exception {
         assertEquals("hello", eval("printf(\"%s\", \"hello\")"));
         assertEquals("", eval("printf(\"%s\", nil)"));

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ private static FileResource createResource(Ruby runtime, String cwd, String path`
`120`	`120`
`121`	`121`	`public static String normalizeSeps(String path) {`
`122`	`122`	`if (Platform.IS_WINDOWS) {`
`123`		`- return path.replace(File.separatorChar, '/');`
	`123`	`+ return path.replace('/', File.separatorChar);`
`124`	`124`	`} else {`
`125`	`125`	`return path;`
`126`	`126`	`}`