[LMS-1625] got rid of @DoNotRunWith minor: reduced default timeout

SVN: 16950

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

@@ -42,7 +42,7 @@ public abstract class AbstractGWTTestCase extends GWTTestCase
 {
     protected static final int SECOND = 1000;
 
-    protected static final int DEFAULT_TIMEOUT = 180 * SECOND;
+    protected static final int DEFAULT_TIMEOUT = 90 * SECOND;
 
     protected RemoteConsole remoteConsole;
 

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

@@ -16,9 +16,6 @@
 
 package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset;
 
-import com.google.gwt.junit.DoNotRunWith;
-import com.google.gwt.junit.Platform;
-
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.MainTabPanel;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.ShowDataSet;
@@ -40,7 +37,6 @@ import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.Pro
  * @author Piotr Buczek
  */
 // TODO 2009-10-07, Piotr Buczek: add tests where sample/experiment is modified
-@DoNotRunWith(Platform.HtmlUnit)
 public class GenericDataSetEditorTest extends AbstractGWTTestCase
 {
     // private static final String DS_WITH_DIRECT_SAMPLE_CONNECTION_CODE = "20081105092158673-1";
@@ -71,7 +67,7 @@ public class GenericDataSetEditorTest extends AbstractGWTTestCase
         checkParents.expectedRow(new DataSetRow(oldParentCode));
         remoteConsole.prepare(checkDataSet);
 
-        launchTest(180 * SECOND);
+        launchTest();
     }
 
     // could be removed when we implement BO unit test or merged with first test

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

@@ -16,9 +16,6 @@
 
 package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset;
 
-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.data.ShowDataSet;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.ShowDataSetChildrenAndParents;
@@ -33,7 +30,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.CheckTab
  * @author Piotr Buczek
  */
 // TODO 2009-10-07, Piotr Buczek: ignore iframe trying to get connection with DSS
-@DoNotRunWith(Platform.HtmlUnit)
 public class GenericDataSetViewerTest extends AbstractGWTTestCase
 {
 

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

@@ -224,7 +224,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
         datasetTable.expectedRow(new DataSetRow("20081105092159188-3").valid().derived());
         datasetTable.expectedRow(new DataSetRow("20081105092158673-1").invalid().withSample(
                 "CISD:/CISD/3VCP1").withSampleType("CELL_PLATE").notDerived().withIsComplete(null));
-        datasetTable.expectedColumnsNumber(25);
+        datasetTable.expectedColumnsNumber(26);
         final String commentColIdent = GridTestUtils.getPropertyColumnIdentifier("COMMENT", false);
         datasetTable.expectedColumnHidden(commentColIdent, true);
 

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

@@ -17,8 +17,6 @@
 package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample;
 
 import com.extjs.gxt.ui.client.widget.grid.Grid;
-import com.google.gwt.junit.DoNotRunWith;
-import com.google.gwt.junit.Platform;
 import com.google.gwt.user.client.ui.Widget;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
@@ -43,7 +41,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Invalidation;
  * 
  * @author Franz-Josef Elmer
  */
-@DoNotRunWith(Platform.HtmlUnit)
 public class GenericSampleViewerTest extends AbstractGWTTestCase
 {
     static final String GROUP_IDENTIFIER = "CISD:/CISD";