diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-21 09:30:46 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-03-21 09:30:46 +0000 |
| commit | a70ef27bb7b6e8c41a27041bdd1b794c95544be8 (patch) | |
| tree | f4670325e3f8237998f987516ac226cf5b9161dc /uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java | |
| parent | 44f3ea58cd7bdca7e25d92b6c411da58d9928e6c (diff) | |
| parent | 1f149be0e8c49e8d7a69853f758f2a01356202e5 (diff) | |
| download | vaadin-framework-a70ef27bb7b6e8c41a27041bdd1b794c95544be8.tar.gz vaadin-framework-a70ef27bb7b6e8c41a27041bdd1b794c95544be8.zip | |
Merge "Merge changes from origin/7.1"
Diffstat (limited to 'uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java')
| -rw-r--r-- | uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java index cbb3a8b8e4..0266a9d892 100644 --- a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java +++ b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java @@ -15,15 +15,8 @@ */ package com.vaadin.tests.integration; -import java.util.Collection; -import java.util.Collections; - -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized.Parameters; -import org.openqa.selenium.remote.DesiredCapabilities; - -import com.vaadin.tests.tb3.MultiBrowserTest.Browser; import com.vaadin.tests.tb3.PrivateTB3Configuration; +import com.vaadin.tests.tb3.TestNameSuffix; /** * Base class for integration tests. Integration tests use the @@ -32,7 +25,7 @@ import com.vaadin.tests.tb3.PrivateTB3Configuration; * * @author Vaadin Ltd */ -@RunWith(IntegrationTestRunner.class) +@TestNameSuffix(property = "server-name") public abstract class AbstractIntegrationTest extends PrivateTB3Configuration { @Override protected String getBaseURL() { @@ -41,13 +34,7 @@ public abstract class AbstractIntegrationTest extends PrivateTB3Configuration { throw new RuntimeException( "Deployment url must be given as deployment.url"); } - return deploymentUrl; } - @Parameters - public static Collection<DesiredCapabilities> getBrowsersForTest() { - return Collections.singleton(Browser.FIREFOX.getDesiredCapabilities()); - } - } |