fix tests that should assume ScriptTimeoutException now, attempt to d…

…eflake other tests
SeleniumHQ · Oct 3, 2016 · 92cf774 · 92cf774
1 parent 87f0371
commit 92cf774
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java b/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java
@@ -168,7 +168,7 @@ public void shouldTimeoutIfScriptDoesNotInvokeCallback() {
       // Script is expected to be async and explicitly callback, so this should timeout.
       executor.executeAsyncScript("return 1 + 2;");
       fail("Should have thrown a TimeOutException!");
-    } catch (TimeoutException exception) {
+    } catch (ScriptTimeoutException exception) {
       // Do nothing.
     }
   }
@@ -181,7 +181,7 @@ public void shouldTimeoutIfScriptDoesNotInvokeCallbackWithAZeroTimeout() {
     try {
       executor.executeAsyncScript("window.setTimeout(function() {}, 0);");
       fail("Should have thrown a TimeOutException!");
-    } catch (TimeoutException exception) {
+    } catch (ScriptTimeoutException exception) {
       // Do nothing.
     }
   }
@@ -207,7 +207,7 @@ public void shouldTimeoutIfScriptDoesNotInvokeCallbackWithLongTimeout() {
           "var callback = arguments[arguments.length - 1];" +
           "window.setTimeout(callback, 1500);");
       fail("Should have thrown a TimeOutException!");
-    } catch (TimeoutException exception) {
+    } catch (ScriptTimeoutException exception) {
       // Do nothing.
     }
   }

diff --git a/java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java b/java/client/test/org/openqa/selenium/interactions/BasicKeyboardInterfaceTest.java
@@ -34,6 +34,7 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.Color;
 import org.openqa.selenium.support.Colors;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.JavascriptEnabled;
@@ -226,7 +227,8 @@ public void testSelectionSelectByWord() {
     WebElement keyReporter = driver.findElement(By.id("keyReporter"));
 
     getBuilder(driver).click(keyReporter).sendKeys("abc def").perform();
-    assertThat(keyReporter.getAttribute("value"), is("abc def"));
+    wait.until(
+      ExpectedConditions.attributeToBe(keyReporter, "value", "abc def"));
 
     getBuilder(driver).click(keyReporter)
         .keyDown(Keys.SHIFT)
@@ -237,7 +239,8 @@ public void testSelectionSelectByWord() {
         .sendKeys(Keys.DELETE)
         .perform();
 
-    assertThat(keyReporter.getAttribute("value"), is("abc "));
+    wait.until(
+      ExpectedConditions.attributeToBe(keyReporter, "value", "abc "));
   }
 
   @Test

diff --git a/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java b/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java
@@ -36,6 +36,7 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.testing.NeedsFreshDriver;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.Point;
@@ -481,8 +482,8 @@ public void testMoveMouseByOffsetOverAndOutOfAnElement() {
     new Actions(driver).moveToElement(greenbox, 2, 2)
       .moveByOffset(shiftX, shiftY)
       .moveByOffset(-shiftX, -shiftY).perform();
-    assertEquals(
-      Colors.GREEN.getColorValue(), Color.fromString(redbox.getCssValue("background-color")));
+
+    wait.until(ExpectedConditions.attributeToBe(redbox, "background-color", Colors.GREEN.getColorValue().asRgba()));
   }
 
   @JavascriptEnabled
@@ -511,8 +512,8 @@ public void testCanMoveOverAndOutOfAnElement() {
     // would be happy with 1.
     new Actions(driver).moveToElement(redbox, size.getWidth() + 2, size.getHeight() + 2)
         .perform();
-    assertEquals(
-        Colors.GREEN.getColorValue(), Color.fromString(redbox.getCssValue("background-color")));
+
+    wait.until(ExpectedConditions.attributeToBe(redbox, "background-color", Colors.GREEN.getColorValue().asRgba()));
   }
 
   private boolean fuzzyPositionMatching(int expectedX, int expectedY, String locationTouple) {