LMS-1343 launch all tests with default time out (2 minutes)

SVN: 14330

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

@@ -35,7 +35,7 @@ public class AuthenticationTest extends AbstractGWTTestCase
         remoteConsole.prepare(new Login("test", "a"));
         remoteConsole.prepare(new WaitForAllActiveCallbacksFinish());
 
-        launchTest(30 * SECOND);
+        launchTest();
     }
 
     public void testLogout() throws Exception
@@ -43,7 +43,7 @@ public class AuthenticationTest extends AbstractGWTTestCase
         remoteConsole.prepare(new Login("test", "a"));
         remoteConsole.prepare(new Logout());
 
-        launchTest(10 * SECOND);
+        launchTest();
     }
 
     public void testFailedLoginBecauseOfEmptyPassword() throws Exception
@@ -51,7 +51,7 @@ public class AuthenticationTest extends AbstractGWTTestCase
         remoteConsole.prepare(new Login("u", ""));
         remoteConsole.prepare(new FailureExpectation(LoginWidget.LoginCallback.class));
 
-        launchTest(10000);
+        launchTest();
     }
 
 }

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

@@ -54,7 +54,7 @@ public class AuthorizationGroupsTest extends AbstractGWTTestCase
                 .withCell(GroupColDefKind.CODE.id(), authGroupCode.toUpperCase()));
         remoteConsole.prepare(table);
 
-        launchTest(30000);
+        launchTest();
     }
 
     public final void testAddPerson()
@@ -71,7 +71,7 @@ public class AuthorizationGroupsTest extends AbstractGWTTestCase
         table.expectedRow(new Row().withCell(PersonColDefKind.USER_ID.id(), userId));
         remoteConsole.prepare(table);
 
-        launchTest(30000);
+        launchTest();
     }
 
     public final void testAddMultiplePerson()
@@ -91,7 +91,7 @@ public class AuthorizationGroupsTest extends AbstractGWTTestCase
         remoteConsole.prepare(FillAddPersonForm.multipleUsers(codes, authGroup));
         remoteConsole.prepare(table);
 
-        launchTest(30000);
+        launchTest();
     }
 
     private AuthorizationGroup createAuthGroup()

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

@@ -57,7 +57,7 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
         table.expectedRow(new Row().withCell(GroupColDefKind.CODE.id(), groupCode.toUpperCase()));
         remoteConsole.prepare(table);
 
-        launchTest(20 * SECOND);
+        launchTest();
     }
 
     public final void testCreatePerson()
@@ -72,7 +72,7 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
         table.expectedRow(new Row().withCell(PersonColDefKind.USER_ID.id(), userId));
         remoteConsole.prepare(table);
 
-        launchTest(20000);
+        launchTest();
     }
 
     public final void testCreateRoleAssignment()
@@ -87,7 +87,7 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
                 TestConstants.USER_ID_O, RoleSetCode.OBSERVER.toString()));
         remoteConsole.prepare(table);
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     public final void testCreateAuthorizationGroupRoleAssignment()
@@ -102,7 +102,7 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
                 ADMINS_GROUP, RoleSetCode.OBSERVER.toString()));
         remoteConsole.prepare(table);
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     /**
@@ -121,7 +121,7 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
                                 + "could be found in roles of user 'o'.");
         remoteConsole.prepare(failureExpectation);
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
 }

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

@@ -52,7 +52,7 @@ public class DataSetSearchTest extends AbstractGWTTestCase
         checkResultTableCmd.expectedColumnsNumber(TOTAL_NUM_OF_COLUMNS);
         remoteConsole.prepare(checkResultTableCmd);
 
-        launchTest(20000);
+        launchTest();
     }
 
     public final void testSearchForFileType()
@@ -73,7 +73,7 @@ public class DataSetSearchTest extends AbstractGWTTestCase
 
         remoteConsole.prepare(checkResultTableCmd);
 
-        launchTest(20000);
+        launchTest();
     }
 
     private Row createTiffRow()

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

@@ -67,6 +67,6 @@ public class EntityTypeBrowserTest extends AbstractGWTTestCase
         table.expectedRow(new Row().withCell(EntityTypeColDefKind.CODE.id(), expectedCode));
         remoteConsole.prepare(table.expectedSize(expectedRowsNum));
 
-        launchTest(20000);
+        launchTest();
     }
 }

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

@@ -81,7 +81,7 @@ public class EntityTypePropertyTypeAssignmentTest extends AbstractGWTTestCase
         remoteConsole.prepare(new FillPropertyTypeAssignmentForm(mandatory, COMMENT, SIRNA_HCS,
                 "a comment", EXPERIMENT));
         prepareListingAfterAssignment(COMMENT, SIRNA_HCS, EXPERIMENT, 35, mandatory);
-        launchTest(20000);
+        launchTest();
     }
 
     public final void testAssignDataSetPropertyType()
@@ -91,7 +91,7 @@ public class EntityTypePropertyTypeAssignmentTest extends AbstractGWTTestCase
         remoteConsole.prepare(new FillPropertyTypeAssignmentForm(mandatory, DESCRIPTION, HCS_IMAGE,
                 null, DATA_SET));
         prepareListingAfterAssignment(DESCRIPTION, HCS_IMAGE, DATA_SET, 36, mandatory);
-        launchTest(20000);
+        launchTest();
     }
 
     public final void testGlobalValueAssignmentSamplePropertyType()
@@ -104,6 +104,6 @@ public class EntityTypePropertyTypeAssignmentTest extends AbstractGWTTestCase
         CheckSampleTable table = new CheckSampleTable();
         table.expectedRow(new SampleRow(CONTROL_LAYOUT_C1).identifier(CISD, CISD).valid()
                 .withUserPropertyCell(COMMENT, NO_COMMENT));
-        launchTest(20000);
+        launchTest();
     }
 }

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

@@ -48,7 +48,7 @@ public class ExperimentBrowserTest extends AbstractGWTTestCase
         table.expectedColumnsNumber(15);
         remoteConsole.prepare(table.expectedSize(5));
 
-        launchTest(30000);
+        launchTest();
     }
 
     public final void testListExperiments()
@@ -61,6 +61,6 @@ public class ExperimentBrowserTest extends AbstractGWTTestCase
         table.expectedColumnsNumber(14);
         remoteConsole.prepare(table.expectedSize(2));
 
-        launchTest(30000);
+        launchTest();
     }
 }
\ No newline at end of file

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

@@ -43,7 +43,7 @@ public class FileFormatTypeGridTest extends AbstractGWTTestCase
         table.expectedRow(new Row().withCell(TypeColDefKind.CODE.id(), "XML"));
         remoteConsole.prepare(table.expectedSize(8));
 
-        launchTest(20000);
+        launchTest();
     }
 
     public void testCreateNewType()
@@ -59,7 +59,7 @@ public class FileFormatTypeGridTest extends AbstractGWTTestCase
         table.expectedSize(9);
         remoteConsole.prepare(table);
 
-        launchTest(20000);
+        launchTest();
     }
 
     private AbstractDefaultTestCommand addNewTypeCommand()

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

@@ -42,6 +42,6 @@ public class MaterialBrowserTest extends AbstractGWTTestCase
         table.expectedRow(new MaterialRow("BACTERIUM2"));
         remoteConsole.prepare(table.expectedSize(4));
 
-        launchTest(30000);
+        launchTest();
     }
 }

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

@@ -47,6 +47,6 @@ public class ProjectRegistrationTest extends AbstractGWTTestCase
                 .withCell(ProjectColDefKind.DESCRIPTION.id(), DESCRIPTION_PROJECT_007));
         remoteConsole.prepare(table.expectedSize(5));
 
-        launchTest(20000);
+        launchTest();
     }
 }

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

@@ -40,6 +40,6 @@ public class PropertyTypeAssignmentBrowserTest extends AbstractGWTTestCase
                 PropertyTypeAssignmentColDefKind.ENTITY_KIND.id(), "Sample"));
         remoteConsole.prepare(table.expectedSize(34));
 
-        launchTest(20000);
+        launchTest();
     }
 }

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

@@ -37,6 +37,6 @@ public class PropertyTypeBrowserTest extends AbstractGWTTestCase
         table.expectedRow(new Row().withCell(PropertyTypeColDefKind.CODE.id(), "$PLATE_GEOMETRY"));
         remoteConsole.prepare(table.expectedSize(16));
 
-        launchTest(20000);
+        launchTest();
     }
 }

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

@@ -53,6 +53,6 @@ public class PropertyTypeRegistrationTest extends AbstractGWTTestCase
         table.expectedRow(new Row().withCell(PropertyTypeColDefKind.CODE.id(), PROPERTY_TYPE_CODE));
         remoteConsole.prepare(table.expectedSize(17));
 
-        launchTest(20000);
+        launchTest();
     }
 }

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

@@ -68,7 +68,7 @@ public class SampleBrowserTest extends AbstractGWTTestCase
         checkCommand.expectedColumnsNumber(17);
         remoteConsole.prepare(checkCommand);
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     @DoNotRunWith(Platform.HtmlUnit)
@@ -97,7 +97,7 @@ public class SampleBrowserTest extends AbstractGWTTestCase
         table.expectedColumnsNumber(25);
         remoteConsole.prepare(table.expectedSize(40));
 
-        launchTest(20000);
+        launchTest();
     }
 
     public final void testListMasterPlates()
@@ -115,7 +115,7 @@ public class SampleBrowserTest extends AbstractGWTTestCase
                         DEFAULT_PLATE_GEOMETRY_VALUE));
         remoteConsole.prepare(table.expectedSize(5));
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     public final void testExportMasterPlates()
@@ -129,7 +129,7 @@ public class SampleBrowserTest extends AbstractGWTTestCase
         String firstLine = "MP\t\t\tDoe, John\t2008-11-05 09:20:47 GMT+01:00";
         remoteConsole.prepare(exportCommand.createCheckExportCommand(header, firstLine, 2));
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     public final void testListOnlySharedMasterPlates()
@@ -144,7 +144,7 @@ public class SampleBrowserTest extends AbstractGWTTestCase
         table.expectedRow(expectedRow);
         remoteConsole.prepare(table.expectedSize(1));
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     public final void testExportCellPlates()
@@ -159,7 +159,7 @@ public class SampleBrowserTest extends AbstractGWTTestCase
                 "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(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     public final void testListCellPlates()
@@ -173,7 +173,7 @@ public class SampleBrowserTest extends AbstractGWTTestCase
         table.expectedColumnsNumber(22);
         remoteConsole.prepare(table.expectedSize(15));
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     private void loginAndGotoListSamplesTab()

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

@@ -47,7 +47,7 @@ public class SearchTest extends AbstractGWTTestCase
                 createCheckMatchingEntitiesTableCommand(1, "CISD:/MP");
         remoteConsole.prepare(checkDatasetsTableCommand);
 
-        launchTest(20000);
+        launchTest();
     }
 
     @DoNotRunWith(Platform.HtmlUnit)
@@ -61,7 +61,7 @@ public class SearchTest extends AbstractGWTTestCase
                         "/CISD/NEMO/EXP1");
         remoteConsole.prepare(checkDatasetsTableCommand);
 
-        launchTest(20000);
+        launchTest();
     }
 
     @DoNotRunWith(Platform.HtmlUnit)
@@ -75,7 +75,7 @@ public class SearchTest extends AbstractGWTTestCase
                         "20081105092159111-1");
         remoteConsole.prepare(checkDatasetsTableCommand);
 
-        launchTest(20000);
+        launchTest();
     }
 
     private final static String SAMPLE_T1 = "CISD:/CISD/CP-TEST-1";
@@ -107,7 +107,7 @@ public class SearchTest extends AbstractGWTTestCase
         remoteConsole.prepare(showDatasetsRelatedToAllDisplayedEntities());
         remoteConsole.prepare(createCheckRelatedDatasetsTableCommand(DS_LOC1, DS_LOC2, DS_LOC3));
 
-        launchTest(30000);
+        launchTest();
     }
 
     public final void testShowDatasetsRelatedToExperiments()
@@ -121,7 +121,7 @@ public class SearchTest extends AbstractGWTTestCase
         remoteConsole.prepare(showDatasetsRelatedToAllDisplayedEntities());
         remoteConsole.prepare(createCheckRelatedDatasetsTableCommand(DS_LOC1, DS_LOC2, DS_LOC3));
 
-        launchTest(30000);
+        launchTest();
     }
 
     public final void testShowDatasetsRelatedToAll()
@@ -138,7 +138,7 @@ public class SearchTest extends AbstractGWTTestCase
         remoteConsole.prepare(createCheckRelatedDatasetsTableCommand(DS_LOC1, DS_LOC2, DS_LOC3,
                 "xml/result-8", "xml/result-9", "xml/result-10", "xml/result-11", "xml/result-12"));
 
-        launchTest(30000);
+        launchTest();
     }
 
     private CheckTableCommand createCheckMatchingEntitiesTableCommand(int size,

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

@@ -51,7 +51,7 @@ public class VocabularyBrowserTest extends AbstractGWTTestCase
         table.expectedColumn(VocabularyColDefKind.CODE.id(), VOCABULARY_CODE);
         remoteConsole.prepare(table.expectedSize(5));
 
-        launchTest(20000);
+        launchTest();
     }
 
     public final void testShowTermDetails()
@@ -59,7 +59,7 @@ public class VocabularyBrowserTest extends AbstractGWTTestCase
         loginAndInvokeAction(ActionMenuKind.VOCABULARY_MENU_BROWSE);
         showControlledVocabularyTerms(remoteConsole, VOCABULARY_CODE, 5, "FLY", "GORILLA", "HUMAN");
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     public static void showControlledVocabularyTerms(RemoteConsole remoteConsole,

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

@@ -47,6 +47,6 @@ public class VocabularyRegistrationTest extends AbstractGWTTestCase
         VocabularyBrowserTest.showControlledVocabularyTerms(remoteConsole, VOCABULARY_CODE, 3,
                 TERMS);
 
-        launchTest(20000);
+        launchTest();
     }
 }

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractGWTTestCase.java

@@ -108,6 +108,14 @@ public abstract class AbstractGWTTestCase extends GWTTestCase
         System.out.println(lineSeparator);
     }
 
+    /**
+     * Starts the tests. Sets the timeout after which the test is terminated to {@value #DEFAULT_TIMEOUT}.
+     */
+    protected void launchTest()
+    {
+        launchTest(DEFAULT_TIMEOUT);
+    }
+    
     /**
      * Starts the tests. Sets the timeout after which the test is terminated.
      */

openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java

@@ -66,7 +66,7 @@ public class GenericDataSetEditorTest extends AbstractGWTTestCase
         checkParents.expectedRow(new DataSetRow(oldParentCode));
         remoteConsole.prepare(checkDataSet);
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     // could be removed when we implement BO unit test or merged with first test
@@ -85,7 +85,7 @@ public class GenericDataSetEditorTest extends AbstractGWTTestCase
                                 + "' and cannot be at the same time set as its child.");
         remoteConsole.prepare(failureExpectation);
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     private void prepareShowDataSetEditor(String dataSetCode)

openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java

@@ -71,7 +71,7 @@ public class GenericDataSetViewerTest extends AbstractGWTTestCase
 
         remoteConsole.prepare(checkDataSet);
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     public final void testShowExperimentDataSetWithParents()
@@ -100,7 +100,7 @@ public class GenericDataSetViewerTest extends AbstractGWTTestCase
 
         remoteConsole.prepare(checkDataSet);
 
-        launchTest(DEFAULT_TIMEOUT);
+        launchTest();
     }
 
     private void checkDataSetRelationships(CheckTableCommand checkTable, String[] expectedCodes)