[tests] Resource IDs are platform-dependent.

see #580 Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Feb 14, 2017 · 71d05e9 · 71d05e9
1 parent 53676ad
commit 71d05e9
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/...ts/src/io/sarl/lang/tests/modules/actionprototype/DefaultActionPrototypeProviderTest.java b/...ts/src/io/sarl/lang/tests/modules/actionprototype/DefaultActionPrototypeProviderTest.java
@@ -330,21 +330,25 @@ public void validateTypeOfVarArgInSarl() throws Exception {
 		@Test
 		public void createQualifiedActionName() {
 			JvmIdentifiableElement container = createJvmIdentifiableElementStub();
+			final String xtextResourceID = container.eResource().getURI().toString();
 			QualifiedActionName qn = this.provider.createQualifiedActionName(container, "myfct");
 			assertNotNull(qn);
 			assertEquals("myfct", qn.getActionName());
-			assertEquals("file:/path/to/io/sarl/tests/Stub"+index+".sarl/io.sarl.tests.Stub"+index, qn.getContainerID());
-			assertEquals("file:/path/to/io/sarl/tests/Stub"+index+".sarl/io.sarl.tests.Stub"+index+"#myfct", qn.toString());
+			// xtextResourceID == "file:/path/to/io/sarl/tests/Stub"+index+".sarl" 
+			assertEquals(xtextResourceID + "/io.sarl.tests.Stub"+index, qn.getContainerID());
+			assertEquals(xtextResourceID + "/io.sarl.tests.Stub"+index+"#myfct", qn.toString());
 		}
 
 		@Test
 		public void createConstructorQualifiedName() {
 			JvmIdentifiableElement container = createJvmIdentifiableElementStub();
+			final String xtextResourceID = container.eResource().getURI().toString();
 			QualifiedActionName qn = this.provider.createConstructorQualifiedName(container);
 			assertNotNull(qn);
 			assertEquals("new", qn.getActionName());
-			assertEquals("file:/path/to/io/sarl/tests/Stub"+index+".sarl/io.sarl.tests.Stub"+index, qn.getContainerID());
-			assertEquals("file:/path/to/io/sarl/tests/Stub"+index+".sarl/io.sarl.tests.Stub"+index+"#new", qn.toString());
+			// xtextResourceID == "file:/path/to/io/sarl/tests/Stub"+index+".sarl"
+			assertEquals(xtextResourceID + "/io.sarl.tests.Stub"+index, qn.getContainerID());
+			assertEquals(xtextResourceID + "/io.sarl.tests.Stub"+index+"#new", qn.toString());
 		}
 
 		@Test
@@ -988,21 +992,25 @@ public void validateTypeOfVarArgInSarl() throws Exception {
 		@Test
 		public void createQualifiedActionName() {
 			JvmIdentifiableElement container = createJvmIdentifiableElementStub();
+			final String xtextResourceID = container.eResource().getURI().toString();
 			QualifiedActionName qn = this.provider.createQualifiedActionName(container, "myfct");
 			assertNotNull(qn);
 			assertEquals("myfct", qn.getActionName());
-			assertEquals("file:/path/to/io/sarl/tests/Stub"+index+".sarl/io.sarl.tests.Stub"+index, qn.getContainerID());
-			assertEquals("file:/path/to/io/sarl/tests/Stub"+index+".sarl/io.sarl.tests.Stub"+index+"#myfct", qn.toString());
+			//xtextResourceID == "file:/path/to/io/sarl/tests/Stub"+index+".sarl"
+			assertEquals(xtextResourceID + "/io.sarl.tests.Stub"+index, qn.getContainerID());
+			assertEquals(xtextResourceID + "/io.sarl.tests.Stub"+index+"#myfct", qn.toString());
 		}
 
 		@Test
 		public void createConstructorQualifiedName() {
 			JvmIdentifiableElement container = createJvmIdentifiableElementStub();
+			final String xtextResourceID = container.eResource().getURI().toString();
 			QualifiedActionName qn = this.provider.createConstructorQualifiedName(container);
 			assertNotNull(qn);
 			assertEquals("new", qn.getActionName());
-			assertEquals("file:/path/to/io/sarl/tests/Stub"+index+".sarl/io.sarl.tests.Stub"+index, qn.getContainerID());
-			assertEquals("file:/path/to/io/sarl/tests/Stub"+index+".sarl/io.sarl.tests.Stub"+index+"#new", qn.toString());
+			//xtextResourceID == "file:/path/to/io/sarl/tests/Stub"+index+".sarl"
+			assertEquals(xtextResourceID + "/io.sarl.tests.Stub"+index, qn.getContainerID());
+			assertEquals(xtextResourceID + "/io.sarl.tests.Stub"+index+"#new", qn.toString());
 		}
 
 		@Test