summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2016-01-12 13:36:02 +0200
committerHenri Sara <hesara@vaadin.com>2016-01-12 13:20:22 +0000
commitb5efe7d243603effd392a6079d639f8b207c13be (patch)
tree0ecf82844ea5456d84557203678c4fe524fcfdc6
parenta9632630179d0d700bd008eb07ef8561a69323ea (diff)
downloadvaadin-framework-b5efe7d243603effd392a6079d639f8b207c13be.tar.gz
vaadin-framework-b5efe7d243603effd392a6079d639f8b207c13be.zip
Add a simple waitForApplication for servlet integration tests
This waitForApplication checks if an UI element exists on the page. If not, then it will wait 10 seconds in order for it to appear. This should reduce the amount of false negatives in server tests. Change-Id: I37a398e60c247920fd56fc05b747e0f93f3f2dd2
-rw-r--r--uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
index 5dd59a8245..f035ef35f6 100644
--- a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
+++ b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
@@ -15,6 +15,8 @@
*/
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;
@@ -37,4 +39,17 @@ public abstract class AbstractIntegrationTest extends PrivateTB3Configuration {
return deploymentUrl;
}
+ @Override
+ protected void openTestURL() {
+ super.openTestURL();
+
+ waitForApplication();
+ }
+
+ protected void waitForApplication() {
+ if (!isElementPresent(UIElement.class)) {
+ // Wait for UI element.
+ waitForElementPresent(By.vaadin("//com.vaadin.ui.UI"));
+ }
+ }
}