[LMS-2177] fixed test expectations

SVN: 20640

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/ExperimentRegistrationTest.java

@@ -343,8 +343,8 @@ public class ExperimentRegistrationTest extends GenericSystemTestCase
             });
         Sample sample = list.get(0).getOriginalObject();
         assertEquals("Sample identifier " + sample.getIdentifier()
-                + " should start with CISD:/TESTGROUP/", true,
-                sample.getIdentifier().startsWith("CISD:/TESTGROUP/"));
+                + " should start with /TESTGROUP/", true,
+                sample.getIdentifier().startsWith("/TESTGROUP/"));
         assertEquals("TESTGROUP", sample.getSpace().getCode());
     }
 

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java

@@ -54,9 +54,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sam
 public class SampleDetailsTest extends GenericSystemTestCase
 {
 
-    private static final String CISD_ID_PREFIX = "CISD:/CISD/";
-
-    private static final String DEFAULT_INSTANCE = "CISD";
+    private static final String CISD_ID_PREFIX = "/CISD/";
 
     private static final String DEFAULT_GROUP = "CISD";
 
@@ -261,13 +259,12 @@ public class SampleDetailsTest extends GenericSystemTestCase
 
     private static String createSampleIdentifier(String sampleCode)
     {
-        return createSampleIdentifier(DEFAULT_INSTANCE, DEFAULT_GROUP, sampleCode);
+        return createSampleIdentifier(DEFAULT_GROUP, sampleCode);
     }
 
-    private static String createSampleIdentifier(String instanceCode, String spaceCode,
-            String sampleCode)
+    private static String createSampleIdentifier(String spaceCode, String sampleCode)
     {
-        return instanceCode + ":/" + (spaceCode == null ? "" : spaceCode + "/") + sampleCode;
+        return "/" + (spaceCode == null ? "" : spaceCode + "/") + sampleCode;
     }
 
     private SampleType getSampleType(String sampleTypeCode)

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleRegistrationTest.java

@@ -50,9 +50,7 @@ public class SampleRegistrationTest extends GenericSystemTestCase
 
     private static final String WELL = "WELL";
 
-    private static final String CISD_SHORT = "/CISD/";
-
-    private static final String CISD_LONG = "CISD:/CISD/";
+    private static final String CISD = "/CISD/";
 
     @Test
     public void testSimpleRegistration()
@@ -83,7 +81,7 @@ public class SampleRegistrationTest extends GenericSystemTestCase
         assertEquals(StringEscapeUtils.escapeHtml("test samplé"), properties.get(0).getValue());
         assertEquals(1, properties.size());
         assertEquals(3, s.getParents().size());
-        assertEquals("[CISD:/CISD/C1, CISD:/CISD/C2, CISD:/CISD/C3]",
+        assertEquals("[/CISD/C1, /CISD/C2, /CISD/C3]",
                 Arrays.toString(IdentifierExtractor.extract(s.getParents()).toArray()));
     }
 
@@ -95,9 +93,9 @@ public class SampleRegistrationTest extends GenericSystemTestCase
 
         final NewSample sample = new NewSample();
         final String sampleCode = "dp4";
-        final String identifier = CISD_SHORT + sampleCode;
+        final String identifier = CISD + sampleCode;
         sample.setIdentifier(identifier);
-        final String parent = "CISD:/CISD/C1";
+        final String parent = CISD + "C1";
         sample.setParentsOrNull(new String[]
             { parent });
         final SampleType sampleType = new SampleType();
@@ -118,9 +116,9 @@ public class SampleRegistrationTest extends GenericSystemTestCase
 
         final NewSample sample = new NewSample();
         final String sampleCode = "W12";
-        final String simpleIdentifier = CISD_SHORT + sampleCode;
+        final String simpleIdentifier = CISD + sampleCode;
         final String containerCode = "3VCP5";
-        final String containerIdentifier = CISD_LONG + containerCode;
+        final String containerIdentifier = CISD + containerCode;
         sample.setIdentifier(simpleIdentifier);
         sample.setContainerIdentifier(containerIdentifier);
         final SampleType sampleType = new SampleType();