From b7e3ada245ea6a1973e7cabb9bf4e7f107fba118 Mon Sep 17 00:00:00 2001 From: tpylak <tpylak> Date: Tue, 3 Feb 2009 15:01:53 +0000 Subject: [PATCH] fix system tests after grid columns reconfiguration SVN: 9662 --- .../client/web/client/application/SampleBrowserTest.java | 8 ++++---- .../client/application/experiment/CheckExperiment.java | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java index 3f83c5e30d5..1c789bbac85 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java @@ -55,8 +55,8 @@ public class SampleBrowserTest extends AbstractGWTTestCase "MASTER_PLATE")); ExportSamplesTestCommand exportCommand = new ExportSamplesTestCommand(client); remoteConsole.prepare(exportCommand); - String header = "Group\tCode\tProject\tExperiment\tPlate Geometry"; - String firstLine = "\tMP\t\t\t384_WELLS_16X24"; + String header = "Code\tExperiment\tProject\tPlate Geometry"; + String firstLine = "MP\t\t\t384_WELLS_16X24"; remoteConsole.prepare(exportCommand.createCheckExportCommand(header, firstLine, 2)); launchTest(20000); @@ -83,8 +83,8 @@ public class SampleBrowserTest extends AbstractGWTTestCase remoteConsole.prepare(new ListSamples("CISD", "CELL_PLATE")); ExportSamplesTestCommand exportCommand = new ExportSamplesTestCommand(client); remoteConsole.prepare(exportCommand); - String header = "Group\tCode\tProject\tExperiment\tParent 1\tParent 2"; - String firstLine = "CISD\t3VCP1\tNEMO\tEXP1\t3V-123\tMP001-1"; + String header = "Code\tExperiment\tProject\tParent 1\tParent 2"; + String firstLine = "3VCP1\tEXP1\tNEMO\t3V-123\tMP001-1"; remoteConsole.prepare(exportCommand.createCheckExportCommand(header, firstLine, 17)); launchTest(20000); diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/CheckExperiment.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/CheckExperiment.java index 0a53e055410..bda9b110e7a 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/CheckExperiment.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/CheckExperiment.java @@ -81,9 +81,7 @@ public class CheckExperiment extends AbstractDefaultTestCommand implements public CheckTableCommand sampleTable() { - sampleSection = - new CheckTableCommand(SampleBrowserGrid.GRID_ID + ExperimentSamplesSection.PREFIX - + identifier); + sampleSection = new CheckTableCommand(ExperimentSamplesSection.createId(identifier)); return sampleSection; } -- GitLab