Author: jcouteau Date: 2010-01-26 10:27:32 +0100 (Tue, 26 Jan 2010) New Revision: 182 Modified: trunk/src/main/java/org/nuiton/j2r/RProxy.java trunk/src/test/java/org/nuiton/j2r/JNITest.java Log: Add better management of Windows filesystem Modified: trunk/src/main/java/org/nuiton/j2r/RProxy.java =================================================================== --- trunk/src/main/java/org/nuiton/j2r/RProxy.java 2010-01-24 23:36:28 UTC (rev 181) +++ trunk/src/main/java/org/nuiton/j2r/RProxy.java 2010-01-26 09:27:32 UTC (rev 182) @@ -267,7 +267,7 @@ "occured during the initialization."); return; } - engine.voidEval("setwd(\"" + directory.getAbsolutePath() + "\")"); + engine.setwd(directory); } /** Modified: trunk/src/test/java/org/nuiton/j2r/JNITest.java =================================================================== --- trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-01-24 23:36:28 UTC (rev 181) +++ trunk/src/test/java/org/nuiton/j2r/JNITest.java 2010-01-26 09:27:32 UTC (rev 182) @@ -199,11 +199,24 @@ }*/ @Test public void testWorkingDirectory() throws Exception { + + //test linux paths File workingDirectory = new File("/tmp"); engine.setwd(workingDirectory); File testWorkingDirectory = engine.getwd(); Assert.assertEquals(workingDirectory.getAbsolutePath(), testWorkingDirectory.getAbsolutePath()); + + //test windows paths + File tempFile = File.createTempFile("test","", new File(System.getProperty("java.io.tmpdir"))); + tempFile.delete(); + tempFile.mkdirs(); + workingDirectory = new File(System.getProperty("java.io.tmpdir") + + "\\" + tempFile.getName()); + engine.setwd(workingDirectory); + testWorkingDirectory = engine.getwd(); + Assert.assertEquals(tempFile.getAbsolutePath(), + testWorkingDirectory.getAbsolutePath()); } @Test @@ -214,7 +227,7 @@ engine.remove("a"); engine.loadRData(workingdir); Double testDouble = (Double) engine.eval("a"); - Double compareTo = new Double(5.0); + Double compareTo = 5.0; Assert.assertEquals(compareTo, testDouble); } @@ -230,7 +243,7 @@ engine.remove("a"); engine.dget("a", "testDputDgetfile"); Double testDouble = (Double) engine.eval("a"); - Double compareTo = new Double(5.0); + Double compareTo = 5.0; Assert.assertEquals(compareTo, testDouble); //test method using absolute path @@ -241,7 +254,7 @@ engine.remove("a"); engine.dget("a", testingFile); Double testDouble2 = (Double) engine.eval("a"); - Double compareTo2 = new Double(6.0); + Double compareTo2 = 6.0; Assert.assertEquals(compareTo2, testDouble2); File testWorkingDirectory = engine.getwd(); Assert.assertEquals(workingdir.getAbsolutePath(), @@ -251,7 +264,7 @@ @Test public void testRemove() throws Exception { engine.voidEval("a<-6.0"); - Assert.assertEquals(new Double(6.0), engine.eval("a")); + Assert.assertEquals(6.0, engine.eval("a")); try { engine.remove("a"); engine.eval("a"); @@ -269,7 +282,7 @@ engine.voidEval("a<-5.0"); engine.remove("b"); engine.mv("a", "b"); - Assert.assertEquals(new Double(5.0), engine.eval("b")); + Assert.assertEquals(5.0, engine.eval("b")); Assert.assertFalse((Boolean) engine.eval("exists(\"a\")")); } @@ -300,11 +313,11 @@ engine.voidEval("e<-5.0"); engine.voidEval("f<-5.0"); engine.commit(); - Assert.assertEquals(new Double(10.0), engine.eval("a")); - Assert.assertEquals(new Double(5.0), engine.eval("b")); - Assert.assertEquals(new Double(5.0), engine.eval("d")); - Assert.assertEquals(new Double(5.0), engine.eval("e")); - Assert.assertEquals(new Double(5.0), engine.eval("f")); + Assert.assertEquals(10.0, engine.eval("a")); + Assert.assertEquals(5.0, engine.eval("b")); + Assert.assertEquals(5.0, engine.eval("d")); + Assert.assertEquals(5.0, engine.eval("e")); + Assert.assertEquals(5.0, engine.eval("f")); } @Test