Refactoring

Author: barancev

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

@@ -505,40 +505,22 @@ public void testCanQuitWhenAnAlertIsPresent() {
 
   private static ExpectedCondition<Boolean> textInElementLocated(
       final By locator, final String text) {
-    return new ExpectedCondition<Boolean>() {
-      @Override
-      public Boolean apply(WebDriver driver) {
-        return text.equals(driver.findElement(locator).getText());
-      }
-    };
+    return driver -> text.equals(driver.findElement(locator).getText());
   }
 
   private static ExpectedCondition<Boolean> windowCountIs(final int count) {
-    return new ExpectedCondition<Boolean>() {
-      @Override
-      public Boolean apply(WebDriver driver) {
-        return driver.getWindowHandles().size() == count;
-      }
-    };
+    return driver -> driver.getWindowHandles().size() == count;
   }
 
   private static ExpectedCondition<WebDriver> ableToSwitchToWindow(final String name) {
-    return new ExpectedCondition<WebDriver>() {
-      @Override
-      public WebDriver apply(WebDriver driver) {
-        return driver.switchTo().window(name);
-      }
-    };
+    return driver -> driver.switchTo().window(name);
   }
 
   private static ExpectedCondition<String> newWindowIsOpened(final Set<String> originalHandles) {
-    return new ExpectedCondition<String>() {
-      @Override
-      public String apply(WebDriver driver) {
-        Set<String> currentWindowHandles = driver.getWindowHandles();
-        currentWindowHandles.removeAll(originalHandles);
-        return currentWindowHandles.isEmpty() ? null : currentWindowHandles.iterator().next();
-      }
+    return driver -> {
+      Set<String> currentWindowHandles = driver.getWindowHandles();
+      currentWindowHandles.removeAll(originalHandles);
+      return currentWindowHandles.isEmpty() ? null : currentWindowHandles.iterator().next();
     };
   }
 }

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

@@ -209,68 +209,40 @@ private void maximize() {
   }
 
   private ExpectedCondition<Boolean> windowSizeEqual(final Dimension size) {
-    return new ExpectedCondition<Boolean>() {
-      public Boolean apply(WebDriver driver) {
-        Dimension newSize = driver.manage().window().getSize();
+    return driver -> {
+      Dimension newSize = driver.manage().window().getSize();
 
-        return newSize.height == size.height &&
-               newSize.width == size.width;
-      }
+      return newSize.height == size.height &&
+             newSize.width == size.width;
     };
   }
 
   private ExpectedCondition<Boolean> windowWidthToBeGreaterThan(final Dimension size) {
-    return new ExpectedCondition<Boolean>() {
-      public Boolean apply(WebDriver driver) {
-        Dimension newSize = driver.manage().window().getSize();
-        log.info("waiting for width, Current dimensions are " + newSize);
-        if(newSize.width != size.width) {
-          return true;
-        }
-
-        return null;
-      }
+    return driver -> {
+      Dimension newSize = driver.manage().window().getSize();
+      log.info("waiting for width, Current dimensions are " + newSize);
+      return newSize.width != size.width;
     };
   }
 
   private ExpectedCondition<Boolean> windowHeightToBeGreaterThan(final Dimension size) {
-    return new ExpectedCondition<Boolean>() {
-      @Override
-      public Boolean apply(WebDriver driver) {
-        Dimension newSize = driver.manage().window().getSize();
-        log.info("waiting for height, Current dimensions are " + newSize);
-        if(newSize.height != size.height) {
-          return true;
-        }
-
-        return null;
-      }
+    return driver -> {
+      Dimension newSize = driver.manage().window().getSize();
+      log.info("waiting for height, Current dimensions are " + newSize);
+      return newSize.height != size.height;
     };
   }
   private ExpectedCondition<Boolean> xEqual(final Point targetPosition) {
-    return new ExpectedCondition<Boolean>() {
-      public Boolean apply(WebDriver driver) {
-        Point newPosition = driver.manage().window().getPosition();
-        if(newPosition.x == targetPosition.x) {
-          return true;
-        }
-
-        return null;
-      }
+    return driver -> {
+      Point newPosition = driver.manage().window().getPosition();
+      return newPosition.x == targetPosition.x;
     };
   }
 
   private ExpectedCondition<Boolean> yEqual(final Point targetPosition) {
-    return new ExpectedCondition<Boolean>() {
-      @Override
-      public Boolean apply(WebDriver driver) {
-        Point newPosition = driver.manage().window().getPosition();
-        if(newPosition.y == targetPosition.y) {
-          return true;
-        }
-
-        return null;
-      }
+    return driver -> {
+      Point newPosition = driver.manage().window().getPosition();
+      return newPosition.y == targetPosition.y;
     };
   }