[java] Fixing Java 8 incompatibilities

Author: barancev

java/client/test/org/openqa/selenium/support/locators/RelativeLocatorTest.java

@@ -40,7 +40,7 @@ public void shouldBeAbleToFindElementsAboveAnother() {
     List<WebElement> elements = driver.findElements(withTagName("p").above(lowest));
     List<String> ids = elements.stream().map(e -> e.getAttribute("id")).collect(Collectors.toList());
 
-    assertThat(ids).isEqualTo(List.of("mid", "above"));
+    assertThat(ids).containsExactly("mid", "above");
   }
 
   @Test
@@ -50,7 +50,7 @@ public void shouldBeAbleToCombineFilters() {
     List<WebElement> seen = driver.findElements(withTagName("td").above(By.id("center")).toRightOf(By.id("second")));
 
     List<String> ids = seen.stream().map(e -> e.getAttribute("id")).collect(Collectors.toList());
-    assertThat(ids).isEqualTo(singletonList("third"));
+    assertThat(ids).containsExactly("third");
   }
 
   @Test
@@ -69,6 +69,6 @@ public void exerciseNearLocator() {
     // 5-8. Diagonally close (pythagorus sorting, with top row first
     //    because of DOM insertion order)
     List<String> ids = seen.stream().map(e -> e.getAttribute("id")).collect(Collectors.toList());
-    assertThat(ids).isEqualTo(List.of("second", "eighth", "fourth", "sixth", "first", "third", "seventh", "ninth"));
+    assertThat(ids).containsExactly("second", "eighth", "fourth", "sixth", "first", "third", "seventh", "ninth");
   }
 }

java/server/test/org/openqa/selenium/grid/node/CustomLocatorHandlerTest.java

@@ -52,17 +52,23 @@
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
 
 import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptySet;
+import static java.util.Collections.singleton;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.when;
 import static org.openqa.selenium.json.Json.MAP_TYPE;
 import static org.openqa.selenium.remote.http.HttpMethod.POST;
 
+import com.google.common.collect.ImmutableMap;
+
 public class CustomLocatorHandlerTest {
 
   private final Secret registrationSecret = new Secret("cheese");
@@ -85,11 +91,12 @@ public void partiallyBuildNode() {
   public void shouldRequireInputToHaveAUsingParameter() {
     Node node = nodeBuilder.build();
 
-    HttpHandler handler = new org.openqa.selenium.grid.node.CustomLocatorHandler(node, registrationSecret, Set.of());
+    HttpHandler handler = new org.openqa.selenium.grid.node.CustomLocatorHandler(
+      node, registrationSecret, emptySet());
 
     HttpResponse res = handler.execute(
       new HttpRequest(POST, "/session/1234/element")
-        .setContent(Contents.asJson(Map.of("value", "1234"))));
+        .setContent(Contents.asJson(singletonMap("value", "1234"))));
 
     assertThat(res.getStatus()).isEqualTo(HTTP_BAD_REQUEST);
     assertThatExceptionOfType(InvalidArgumentException.class).isThrownBy(() -> Values.get(res, MAP_TYPE));
@@ -99,11 +106,12 @@ public void shouldRequireInputToHaveAUsingParameter() {
   public void shouldRequireInputToHaveAValueParameter() {
     Node node = nodeBuilder.build();
 
-    HttpHandler handler = new org.openqa.selenium.grid.node.CustomLocatorHandler(node, registrationSecret, Set.of());
+    HttpHandler handler = new org.openqa.selenium.grid.node.CustomLocatorHandler(
+      node, registrationSecret, emptySet());
 
     HttpResponse res = handler.execute(
       new HttpRequest(POST, "/session/1234/element")
-        .setContent(Contents.asJson(Map.of("using", "magic"))));
+        .setContent(Contents.asJson(singletonMap("using", "magic"))));
 
     assertThat(res.getStatus()).isEqualTo(HTTP_BAD_REQUEST);
     assertThatExceptionOfType(InvalidArgumentException.class).isThrownBy(() -> Values.get(res, MAP_TYPE));
@@ -113,11 +121,12 @@ public void shouldRequireInputToHaveAValueParameter() {
   public void shouldRejectRequestWithAnUnknownLocatorMechanism() {
     Node node = nodeBuilder.build();
 
-    HttpHandler handler = new org.openqa.selenium.grid.node.CustomLocatorHandler(node, registrationSecret, Set.of());
+    HttpHandler handler = new org.openqa.selenium.grid.node.CustomLocatorHandler(
+      node, registrationSecret, emptySet());
 
     HttpResponse res = handler.execute(
       new HttpRequest(POST, "/session/1234/element")
-        .setContent(Contents.asJson(Map.of(
+        .setContent(Contents.asJson(ImmutableMap.of(
           "using", "cheese",
           "value", "tasty"))));
 
@@ -136,7 +145,7 @@ public void shouldCallTheGivenLocatorForALocator() {
     HttpHandler handler = new org.openqa.selenium.grid.node.CustomLocatorHandler(
       node,
       registrationSecret,
-      Set.of(new CustomLocator() {
+      singleton(new CustomLocator() {
         @Override
         public String getLocatorName() {
           return "cheese";
@@ -147,15 +156,15 @@ public By createBy(Object usingParameter) {
           return new By() {
             @Override
             public List<WebElement> findElements(SearchContext context) {
-              return List.of();
+              return emptyList();
             }
           };
         }
       }));
 
     HttpResponse res = handler.with(new ErrorFilter()).execute(
       new HttpRequest(POST, "/session/1234/element")
-        .setContent(Contents.asJson(Map.of(
+        .setContent(Contents.asJson(ImmutableMap.of(
           "using", "cheese",
           "value", "tasty"))));
 
@@ -171,13 +180,13 @@ public void shouldBeAbleToUseNodeAsWebDriver() {
       .thenReturn(
         new HttpResponse()
           .addHeader("Content-Type", Json.JSON_UTF_8)
-          .setContent(Contents.asJson(Map.of(
-            "value", List.of(Map.of(Dialect.W3C.getEncodedElementKey(), elementId))))));
+          .setContent(Contents.asJson(singletonMap(
+            "value", singletonList(singletonMap(Dialect.W3C.getEncodedElementKey(), elementId))))));
 
     HttpHandler handler = new org.openqa.selenium.grid.node.CustomLocatorHandler(
       node,
       registrationSecret,
-      Set.of(new CustomLocator() {
+      singleton(new CustomLocator() {
         @Override
         public String getLocatorName() {
           return "cheese";
@@ -191,7 +200,7 @@ public By createBy(Object usingParameter) {
 
     HttpResponse res = handler.execute(
       new HttpRequest(POST, "/session/1234/elements")
-        .setContent(Contents.asJson(Map.of(
+        .setContent(Contents.asJson(ImmutableMap.of(
           "using", "cheese",
           "value", "tasty"))));
 
@@ -210,13 +219,13 @@ public void shouldBeAbleToRootASearchWithinAnElement() {
       .thenReturn(
         new HttpResponse()
           .addHeader("Content-Type", Json.JSON_UTF_8)
-          .setContent(Contents.asJson(Map.of(
-            "value", List.of(Map.of(Dialect.W3C.getEncodedElementKey(), elementId))))));
+          .setContent(Contents.asJson(singletonMap(
+            "value", singletonList(singletonMap(Dialect.W3C.getEncodedElementKey(), elementId))))));
 
     HttpHandler handler = new CustomLocatorHandler(
       node,
       registrationSecret,
-      Set.of(new CustomLocator() {
+      singleton(new CustomLocator() {
         @Override
         public String getLocatorName() {
           return "cheese";
@@ -230,7 +239,7 @@ public By createBy(Object usingParameter) {
 
     HttpResponse res = handler.execute(
       new HttpRequest(POST, "/session/1234/element/234345/elements")
-        .setContent(Contents.asJson(Map.of(
+        .setContent(Contents.asJson(ImmutableMap.of(
           "using", "cheese",
           "value", "tasty"))));