[java] Test code cleanup, updating to Java 8 features

SeleniumHQ · Oct 1, 2019 · e349318 · e349318
1 parent 982baeb
commit e349318
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 35 deletions.
diff --git a/java/client/test/org/openqa/selenium/WaitingConditions.java b/java/client/test/org/openqa/selenium/WaitingConditions.java
@@ -78,7 +78,7 @@ boolean compareText(String expectedValue, String actualValue) {
   }
 
   public static ExpectedCondition<String> elementTextToEqual(final By locator, final String value) {
-    return new ExpectedCondition<String>() {
+    return new ExpectedCondition<>() {
 
       @Override
       public String apply(WebDriver driver) {
@@ -100,7 +100,7 @@ public String toString() {
 
   public static ExpectedCondition<String> elementValueToEqual(
       final WebElement element, final String expectedValue) {
-    return new ExpectedCondition<String>() {
+    return new ExpectedCondition<>() {
 
       private String lastValue = "";
 
@@ -121,7 +121,7 @@ public String toString() {
   }
 
   public static ExpectedCondition<String> pageSourceToContain(final String expectedText) {
-    return new ExpectedCondition<String>() {
+    return new ExpectedCondition<>() {
       @Override
       public String apply(WebDriver driver) {
         String source = driver.getPageSource();
@@ -141,7 +141,7 @@ public String toString() {
 
   public static ExpectedCondition<Point> elementLocationToBe(
       final WebElement element, final Point expectedLocation) {
-    return new ExpectedCondition<Point>() {
+    return new ExpectedCondition<>() {
       private Point currentLocation = new Point(0, 0);
 
       @Override
@@ -181,7 +181,7 @@ public static ExpectedCondition<String> newWindowIsOpened(final Set<String> orig
   }
 
   public static ExpectedCondition<WebDriver> windowToBeSwitchedToWithName(final String windowName) {
-    return new ExpectedCondition<WebDriver>() {
+    return new ExpectedCondition<>() {
 
       @Override
       public WebDriver apply(WebDriver driver) {

diff --git a/java/client/test/org/openqa/selenium/atoms/InputAtomsTest.java b/java/client/test/org/openqa/selenium/atoms/InputAtomsTest.java
@@ -41,7 +41,7 @@ public class InputAtomsTest {
   @Test
   public void exportsTheExpectedNames() throws IOException {
     final String source = JavaScriptLoader.loadResource(RESOURCE_PATH);
-    ContextFactory.getGlobal().call(new ContextAction() {
+    ContextFactory.getGlobal().call(new ContextAction<>() {
       private ScriptableObject global;
 
       @Override

diff --git a/java/client/test/org/openqa/selenium/build/InProject.java b/java/client/test/org/openqa/selenium/build/InProject.java
@@ -26,7 +26,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Objects;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class InProject {
@@ -44,7 +43,7 @@ public static Path locate(String... paths) {
         .map(path -> Paths.get(path))
         .filter(path -> Files.exists(path))
         .findFirst()
-        .map(path -> path.toAbsolutePath())
+        .map(Path::toAbsolutePath)
         .orElseGet(() -> {
           Path root = findProjectRoot();
           return Stream.of(paths)
@@ -55,7 +54,7 @@ public static Path locate(String... paths) {
               .filter(Objects::nonNull)
               .findFirst().orElseThrow(() -> new WebDriverException(new FileNotFoundException(
                   String.format("Could not find any of %s in the project",
-                                Stream.of(paths).collect(Collectors.joining(","))))));
+                                String.join(",", paths)))));
         });
   }
 

diff --git a/java/client/test/org/openqa/selenium/devtools/ChromeDevToolsFetchTests.java b/java/client/test/org/openqa/selenium/devtools/ChromeDevToolsFetchTests.java
@@ -54,7 +54,7 @@ public void testFulfillRequest() {
                   Optional.empty(),
                   Optional.empty()));
         });
-    List<RequestPattern> patterns = new ArrayList();
+    List<RequestPattern> patterns = new ArrayList<>();
     patterns.add(new RequestPattern("*://*.*", ResourceType.EventSource, RequestStage.Request));
     devTools.send(enable(Optional.of(patterns), Optional.empty()));
     chromeDriver.get(appServer.whereIs("simpleTest.html"));
@@ -79,7 +79,7 @@ public void testContinueRequest() {
           Assert.assertNotNull(stream);
 
         });
-    List<RequestPattern> patterns = new ArrayList();
+    List<RequestPattern> patterns = new ArrayList<>();
     patterns.add(new RequestPattern("*://*.*", ResourceType.EventSource, RequestStage.Request));
     devTools.send(enable(Optional.of(patterns), Optional.empty()));
     chromeDriver.get(appServer.whereIs("simpleTest.html"));
@@ -93,7 +93,7 @@ public void testFailRequest() {
           Assert.assertNotNull(p);
           devTools.send(failRequest(p.getRequestId(), ErrorReason.BlockedByClient));
         });
-    List<RequestPattern> patterns = new ArrayList();
+    List<RequestPattern> patterns = new ArrayList<>();
     patterns.add(new RequestPattern("*://*.*", ResourceType.EventSource, RequestStage.Request));
     devTools.send(enable(Optional.of(patterns), Optional.empty()));
     chromeDriver.get(appServer.whereIs("simpleTest.html"));

diff --git a/java/client/test/org/openqa/selenium/devtools/ChromeDevToolsTargetTest.java b/java/client/test/org/openqa/selenium/devtools/ChromeDevToolsTargetTest.java
@@ -79,7 +79,7 @@ public void getTargetAndSendMessageToTarget() {
     devTools.addListener(receivedMessageFromTarget(), this::validateMessage);
     allTargets = devTools.send(getTargets());
     validateTargetsInfos(allTargets);
-    ArrayList<TargetInfo> listTargets = new ArrayList(allTargets);
+    ArrayList<TargetInfo> listTargets = new ArrayList<>(allTargets);
     validateTarget(listTargets.get(0));
     targetInfo = listTargets.get(0);
     devTools.send(activateTarget(targetInfo.getTargetId()));

diff --git a/java/client/test/org/openqa/selenium/environment/webserver/SleepingHandler.java b/java/client/test/org/openqa/selenium/environment/webserver/SleepingHandler.java
@@ -33,7 +33,7 @@ public class SleepingHandler implements HttpHandler {
   @Override
   public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
     String duration = req.getQueryParameter("time");
-    long timeout = Long.valueOf(duration) * 1000;
+    long timeout = Long.parseLong(duration) * 1000;
 
     reallySleep(timeout);
 

diff --git a/java/client/test/org/openqa/selenium/environment/webserver/SleepingServlet.java b/java/client/test/org/openqa/selenium/environment/webserver/SleepingServlet.java
@@ -32,7 +32,7 @@ public class SleepingServlet extends HttpServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws IOException {
     String duration = request.getParameter("time");
-    long timeout = Long.valueOf(duration) * 1000;
+    long timeout = Long.parseLong(duration) * 1000;
 
     reallySleep(timeout);
 

diff --git a/java/client/test/org/openqa/selenium/environment/webserver/StaticContent.java b/java/client/test/org/openqa/selenium/environment/webserver/StaticContent.java
@@ -66,15 +66,13 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
         res.setStatus(200);
         res.setHeader("Content-Type", "text/html");
         try {
-          Files.walk(dest, 0).forEach(
-              path -> {
-                content.append("<p><a href=\"")
-                    .append(String.format("%s/%s", req.getUri(), path.getFileName()))
-                    .append("\">")
-                    .append(path.getFileName())
-                    .append("</a>");
-              }
-          );
+          Files.walk(dest, 0).forEach(path -> content
+              .append("<p><a href=\"")
+              .append(String.format("%s/%s", req.getUri(), path.getFileName()))
+              .append("\">")
+              .append(path.getFileName())
+              .append("</a>")
+         );
 
           res.setContent(utf8String(content.toString()));
           return res;

diff --git a/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java b/java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java
@@ -493,7 +493,7 @@ private boolean fuzzyPositionMatching(int expectedX, int expectedY, String locat
 
   private ExpectedCondition<Boolean> fuzzyMatchingOfCoordinates(
       final WebElement element, final int x, final int y) {
-    return new ExpectedCondition<Boolean>() {
+    return new ExpectedCondition<>() {
       @Override
       public Boolean apply(WebDriver ignored) {
         return fuzzyPositionMatching(x, y, element.getText());

diff --git a/java/client/test/org/openqa/selenium/support/ui/FluentWaitTest.java b/java/client/test/org/openqa/selenium/support/ui/FluentWaitTest.java
@@ -196,7 +196,7 @@ public void timeoutMessageIncludesToStringOfCondition() {
         "Expected condition failed: waiting for toString called "
         + "(tried for 0 second(s) with 500 milliseconds interval)");
 
-    Function<Object, Boolean> condition = new Function<Object, Boolean>() {
+    Function<Object, Boolean> condition = new Function<>() {
       @Override
       public Boolean apply(Object ignored) {
         return false;
@@ -241,7 +241,7 @@ public void callsDeprecatedHandlerForRuntimeExceptions() {
     when(mockCondition.apply(mockDriver)).thenThrow(exception);
 
     final TestException sentinelException = new TestException();
-    FluentWait<WebDriver> wait = new FluentWait<WebDriver>(mockDriver, mockClock, mockSleeper) {
+    FluentWait<WebDriver> wait = new FluentWait<>(mockDriver, mockClock, mockSleeper) {
       @Override
       protected RuntimeException timeoutException(String message, Throwable lastException) {
         throw sentinelException;

diff --git a/java/client/test/org/openqa/selenium/testing/IgnoreComparator.java b/java/client/test/org/openqa/selenium/testing/IgnoreComparator.java
@@ -54,14 +54,10 @@ public boolean shouldIgnore(Ignore ignore) {
   private boolean shouldIgnore(Stream<Ignore> ignoreList) {
     return ignoreList.anyMatch(driver ->
         (ignored.contains(driver.value()) || driver.value() == Browser.ALL)
-        && (!driver.travis() || isOnTravis())
+        && (!driver.travis() || TestUtilities.isOnTravis())
         && isOpen(driver.issue()));
   }
 
-  private boolean isOnTravis() {
-    return Boolean.valueOf(System.getenv().getOrDefault("TRAVIS", "false"));
-  }
-
   private boolean isOpen(String issue) {
     if ("".equals(issue)) {
       return true; // unknown issue, suppose it's open

diff --git a/java/client/test/org/openqa/selenium/testing/TestUtilities.java b/java/client/test/org/openqa/selenium/testing/TestUtilities.java
@@ -202,6 +202,6 @@ public static boolean isLocal() {
   }
 
   public static boolean isOnTravis() {
-    return Boolean.valueOf(System.getenv("TRAVIS"));
+    return Boolean.parseBoolean(System.getenv("TRAVIS"));
   }
 }
diff --git a/java/client/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java b/java/client/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java
@@ -72,7 +72,7 @@ public OutOfProcessSeleniumServer start(String mode, String... extraFlags) {
     cmdLine.add("--port");
     cmdLine.add(String.valueOf(port));
     cmdLine.addAll(Arrays.asList(extraFlags));
-    command = new CommandLine(cmdLine.toArray(new String[cmdLine.size()]));
+    command = new CommandLine(cmdLine.toArray(new String[0]));
 
     if (Boolean.getBoolean("webdriver.development")) {
       command.copyOutputTo(System.err);

diff --git a/java/client/test/org/openqa/selenium/testing/drivers/TestEdgeDriver.java b/java/client/test/org/openqa/selenium/testing/drivers/TestEdgeDriver.java
@@ -71,7 +71,7 @@ private static URL getServiceUrl() {
         EdgeDriverService.Builder<?, ?> builder =
             StreamSupport.stream(ServiceLoader.load(DriverService.Builder.class).spliterator(), false)
                 .filter(b -> b instanceof EdgeDriverService.Builder)
-                .map(b -> (EdgeDriverService.Builder) b)
+                .map(b -> (EdgeDriverService.Builder<?, ?>) b)
                 .filter(b -> b.isLegacy() == isLegacy)
                 .findFirst().orElseThrow(WebDriverException::new);