Fix NotificationDelayTest for IE8 and Chrome. (#14689)

Change-Id: I3f92722ce9832ec2b748f2bf20477244597a8912

1 files changed, 12 insertions, 15 deletions

diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationDelayTest.java b/uitest/src/com/vaadin/tests/components/notification/NotificationDelayTest.java
index 219d44710c..903c3440cc 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationDelayTest.java
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationDelayTest.java
@@ -15,12 +15,13 @@
  */
 package com.vaadin.tests.components.notification;
 
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.interactions.Actions;
-
-import com.vaadin.tests.tb3.MultiBrowserTest;
+import org.openqa.selenium.support.ui.ExpectedCondition;
 
 /**
  * Test to check notification delay.
@@ -34,20 +35,16 @@ public class NotificationDelayTest extends MultiBrowserTest {
         openTestURL();
 
         Assert.assertTrue("No notification found", hasNotification());
-        Actions actions = new Actions(getDriver());
-        actions.moveByOffset(10, 10).build().perform();
-        long start = System.currentTimeMillis();
-        boolean hidden = false;
-        while (System.currentTimeMillis() <= start + 5000) {
-            Thread.sleep(500);
-            hidden = !hasNotification();
-            if (hidden) {
-                break;
-            }
-        }
 
-        Assert.assertTrue("Notification is still visible after 5 seconds",
-                hidden);
+        waitUntil(new ExpectedCondition<Boolean>() {
+
+            @Override
+            public Boolean apply(WebDriver input) {
+                new Actions(getDriver()).moveByOffset(10, 10).perform();
+
+                return !hasNotification();
+            }
+        });
     }
 
     private boolean hasNotification() {