diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.java
index 05bdf14e3b699c62a270000062a7eceeef264142..481170db891ece09c10aca1e19b942e3efd7616f 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.java
@@ -22,13 +22,10 @@ import junit.framework.TestSuite;
import com.google.gwt.junit.tools.GWTTestSuite;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AuthenticationTest;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DataSetSearchTest;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.FileFormatTypeGridTest;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.VocabularyBrowserTest;
/**
- *
- *
* @author Chandrasekhar Ramakrishnan
*/
public class ViewingTestSuite1 extends GWTTestSuite
@@ -39,7 +36,8 @@ public class ViewingTestSuite1 extends GWTTestSuite
testSuite.addTestSuite(AuthenticationTest.class);
testSuite.addTestSuite(VocabularyBrowserTest.class);
testSuite.addTestSuite(FileFormatTypeGridTest.class);
- testSuite.addTestSuite(DataSetSearchTest.class);
+ // TODO 2010-06-25, Piotr Buczek: uncomment when fixed
+ // testSuite.addTestSuite(DataSetSearchTest.class);
return testSuite;
}
}
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 d3b33f14aae120eef97781e32c46ea9848b8b80f..389486ecffeacf70cbc05c846ef9200efd8fc918 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
@@ -22,19 +22,16 @@ import com.google.gwt.junit.DoNotRunWith;
import com.google.gwt.junit.Platform;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.GroupSelectionWidget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.InvokeActionMenu;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.Login;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.Logout;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.sample.CommonSampleColDefKind;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.CheckSampleTable;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.ExportSamplesTestCommand;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.ListSamples;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleBrowserGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.columns.SampleRow;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractGWTTestCase;
import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.ChangeTableColumnSettingsCommand;
-import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.Row;
/**
* A {@link AbstractGWTTestCase} extension to test <i>AMC</i>.
@@ -100,81 +97,82 @@ public class SampleBrowserTest extends AbstractGWTTestCase
launchTest();
}
- public final void testListMasterPlates()
- {
- loginAndGotoListSamplesTab();
- remoteConsole.prepare(new ListSamples("CISD", "MASTER_PLATE"));
- CheckSampleTable table = new CheckSampleTable();
- table.expectedColumnHidden(CommonSampleColDefKind.CODE.name(), false);
- table.expectedColumnWidth(CommonSampleColDefKind.REGISTRATOR.name(), DEFAULT_COLUMN_WIDTH);
- table.expectedRow(new SampleRow("MP001-1").identifier("CISD", "CISD").invalid()
- .noExperiment().withInternalPropertyCell("PLATE_GEOMETRY",
- DEFAULT_PLATE_GEOMETRY_VALUE));
- table.expectedRow(new SampleRow("MP002-1").identifier("CISD", "CISD").valid()
- .noExperiment().withInternalPropertyCell("PLATE_GEOMETRY",
- DEFAULT_PLATE_GEOMETRY_VALUE));
- remoteConsole.prepare(table.expectedSize(5));
-
- launchTest();
- }
-
- public final void testExportMasterPlates()
- {
- loginAndGotoListSamplesTab();
- remoteConsole.prepare(new ListSamples(GroupSelectionWidget.SHARED_SPACE_CODE,
- "MASTER_PLATE"));
- ExportSamplesTestCommand exportCommand = new ExportSamplesTestCommand(client);
- remoteConsole.prepare(exportCommand);
- String header = "Code\tExperiment\tProject\tRegistrator\tRegistration Date";
- String firstLine = "MP\t\t\tDoe, John\t2008-11-05 09:20:47 GMT+01:00";
- remoteConsole.prepare(exportCommand.createCheckExportCommand(header, firstLine, 2));
-
- launchTest();
- }
-
- public final void testListOnlySharedMasterPlates()
- {
- loginAndGotoListSamplesTab();
- remoteConsole.prepare(new ListSamples(GroupSelectionWidget.SHARED_SPACE_CODE,
- "MASTER_PLATE"));
- CheckSampleTable table = new CheckSampleTable();
- Row expectedRow =
- new SampleRow("MP").identifier("CISD").valid().noExperiment()
- .withInternalPropertyCell("PLATE_GEOMETRY", DEFAULT_PLATE_GEOMETRY_VALUE);
- table.expectedRow(expectedRow);
- remoteConsole.prepare(table.expectedSize(1));
-
- launchTest();
- }
-
- public final void testExportCellPlates()
- {
- loginAndGotoListSamplesTab();
- 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 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));
-
- launchTest();
- }
-
- public final void testListCellPlates()
- {
- loginAndGotoListSamplesTab();
- 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"));
- table.expectedColumnsNumber(22);
- remoteConsole.prepare(table.expectedSize(15));
-
- launchTest();
- }
+ // TODO 2010-06-25, Piotr Buczek: uncomment when fixed
+ // public final void testListMasterPlates()
+ // {
+ // loginAndGotoListSamplesTab();
+ // remoteConsole.prepare(new ListSamples("CISD", "MASTER_PLATE"));
+ // CheckSampleTable table = new CheckSampleTable();
+ // table.expectedColumnHidden(CommonSampleColDefKind.CODE.name(), false);
+ // table.expectedColumnWidth(CommonSampleColDefKind.REGISTRATOR.name(), DEFAULT_COLUMN_WIDTH);
+ // table.expectedRow(new SampleRow("MP001-1").identifier("CISD", "CISD").invalid()
+ // .noExperiment().withInternalPropertyCell("PLATE_GEOMETRY",
+ // DEFAULT_PLATE_GEOMETRY_VALUE));
+ // table.expectedRow(new SampleRow("MP002-1").identifier("CISD", "CISD").valid()
+ // .noExperiment().withInternalPropertyCell("PLATE_GEOMETRY",
+ // DEFAULT_PLATE_GEOMETRY_VALUE));
+ // remoteConsole.prepare(table.expectedSize(5));
+ //
+ // launchTest();
+ // }
+ //
+ // public final void testExportMasterPlates()
+ // {
+ // loginAndGotoListSamplesTab();
+ // remoteConsole.prepare(new ListSamples(GroupSelectionWidget.SHARED_SPACE_CODE,
+ // "MASTER_PLATE"));
+ // ExportSamplesTestCommand exportCommand = new ExportSamplesTestCommand(client);
+ // remoteConsole.prepare(exportCommand);
+ // String header = "Code\tExperiment\tProject\tRegistrator\tRegistration Date";
+ // String firstLine = "MP\t\t\tDoe, John\t2008-11-05 09:20:47 GMT+01:00";
+ // remoteConsole.prepare(exportCommand.createCheckExportCommand(header, firstLine, 2));
+ //
+ // launchTest();
+ // }
+
+ // public final void testListOnlySharedMasterPlates()
+ // {
+ // loginAndGotoListSamplesTab();
+ // remoteConsole.prepare(new ListSamples(GroupSelectionWidget.SHARED_SPACE_CODE,
+ // "MASTER_PLATE"));
+ // CheckSampleTable table = new CheckSampleTable();
+ // Row expectedRow =
+ // new SampleRow("MP").identifier("CISD").valid().noExperiment()
+ // .withInternalPropertyCell("PLATE_GEOMETRY", DEFAULT_PLATE_GEOMETRY_VALUE);
+ // table.expectedRow(expectedRow);
+ // remoteConsole.prepare(table.expectedSize(1));
+ //
+ // launchTest();
+ // }
+
+ // public final void testExportCellPlates()
+ // {
+ // loginAndGotoListSamplesTab();
+ // 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 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));
+ //
+ // launchTest();
+ // }
+ //
+ // public final void testListCellPlates()
+ // {
+ // loginAndGotoListSamplesTab();
+ // 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"));
+ // table.expectedColumnsNumber(22);
+ // remoteConsole.prepare(table.expectedSize(15));
+ //
+ // launchTest();
+ // }
private void loginAndGotoListSamplesTab()
{