From d41fafc6035f15cf28fe0a0dc97d5802c4690ebb Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 21 Jan 2010 14:43:21 +0000
Subject: [PATCH] LMS-1343 Changed annotations of tests.
SVN: 14389
---
.../web/client/application/ExperimentBrowserTest.java | 4 ++++
.../client/web/client/application/SampleBrowserTest.java | 4 ----
.../generic/client/web/client/application/SearchTest.java | 3 ---
.../application/dataset/GenericDataSetViewerTest.java | 4 ++++
.../GenericExperimentAttachmentDownloadTest.java | 3 +++
.../experiment/GenericExperimentEditorTest.java | 4 ++++
.../experiment/GenericExperimentViewerTest.java | 8 ++++++++
7 files changed, 23 insertions(+), 7 deletions(-)
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 358c8fa7284..eea0c618132 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
@@ -16,6 +16,9 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application;
+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.experiment.CheckExperimentTable;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ListExperiments;
@@ -28,6 +31,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType;
*
* @author Izabela Adamczyk
*/
+@DoNotRunWith(Platform.HtmlUnit)
public class ExperimentBrowserTest extends AbstractGWTTestCase
{
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 7644913f3eb..44e7f49d84f 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
@@ -18,9 +18,6 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application;
import static ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.AbstractColumnDefinitionKind.DEFAULT_COLUMN_WIDTH;
-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;
@@ -71,7 +68,6 @@ public class SampleBrowserTest extends AbstractGWTTestCase
launchTest();
}
- @DoNotRunWith(Platform.HtmlUnit)
public final void testListAllSamples()
{
loginAndInvokeAction(ActionMenuKind.SAMPLE_MENU_BROWSE);
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 570fa57bd13..a7b4189edfb 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
@@ -50,7 +50,6 @@ public class SearchTest extends AbstractGWTTestCase
launchTest();
}
- @DoNotRunWith(Platform.HtmlUnit)
public final void testContainedSampleSearch()
{
remoteConsole.prepare(new Login("test", "a"));
@@ -63,7 +62,6 @@ public class SearchTest extends AbstractGWTTestCase
launchTest();
}
- @DoNotRunWith(Platform.HtmlUnit)
public final void testExperimentSearch()
{
remoteConsole.prepare(new Login("test", "a"));
@@ -77,7 +75,6 @@ public class SearchTest extends AbstractGWTTestCase
launchTest();
}
- @DoNotRunWith(Platform.HtmlUnit)
public final void testDataSetSearch()
{
remoteConsole.prepare(new Login("test", "a"));
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 b20a49a6830..ccd1767de90 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
@@ -16,6 +16,9 @@
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;
@@ -29,6 +32,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.CheckTab
*
* @author Piotr Buczek
*/
+@DoNotRunWith(Platform.HtmlUnit)
public class GenericDataSetViewerTest extends AbstractGWTTestCase
{
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java
index 1ababd2f8a4..4c014d64e4a 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java
@@ -23,6 +23,8 @@ import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.RequestCallback;
import com.google.gwt.http.client.RequestException;
import com.google.gwt.http.client.Response;
+import com.google.gwt.junit.DoNotRunWith;
+import com.google.gwt.junit.Platform;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
@@ -54,6 +56,7 @@ public class GenericExperimentAttachmentDownloadTest extends AbstractGWTTestCase
remoteConsole.prepare(new ShowExperiment(experimentCode));
}
+ @DoNotRunWith(Platform.HtmlUnit)
public final void testDownloadAttachment()
{
prepareShowExperiment(DEFAULT, SIRNA_HCS, EXP_REUSE);
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 6360b42cb08..34223ce130f 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
@@ -18,6 +18,9 @@ package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.ex
import java.util.Date;
+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.experiment.CheckExperimentTable;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment.ListExperiments;
@@ -32,6 +35,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.Pro
*
* @author Izabela Adamczyk
*/
+@DoNotRunWith(Platform.HtmlUnit)
public class GenericExperimentEditorTest extends AbstractGWTTestCase
{
private static final String SIRNA_HCS = "SIRNA_HCS";
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 79ad3c64f45..0222209e102 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
@@ -16,6 +16,9 @@
package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment;
+import com.google.gwt.junit.DoNotRunWith;
+import com.google.gwt.junit.Platform;
+
import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
@@ -123,6 +126,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
launchTest();
}
+ @DoNotRunWith(Platform.HtmlUnit)
public final void testShowExperimentDetails()
{
prepareShowExperiment(NEMO, SIRNA_HCS, EXP1);
@@ -143,6 +147,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
launchTest();
}
+ @DoNotRunWith(Platform.HtmlUnit)
public final void testShowInvalidExperimentDetails()
{
prepareShowExperiment(DEFAULT, SIRNA_HCS, EXP_X);
@@ -166,6 +171,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
launchTest();
}
+ @DoNotRunWith(Platform.HtmlUnit)
public final void testListOfAttachments()
{
prepareShowExperiment(DEFAULT, SIRNA_HCS, EXP_REUSE);
@@ -184,6 +190,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
launchTest();
}
+ @DoNotRunWith(Platform.HtmlUnit)
public final void testListOfSamples()
{
prepareShowExperiment(DEFAULT, SIRNA_HCS, EXP_REUSE);
@@ -211,6 +218,7 @@ public class GenericExperimentViewerTest extends AbstractGWTTestCase
launchTest();
}
+ @DoNotRunWith(Platform.HtmlUnit)
public final void testListOfDataSets()
{
prepareShowExperiment(NEMO, SIRNA_HCS, EXP1);
--
GitLab