Unifying use of waiting conditions

Author: barancev

java/client/test/org/openqa/selenium/JavascriptEnabledDriverTest.java

@@ -23,7 +23,6 @@
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.JavascriptEnabled;
 
-import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -34,6 +33,7 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.openqa.selenium.TestWaiter.waitFor;
+import static org.openqa.selenium.WaitingConditions.windowToBeSwitchedToWithName;
 import static org.openqa.selenium.WaitingConditions.elementTextToEqual;
 import static org.openqa.selenium.WaitingConditions.elementValueToEqual;
 import static org.openqa.selenium.testing.Ignore.Driver.ANDROID;
@@ -285,7 +285,7 @@ public void testShouldBeAbleToClickALinkThatClosesAWindow() throws Exception {
  driver.findElement(By.id("new_window")).click();
 
  // Depending on the Android emulator platform this can take a while.
- waitFor(openAndSwitchToWindow("close_me", driver), 30, TimeUnit.SECONDS);
+ waitFor(windowToBeSwitchedToWithName(driver, "close_me"), 30, TimeUnit.SECONDS);
 
  driver.findElement(By.id("close")).click();
 
@@ -294,15 +294,6 @@ public void testShouldBeAbleToClickALinkThatClosesAWindow() throws Exception {
  // If we haven't seen an exception or hung the test has passed
  }
 
- private Callable<Boolean> openAndSwitchToWindow(final String name, final WebDriver driver) {
- return new Callable<Boolean>() {
- public Boolean call() throws Exception {
- driver.switchTo().window(name);
- return Boolean.TRUE;
- }
- };
- }
-
  private void moveFocus() {
  driver.findElement(By.id("clickField")).click();
  }