Description Axel Uhl 2010-12-06 14:57:27 EST

Build Identifier: CVS Head of 2010-12-06

In TestIndexNotSufficient and NavigationTest there are cases of incorrect path assembly. They accidentally work on Windows but don't on Linux. Below please find a patch which solves it for us.

diff --git a/prototypes/index/org.eclipse.emf.query.index.test/src/org/eclipse/emf/query/index/test/TestIndexNotSufficient.java b/prototypes/index/org.eclipse.emf.query.index.test/src/org/eclipse/emf/query/index/test/TestIndexNotSufficient.java
index 30e41e5..0a9142c 100644
--- a/prototypes/index/org.eclipse.emf.query.index.test/src/org/eclipse/emf/query/index/test/TestIndexNotSufficient.java
+++ b/prototypes/index/org.eclipse.emf.query.index.test/src/org/eclipse/emf/query/index/test/TestIndexNotSufficient.java
@@ -313,7 +313,7 @@ public class TestIndexNotSufficient extends Assert {
 	}
 
 	private static String getTempDir() {
-		return System.getProperty("java.io.tmpdir") + File.pathSeparator + "index";
+		return System.getProperty("java.io.tmpdir") + File.separator + "index";
 	}
 
 	@Test
diff --git a/prototypes/index/org.eclipse.emf.query.index.test/src/org/eclipse/emf/query/index/test/navigation/NavigationTest.java b/prototypes/index/org.eclipse.emf.query.index.test/src/org/eclipse/emf/query/index/test/navigation/NavigationTest.java
index c5760fa..27a9b6a 100644
--- a/prototypes/index/org.eclipse.emf.query.index.test/src/org/eclipse/emf/query/index/test/navigation/NavigationTest.java
+++ b/prototypes/index/org.eclipse.emf.query.index.test/src/org/eclipse/emf/query/index/test/navigation/NavigationTest.java
@@ -52,7 +52,7 @@ public class NavigationTest extends Assert {
 	private Resource cont;
 
 	public Options getOptions() {
-		return new Options("C:/tmp/", Options.DISABLED, Options.DISABLED);
+		return new Options(System.getProperty("java.io.tmpdir"), Options.DISABLED, Options.DISABLED);
 	}
 
 	@Test
@@ -100,7 +100,7 @@ public class NavigationTest extends Assert {
 
 	private Resource getEcoreCopy() throws Exception {
 		ResourceSet rs = new ResourceSetImpl();
-		Resource copy = rs.createResource(URI.createFileURI("C:/tmp/ecoreCopy.xmi"));
+		Resource copy = rs.createResource(URI.createFileURI(System.getProperty("java.io.tmpdir") + File.separator + "ecoreCopy.xmi"));
 		Resource ecoreResource = EcorePackage.eINSTANCE.eResource();
 		copy.getContents().add(EcorePackage.eINSTANCE);
 		copy.save(null);


Reproducible: Always