diff options
Diffstat (limited to 'uitest')
4 files changed, 12 insertions, 7 deletions
diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml index 855612ee71..818c0095b6 100644 --- a/uitest/integration_tests.xml +++ b/uitest/integration_tests.xml @@ -105,14 +105,14 @@ <target name="integration-test-jetty8"> <antcall target="run-generic-integration-test"> - <param name="startDelay" value="180" /> + <param name="startDelay" value="90" /> <param name="target-server" value="jetty8" /> </antcall> </target> <target name="integration-test-jetty9"> <antcall target="run-generic-integration-test"> - <param name="startDelay" value="180" /> + <param name="startDelay" value="90" /> <param name="target-server" value="jetty9" /> </antcall> </target> @@ -164,7 +164,7 @@ <target name="integration-test-weblogic12"> <antcall target="run-generic-integration-test"> - <param name="startDelay" value="360" /> + <param name="startDelay" value="60" /> <param name="target-port" value="7001" /> <param name="target-server" value="weblogic12" /> </antcall> diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java index 5cd9d0b9f5..da0d6cb08e 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java @@ -18,7 +18,7 @@ package com.vaadin.tests.integration; import com.vaadin.testbench.By; import com.vaadin.testbench.elements.UIElement; import com.vaadin.testbench.parallel.TestNameSuffix; -import com.vaadin.tests.tb3.PrivateTB3Configuration; +import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; /** * Base class for integration tests. Integration tests use the @@ -28,7 +28,8 @@ import com.vaadin.tests.tb3.PrivateTB3Configuration; * @author Vaadin Ltd */ @TestNameSuffix(property = "server-name") -public abstract class AbstractIntegrationTest extends PrivateTB3Configuration { +public abstract class AbstractIntegrationTest + extends SingleBrowserTestPhantomJS2 { @Override protected String getBaseURL() { String deploymentUrl = System.getProperty("deployment.url"); diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java index 6a1d77317d..747b0fb486 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java @@ -42,8 +42,12 @@ public abstract class AbstractServletIntegrationTest @Test public void runTest() throws IOException, AssertionError { openTestURL(); + // make sure no fading progress indicator from table update is lingering + sleep(2000); compareScreen("initial"); $(TableElement.class).first().getCell(0, 1).click(); + // without this, table fetch might have a fading progress indicator + sleep(2000); compareScreen("finland"); } diff --git a/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java index d135c79347..3a7f907354 100644 --- a/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java @@ -27,9 +27,9 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.tests.tb3.PrivateTB3Configuration; +import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; -public class JSPIntegrationTest extends PrivateTB3Configuration { +public class JSPIntegrationTest extends SingleBrowserTestPhantomJS2 { final String appRunnerTestUrl = getBaseURL() + "/run/Buttons"; final String jspUrl = getBaseURL() + "/statictestfiles/vaadinsessions.jsp"; |