[LMS-1676] fixed system tests

SVN: 17342

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java

@@ -121,8 +121,7 @@ public class SampleBrowserTest extends AbstractGWTTestCase
         remoteConsole.prepare(new ListSamples("CISD", "CELL_PLATE"));
         ExportSamplesTestCommand exportCommand = new ExportSamplesTestCommand(client);
         remoteConsole.prepare(exportCommand);
-        String header =
-                "Code\tExperiment\tProject\tRegistrator\tRegistration Date\tParent 1\tParent 2";
+        String header = "Code\tExperiment\tProject\tRegistrator\tRegistration Date\tParents";
         String firstLine =
                 "3VCP1\tEXP1\tNEMO\tDoe, John\t2008-11-05 09:21:46 GMT+01:00\tCISD:/CISD/3V-123\tCISD:/CISD/MP001-1";
         remoteConsole.prepare(exportCommand.createCheckExportCommand(header, firstLine, 16));
@@ -136,8 +135,7 @@ public class SampleBrowserTest extends AbstractGWTTestCase
         remoteConsole.prepare(new ListSamples("CISD", "CELL_PLATE"));
         CheckSampleTable table = new CheckSampleTable();
         table.expectedRow(new SampleRow("3VCP1").identifier("CISD", "CISD").invalid().experiment(
-                "CISD", "NEMO", "EXP1").derivedFromAncestors("CISD:/CISD/3V-123",
-                "CISD:/CISD/MP001-1"));
+                "CISD", "NEMO", "EXP1").derivedFromAncestors("CISD:/CISD/3V-123"));
         table.expectedColumnsNumber(22);
         remoteConsole.prepare(table.expectedSize(15));
 
@@ -164,10 +162,9 @@ public class SampleBrowserTest extends AbstractGWTTestCase
         table.expectedRow(new SampleRow("C1", "CONTROL_LAYOUT").identifier("CISD", "CISD")
                 .withInternalPropertyCell("PLATE_GEOMETRY", DEFAULT_PLATE_GEOMETRY_VALUE));
 
-        // test that 3 parents of 'REINFECT_PLATE' are displayed
+        // test that parent of 'REINFECT_PLATE' is displayed
         table.expectedRow(new SampleRow("RP1-A2X", "REINFECT_PLATE").identifier("CISD", "CISD")
-                .derivedFromAncestors("CISD:/CISD/CP1-A2", "CISD:/CISD/DP1-A",
-                        "CISD:/CISD/MP1-MIXED"));
+                .derivedFromAncestors("CISD:/CISD/CP1-A2"));
 
         table.expectedColumnsNumber(25);
         remoteConsole.prepare(table.expectedSize(40));

openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java

@@ -189,20 +189,20 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
         checkExperiment.property("PermID").matchingPattern(
                 ".*<a href=\".*permId=" + EXP_REUSE_PERM_ID + ".*>" + EXP_REUSE_PERM_ID + "</a>.*");
         final CheckTableCommand sampleTable = checkExperiment.sampleTable().expectedSize(7);
-        sampleTable.expectedRow(new SampleRow("CP1-A1", CELL_PLATE).derivedFromAncestors(
-                "CISD:/CISD/DP1-A", "CISD:/CISD/MP1-MIXED"));
-        sampleTable.expectedRow(new SampleRow("CP1-A2", CELL_PLATE).derivedFromAncestors(
-                "CISD:/CISD/DP1-A", "CISD:/CISD/MP1-MIXED"));
-        sampleTable.expectedRow(new SampleRow("CP1-B1", CELL_PLATE).derivedFromAncestors(
-                "CISD:/CISD/DP1-B", "CISD:/CISD/MP1-MIXED"));
-        sampleTable.expectedRow(new SampleRow("CP2-A1", CELL_PLATE).derivedFromAncestors(
-                "CISD:/CISD/DP2-A", "CISD:/CISD/MP2-NO-CL"));
-        sampleTable.expectedRow(new SampleRow("RP1-A2X", REINFECT_PLATE).derivedFromAncestors(
-                "CISD:/CISD/CP1-A2", "CISD:/CISD/DP1-A", "CISD:/CISD/MP1-MIXED"));
-        sampleTable.expectedRow(new SampleRow("RP1-B1X", REINFECT_PLATE).derivedFromAncestors(
-                "CISD:/CISD/CP1-B1", "CISD:/CISD/DP1-B", "CISD:/CISD/MP1-MIXED"));
-        sampleTable.expectedRow(new SampleRow("RP2-A1X", REINFECT_PLATE).derivedFromAncestors(
-                "CISD:/CISD/CP2-A1", "CISD:/CISD/DP2-A", "CISD:/CISD/MP2-NO-CL"));
+        sampleTable.expectedRow(new SampleRow("CP1-A1", CELL_PLATE)
+                .derivedFromAncestors("CISD:/CISD/DP1-A"));
+        sampleTable.expectedRow(new SampleRow("CP1-A2", CELL_PLATE)
+                .derivedFromAncestors("CISD:/CISD/DP1-A"));
+        sampleTable.expectedRow(new SampleRow("CP1-B1", CELL_PLATE)
+                .derivedFromAncestors("CISD:/CISD/DP1-B"));
+        sampleTable.expectedRow(new SampleRow("CP2-A1", CELL_PLATE)
+                .derivedFromAncestors("CISD:/CISD/DP2-A"));
+        sampleTable.expectedRow(new SampleRow("RP1-A2X", REINFECT_PLATE)
+                .derivedFromAncestors("CISD:/CISD/CP1-A2"));
+        sampleTable.expectedRow(new SampleRow("RP1-B1X", REINFECT_PLATE)
+                .derivedFromAncestors("CISD:/CISD/CP1-B1"));
+        sampleTable.expectedRow(new SampleRow("RP2-A1X", REINFECT_PLATE)
+                .derivedFromAncestors("CISD:/CISD/CP2-A1"));
         remoteConsole.prepare(checkExperiment);
 
         launchTest();

openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java

@@ -102,9 +102,6 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
         remoteConsole.prepare(new ShowSample(CELL_PLATE_EXAMPLE));
 
         final String parentCode1 = "3V-123";
-        final String parentId1 = CISD_ID_PREFIX + parentCode1;
-        final String parentCode2 = "MP001-1";
-        final String parentId2 = CISD_ID_PREFIX + parentCode2;
 
         final CheckSample checkSample = new CheckSample();
         checkSample.property("Sample").asString(CELL_PLATE_EXAMPLE_ID);
@@ -115,9 +112,9 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
         checkSample.property("Sample Type").asCode("CELL_PLATE");
         final CheckTableCommand childrenTable = checkSample.childrenTable().expectedSize(2);
         childrenTable.expectedRow(new SampleRow("3VRP1A", "REINFECT_PLATE").identifier("CISD",
-                "CISD").derivedFromAncestors(CELL_PLATE_EXAMPLE_ID, parentId1, parentId2));
+                "CISD").derivedFromAncestors(CELL_PLATE_EXAMPLE_ID));
         childrenTable.expectedRow(new SampleRow("3VRP1B", "REINFECT_PLATE").identifier("CISD",
-                "CISD").derivedFromAncestors(CELL_PLATE_EXAMPLE_ID, parentId1, parentId2));
+                "CISD").derivedFromAncestors(CELL_PLATE_EXAMPLE_ID));
         checkSample.property("Invalidation").by(new IValueAssertion<Invalidation>()
             {
                 public void assertValue(final Invalidation invalidation)
@@ -126,10 +123,8 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
                     assertEquals("wrong-code", invalidation.getReason());
                 }
             });
-        checkSample.property("Parent 1").asCode(parentCode1);
-        checkSample.property("Parent 1").asInvalidEntity();
-        checkSample.property("Parent 2").asCode(parentCode2);
-        checkSample.property("Parent 2").asInvalidEntity();
+        checkSample.property("Parent").asCode(parentCode1);
+        checkSample.property("Parent").asInvalidEntity();
 
         final CheckTableCommand dataTable = checkSample.dataTable().expectedSize(1);
         dataTable.expectedRow(new DataSetRow(DIRECTLY_CONNECTED_DATA_SET_CODE).invalid()