diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthenticationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthenticationTest.java
index c734524b9d1753a7ac5acc3fa9e33044942e05ed..e57baadc5d907fe8cae39e8bca76aec0ecd839e0 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthenticationTest.java
+++ b/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();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationGroupsTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationGroupsTest.java
index c0b72696c8d18320d5264e1e31e8191fa52e551c..f755d0a2323db9426d05bb7e00626574cbd30663 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationGroupsTest.java
+++ b/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()
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
index 16b7f2674b3810cf36ac86f9c650d2149f0c404e..dbdc41d051c089a38d5e9b2458ad5fd0228d9766 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
+++ b/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();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DataSetSearchTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DataSetSearchTest.java
index 70e277f5e7b19196f5050dd528d07734dd49e3fc..213e3c1dc5bdb74189dc702fc38c6e7eb6d784bb 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DataSetSearchTest.java
+++ b/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()
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.java
index e82712ff801524018b5000d291d8a89500a8220f..7e3c814aa6ceee54d6182b61f45fe4ab5fa9e9e3 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.java
+++ b/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();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypePropertyTypeAssignmentTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypePropertyTypeAssignmentTest.java
index 9e8231727f51968ffa6da4bc8536f7d6382cda41..e0146363c948ea918fe0d16c401588f73f257551 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypePropertyTypeAssignmentTest.java
+++ b/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();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java
index dba22bcb0e2ddf4ee850e330f206c521134975f9..358c8fa72844a930037d76d83ccf42a7744363a1 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java
+++ b/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
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.java
index 89237318e89faedad73d6f574298288d8ddb75f7..a2b5e1bd680571e924f14c83bb8f64e372b4fbd0 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.java
+++ b/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()
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.java
index 66c4e57312bcd9714b1279937d1ebbffd83941b4..a248c54fab7bcd93c742f6f5d08379536b8cfa58 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.java
+++ b/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();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectRegistrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectRegistrationTest.java
index d74468fae8ca0d83c33d13bb67a194f352fb04bb..0c939e4a0bad65356b5cb7f2e914e36a76adcfe6 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectRegistrationTest.java
+++ b/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();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeAssignmentBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeAssignmentBrowserTest.java
index ba10916c86561994ca0bf5d166a7b6f36f6f73ae..6b5e3ff9bb38cb79057b5af34e52b05a80208b50 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeAssignmentBrowserTest.java
+++ b/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();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeBrowserTest.java
index b427e5c322142699849acc56bce92b2d599410af..656b72261e8e9b1d8b927d7f85ffe4bf1dffdf2d 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeBrowserTest.java
+++ b/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();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeRegistrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeRegistrationTest.java
index de6bf8c7ab35265d02c8521b74b607f0048d1a17..6275180a128227c1c6d48ba3f740395cf82496ca 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeRegistrationTest.java
+++ b/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();
}
}
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 0c3511f77eeaf0a8a81c5a12b2496721887905fe..7644913f3eb6c82d361547493e32e41ca6076594 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
@@ -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()
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.java
index 350c81e41e87f1aafd5542d644102d43b2f013c9..709595d0694ee4d9b368eb23ce4ed64e723cef94 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.java
+++ b/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,
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java
index 84e2958da78ad32d56c7dd52c49dc2fc04397def..42165bd262f01fe909d162d7ad53f6aa3cd108da 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java
+++ b/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,
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyRegistrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyRegistrationTest.java
index 750d49e8df2cb146e3a3356bb25c242d144bd907..22f7c6fd628dc42b4daa6bb3ee9c8bd286a2714e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyRegistrationTest.java
+++ b/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();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractGWTTestCase.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractGWTTestCase.java
index be1545e4637d22756f2307d036f2383bd19f883a..bb8d37819ff6db7355d1d9e46602a62225bf26ed 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractGWTTestCase.java
+++ b/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.
*/
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java
index 4acc00abcdd354a451fc57cdb9a1bcad757402c3..1ce2b884b7109f97d4453bf3d38cc9adef81a2e7 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java
+++ b/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)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java
index 40d01fd0d0e3e0c7f8124084fc9676f4ff7482dd..19b3a90f4fbe2b1804cb08fc074c244b50104685 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java
+++ b/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)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java
index 31dd5895eb4d83287d406b566ebc46a21d3afde2..6360b42cb08a681ed7ddedad9adc393cadb206b4 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java
@@ -72,7 +72,7 @@ public class GenericExperimentEditorTest extends AbstractGWTTestCase
CheckExperimentTable table = new CheckExperimentTable();
table.expectedRow(new ExperimentRow(EXP1).withUserPropertyCell("description", description));
remoteConsole.prepare(table);
- launchTest(60 * SECOND);
+ launchTest();
}
public final void testEditExperimentProject()
@@ -87,7 +87,7 @@ public class GenericExperimentEditorTest extends AbstractGWTTestCase
CheckExperimentTable table = new CheckExperimentTable();
table.expectedRow(new ExperimentRow(experiment));
remoteConsole.prepare(table);
- launchTest(60 * SECOND);
+ launchTest();
}
private void prepareShowExperimentEditor(String group, final String project,
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationTest.java
index 5c2278e016f9123a415b5956b4041667d36b3406..3e4564f79c8e92ee76c0c6a6154797bb6804a49b 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationTest.java
@@ -78,7 +78,7 @@ public class GenericExperimentRegistrationTest extends AbstractGWTTestCase
remoteConsole.prepare(new ListExperiments("DEFAULT", experimentTypeCode));
remoteConsole.prepare(new CheckExperimentTable()
.expectedRow(new ExperimentRow("NEW_EXP_1")));
- launchTest(20000);
+ launchTest();
}
public final void testRegisterExperimentWithSamples()
@@ -100,6 +100,6 @@ public class GenericExperimentRegistrationTest extends AbstractGWTTestCase
CheckSampleTable table = new CheckSampleTable();
table.expectedRow(new SampleRow(sampleCode).identifier("CISD", "CISD").valid().experiment(
"CISD", project, experimentCode));
- launchTest(20000);
+ launchTest();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
index 22e597589d6610a0d67fbb2bf487598c77ad0aa6..79ad3c64f45643029e194f45cc76a441941f6b5e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
@@ -120,7 +120,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
.with("Authorization failure: User 'observer' does not have enough privileges"
+ " to access data in the group 'CISD:/CISD'."));
- launchTest(20000);
+ launchTest();
}
public final void testShowExperimentDetails()
@@ -140,7 +140,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
"exampleExperiments.txt").withCell(AttachmentColDefKind.VERSION.id(), 4));
remoteConsole.prepare(checkExperiment);
- launchTest(60000);
+ launchTest();
}
public final void testShowInvalidExperimentDetails()
@@ -163,7 +163,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
checkExperiment.property("Description").asProperty(A_SIMPLE_EXPERIMENT);
remoteConsole.prepare(checkExperiment);
- launchTest(DEFAULT_TIMEOUT);
+ launchTest();
}
public final void testListOfAttachments()
@@ -181,7 +181,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
"cellPlates.txt").withCell(AttachmentColDefKind.VERSION.id(), 1));
remoteConsole.prepare(checkExperiment);
- launchTest(60000);
+ launchTest();
}
public final void testListOfSamples()
@@ -208,7 +208,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
"CISD:/CISD/CP2-A1", "CISD:/CISD/DP2-A", "CISD:/CISD/MP2-NO-CL"));
remoteConsole.prepare(checkExperiment);
- launchTest(60000);
+ launchTest();
}
public final void testListOfDataSets()
@@ -228,7 +228,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
remoteConsole.prepare(checkExperiment);
- launchTest(60000);
+ launchTest();
}
private void prepareShowExperiment(final String projectName, final String experimentTypeName,
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
index 8238b580431fb58af89e462c7342cf17754193ab..fbbdae03dfe8491d4b5f4b5fd514ce8cdb33850f 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
@@ -93,7 +93,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
remoteConsole.prepare(new ListSamples("CISD", sampleTypeCode));
remoteConsole.prepare(new CheckSampleTable().expectedRow(new SampleRow(GROUP_CL)
.identifier("CISD", "CISD")));
- launchTest(30000);
+ launchTest();
}
/**
@@ -113,7 +113,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
+ "'[GROUP.USER, GROUP.POWER_USER, GROUP.ADMIN, INSTANCE.ADMIN]' "
+ "could be found in roles of user 'observer'.");
remoteConsole.prepare(failureExpectation);
- launchTest(30000);
+ launchTest();
}
public final void testRegisterGroupSampleWithParent()
@@ -127,7 +127,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
remoteConsole.prepare(new ListSamples("CISD", sampleTypeCode));
remoteConsole.prepare(new CheckSampleTable().expectedRow(new SampleRow(sampleCode
.toUpperCase()).identifier("CISD", "CISD")));
- launchTest(30000);
+ launchTest();
}
public final void testRegisterGroupSampleWithExperiment()
@@ -141,7 +141,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
remoteConsole.prepare(new ListSamples("CISD", sampleTypeCode));
remoteConsole.prepare(new CheckSampleTable().expectedRow(new SampleRow(sampleCode
.toUpperCase()).identifier("CISD", "CISD").experiment("CISD", "NEMO", "EXP1")));
- launchTest(30000);
+ launchTest();
}
public final void testRegisterGroupSampleWithContainer()
@@ -164,7 +164,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
componentsTable.expectedRow(new Row().withCell(sampleCodeFieldIdent,
containerCode + ":" + sampleCode).withCell(sampleSubcodeFieldIdent, sampleCode));
remoteConsole.prepare(checkSample);
- launchTest(60000);
+ launchTest();
}
public final void testRegisterSharedSample()
@@ -183,6 +183,6 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
sampleTypeCode));
remoteConsole.prepare(new CheckSampleTable().expectedRow(new SampleRow(SHARED_CL)
.identifier("CISD").withUserPropertyCell("DESCRIPTION", description)));
- launchTest(30000);
+ launchTest();
}
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
index 68cf5666ccb9e885765ff32e226b6b89d5c5bb4f..67bbf403c6093f31a6863e698ed4c5f29aa6a134 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
@@ -92,7 +92,7 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
checkSample.dataTable().expectedSize(0);
remoteConsole.prepare(checkSample);
- launchTest(DEFAULT_TIMEOUT);
+ launchTest();
}
public final void testShowCellPlateView()
@@ -153,7 +153,7 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
// browse shown dataset
remoteConsole.prepare(new BrowseDataSet(DIRECTLY_CONNECTED_DATA_SET_CODE));
- launchTest(DEFAULT_TIMEOUT);
+ launchTest();
}
@DoNotRunWith(Platform.HtmlUnit)
@@ -211,6 +211,6 @@ public class GenericSampleViewerTest extends AbstractGWTTestCase
}
});
- launchTest(DEFAULT_TIMEOUT);
+ launchTest();
}
}