test: reduce flakiness on test using thread.sleep

vaadin · Nov 12, 2020 · 1784d3b · 1784d3b
1 parent cff87ee
commit 1784d3b
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/...tion-tests/src/test/java/com/vaadin/flow/component/textfield/tests/ValueChangeModeIT.java b/...tion-tests/src/test/java/com/vaadin/flow/component/textfield/tests/ValueChangeModeIT.java
@@ -24,6 +24,9 @@
 import org.openqa.selenium.support.ui.WebDriverWait;
 
 import com.vaadin.tests.AbstractComponentIT;
+
+import static org.junit.Assert.assertTrue;
+
 import com.vaadin.flow.testutil.TestPath;
 
 /**
@@ -157,33 +160,36 @@ private void testValueChangeModes(WebElement field, String componentName)
 
     private void testValueChangeTimeout(WebElement field, String componentName)
             throws InterruptedException {
+        long last = System.currentTimeMillis();
+
         clickButton(componentName + "-lazy");
         field.sendKeys("1");
         assertMessageNotUpdated(
                 "The value change event should not be sent on first key stroke when using ValueChangeMode.LAZY");
+        waitUntilMessageUpdated();
+        assertTrue(-last + (last = System.currentTimeMillis()) > 1000);
 
         for (int i = 0; i < 2; i++) {
             field.sendKeys("1");
-            Thread.sleep(600);
             assertMessageNotUpdated(
                     "The value change event should not be sent until timeout elapsed since last keystroke when using ValueChangeMode.LAZY");
         }
 
-        waitUntilMessageUpdated(400,
-                "The value change event should be sent when timeout elapsed since last keystroke when using ValueChangeMode.LAZY");
+        waitUntilMessageUpdated();
+        assertTrue("The value change event should be sent when timeout elapsed since last keystroke when using ValueChangeMode.LAZY",
+                  -last + (last = System.currentTimeMillis()) > 1000);
 
         clickButton(componentName + "-timeout");
         field.sendKeys("1");
-        assertMessageUpdated(
-                "The value change event should be sent on first key stroke when using ValueChangeMode.TIMEOUT");
+        waitUntilMessageUpdated();
+        assertTrue("The value change event should be sent on first key stroke when using ValueChangeMode.TIMEOUT",
+                  -last + (last = System.currentTimeMillis()) < 1000);
 
-        field.sendKeys("1");
-        Thread.sleep(600);
-        assertMessageNotUpdated(
-                "The value change event should not be sent until timeout elapsed since last event when using ValueChangeMode.TIMEOUT");
 
-        waitUntilMessageUpdated(400,
-                "The value change event should be sent when timeout elapsed since last event when using ValueChangeMode.TIMEOUT");
+        field.sendKeys("1");
+        waitUntilMessageUpdated();
+        assertTrue("The value change event should be sent when timeout elapsed since last event when using ValueChangeMode.TIMEOUT",
+                  -last + (last = System.currentTimeMillis()) > 1000);
     }
 
     private void clickButton(String buttonId) {
@@ -202,11 +208,14 @@ private void assertMessageNotUpdated(String failMessage) {
     private boolean isMessageUpdated() {
         String messageText = message.getText();
         boolean isUpdated = !message.getText().equals(lastMessageText);
-        System.err.println(++count + " lastMessage:" + lastMessageText + " newMessage:" + messageText);
         lastMessageText = messageText;
         return isUpdated;
     }
 
+    private void waitUntilMessageUpdated() {
+        waitUntilMessageUpdated(2000, "It took more than 2000ms to change the message, probably CI performance problems");
+    }
+
     private void waitUntilMessageUpdated(long timeout, String failMessage) {
         new WebDriverWait(getDriver(), timeout).withMessage(failMessage)
                 .until(webDriver -> isMessageUpdated());