use better AssertJ assertion for Optionals and AtomicIntegers

asolntsev · asolntsev · commit ef640c3511f3 · 2025-12-07T00:12:10.000+02:00
`assertThat(X.get()).isEqualTo(2)` -&gt; `assertThat(X).hasValue(2)`
diff --git a/java/test/org/openqa/selenium/WebScriptExecuteTest.java b/java/test/org/openqa/selenium/WebScriptExecuteTest.java
@@ -85,7 +85,7 @@ void canExecuteScriptWithMinusZeroArgument() {
                 "-0");
 
     assertThat(value.getType()).isEqualTo("number");
-    assertThat(value.getValue().get()).isEqualTo("-0");
+    assertThat(value.getValue()).hasValue("-0");
   }
 
   @Test
@@ -103,7 +103,7 @@ void canExecuteScriptWithInfinityArgument() {
                 "Infinity");
 
     assertThat(value.getType()).isEqualTo("number");
-    assertThat(value.getValue().get()).isEqualTo("Infinity");
+    assertThat(value.getValue()).hasValue("Infinity");
   }
 
   @Test
@@ -121,7 +121,7 @@ void canExecuteScriptWithMinusInfinityArgument() {
                 "-Infinity");
 
     assertThat(value.getType()).isEqualTo("number");
-    assertThat(value.getValue().get()).isEqualTo("-Infinity");
+    assertThat(value.getValue()).hasValue("-Infinity");
   }
 
   @Test
@@ -138,7 +138,7 @@ void canExecuteScriptWithNumberArgument() {
                 1.4);
 
     assertThat(value.getType()).isEqualTo("number");
-    assertThat(value.getValue().get()).isEqualTo(1.4);
+    assertThat(value.getValue()).hasValue(1.4);
   }
 
   @Test
@@ -155,7 +155,7 @@ void canExecuteScriptWithIntegerArgument() {
                 1);
 
     assertThat(value.getType()).isEqualTo("number");
-    assertThat(value.getValue().get()).isEqualTo(1L);
+    assertThat(value.getValue()).hasValue(1L);
   }
 
   @Test
@@ -172,7 +172,7 @@ void canExecuteScriptWithBooleanArgument() {
                 true);
 
     assertThat(value.getType()).isEqualTo("boolean");
-    assertThat(value.getValue().get()).isEqualTo(true);
+    assertThat(value.getValue()).hasValue(true);
   }
 
   @Test
@@ -189,7 +189,7 @@ void canExecuteScriptWithBigIntArgument() {
                 BigInteger.valueOf(42L));
 
     assertThat(value.getType()).isEqualTo("bigint");
-    assertThat(value.getValue().get()).isEqualTo("42");
+    assertThat(value.getValue()).hasValue("42");
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInspectorTest.java b/java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInspectorTest.java
@@ -213,7 +213,7 @@ void canListenToUserPromptClosedEvent()
       UserPromptClosed userPromptClosed = future.get(5, TimeUnit.SECONDS);
       assertThat(userPromptClosed.getBrowsingContextId()).isEqualTo(context.getId());
       assertThat(userPromptClosed.getUserText().isPresent()).isTrue();
-      assertThat(userPromptClosed.getUserText().get()).isEqualTo("selenium");
+      assertThat(userPromptClosed.getUserText()).hasValue("selenium");
       assertThat(userPromptClosed.getAccepted()).isTrue();
     }
   }
diff --git a/java/test/org/openqa/selenium/bidi/browsingcontext/LocateNodesTest.java b/java/test/org/openqa/selenium/bidi/browsingcontext/LocateNodesTest.java
@@ -94,7 +94,7 @@ void canLocateNodesWithCSSLocator() {
     assertThat(value.getType()).isEqualTo("node");
     assertThat(value.getValue().isPresent()).isTrue();
     NodeProperties properties = (NodeProperties) value.getValue().get();
-    assertThat(properties.getLocalName().get()).isEqualTo("div");
+    assertThat(properties.getLocalName()).hasValue("div");
     assertThat(properties.getAttributes().get()).hasSize(1);
     assertThat(properties.getAttributes().get().get("class")).isEqualTo("content");
   }
@@ -117,7 +117,7 @@ void canLocateNodesWithXPathLocator() {
     assertThat(value.getType()).isEqualTo("node");
     assertThat(value.getValue().isPresent()).isTrue();
     NodeProperties properties = (NodeProperties) value.getValue().get();
-    assertThat(properties.getLocalName().get()).isEqualTo("div");
+    assertThat(properties.getLocalName()).hasValue("div");
     assertThat(properties.getAttributes().get()).hasSize(1);
     assertThat(properties.getAttributes().get().get("class")).isEqualTo("content");
   }
diff --git a/java/test/org/openqa/selenium/bidi/network/NetworkCommandsTest.java b/java/test/org/openqa/selenium/bidi/network/NetworkCommandsTest.java
@@ -274,7 +274,7 @@ void canCancelAuth() throws InterruptedException {
       }
 
       latch.await(10, TimeUnit.SECONDS);
-      assertThat(status.get()).isEqualTo(401);
+      assertThat(status).hasValue(401);
     }
   }
 
diff --git a/java/test/org/openqa/selenium/bidi/script/LocalValueTest.java b/java/test/org/openqa/selenium/bidi/script/LocalValueTest.java
@@ -392,7 +392,7 @@ void canCallFunctionWithDateArgument() {
     EvaluateResultSuccess successResult = (EvaluateResultSuccess) result;
     assertThat(successResult.getResult().getType()).isEqualTo("date");
     assertThat(successResult.getResult().getValue().isPresent()).isTrue();
-    assertThat(successResult.getResult().getValue().get()).isEqualTo("2022-05-31T13:47:29.000Z");
+    assertThat(successResult.getResult().getValue()).hasValue("2022-05-31T13:47:29.000Z");
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/bidi/script/ScriptCommandsTest.java b/java/test/org/openqa/selenium/bidi/script/ScriptCommandsTest.java
@@ -826,7 +826,7 @@ void canAddPreloadScriptInASandbox() {
         script.evaluateFunctionInBrowsingContext(
             driver.getWindowHandle(), "sandbox", "window.bar", true, Optional.empty());
     assertThat(result.getResultType()).isEqualTo(EvaluateResult.Type.SUCCESS);
-    assertThat(((EvaluateResultSuccess) result).getResult().getValue().get()).isEqualTo(2L);
+    assertThat(((EvaluateResultSuccess) result).getResult().getValue()).hasValue(2L);
   }
 
   @Test
@@ -843,7 +843,7 @@ void canRemovePreloadedScript() {
         script.evaluateFunctionInBrowsingContext(
             driver.getWindowHandle(), "window.bar", true, Optional.empty());
     assertThat(result.getResultType()).isEqualTo(EvaluateResult.Type.SUCCESS);
-    assertThat(((EvaluateResultSuccess) result).getResult().getValue().get()).isEqualTo(2L);
+    assertThat(((EvaluateResultSuccess) result).getResult().getValue()).hasValue(2L);
 
     script.removePreloadScript(id);
 
diff --git a/java/test/org/openqa/selenium/bidi/script/ScriptEventsTest.java b/java/test/org/openqa/selenium/bidi/script/ScriptEventsTest.java
@@ -57,11 +57,10 @@ void canListenToChannelMessage()
       assertThat(message.getChannel()).isEqualTo("channel_name");
       assertThat(message.getData().getType()).isEqualTo("string");
       assertThat(message.getData().getValue().isPresent()).isTrue();
-      assertThat(message.getData().getValue().get()).isEqualTo("foo");
+      assertThat(message.getData().getValue()).hasValue("foo");
       assertThat(message.getSource().getRealm()).isNotNull();
       assertThat(message.getSource().getBrowsingContext().isPresent()).isTrue();
-      assertThat(message.getSource().getBrowsingContext().get())
-          .isEqualTo(driver.getWindowHandle());
+      assertThat(message.getSource().getBrowsingContext()).hasValue(driver.getWindowHandle());
     }
   }
 
diff --git a/java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java b/java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java
@@ -251,7 +251,7 @@ public void canAddAndGetCookie() {
     assertThat(resultCookie.isSecure()).isEqualTo(false);
     assertThat(resultCookie.getSameSite())
         .isEqualTo(org.openqa.selenium.bidi.network.Cookie.SameSite.LAX);
-    assertThat(resultCookie.getExpiry().get()).isEqualTo(expiry);
+    assertThat(resultCookie.getExpiry()).hasValue(expiry);
     assertThat(key.getSourceOrigin()).isNotNull();
     assertThat(key.getUserContext()).isNotNull();
     assertThat(key.getUserContext()).isEqualTo("default");
diff --git a/java/test/org/openqa/selenium/concurrent/LazyTest.java b/java/test/org/openqa/selenium/concurrent/LazyTest.java
@@ -29,20 +29,20 @@ public class LazyTest {
 
   @Test
   void trivialCase() {
-    Lazy expression = Lazy.lazy(() -> "constant");
+    Lazy<String> expression = Lazy.lazy(() -> "constant");
     assertThat(expression.get()).isEqualTo("constant");
     assertThat(expression.getIfInitialized()).contains("constant");
   }
 
   @Test
   void getIfInitialized_returnsNothing_ifNotInitializedYet() {
-    Lazy expression = Lazy.lazy(() -> "value#" + counter.incrementAndGet());
+    Lazy<String> expression = Lazy.lazy(() -> "value#" + counter.incrementAndGet());
     assertThat(expression.getIfInitialized()).isEmpty();
   }
 
   @Test
   void lazyEvaluatedExpression() {
-    Lazy expression = Lazy.lazy(() -> "value#" + counter.incrementAndGet());
+    Lazy<String> expression = Lazy.lazy(() -> "value#" + counter.incrementAndGet());
     assertThat(expression.get()).isEqualTo("value#1");
     assertThat(expression.get()).isEqualTo("value#1");
     assertThat(expression.getIfInitialized()).contains("value#1");
@@ -51,8 +51,8 @@ void lazyEvaluatedExpression() {
 
   @Test
   void differentLazyInstances_produce_differentValues() {
-    Lazy expression1 = Lazy.lazy(() -> "one#" + counter.incrementAndGet());
-    Lazy expression2 = Lazy.lazy(() -> "two#" + counter.incrementAndGet());
+    Lazy<String> expression1 = Lazy.lazy(() -> "one#" + counter.incrementAndGet());
+    Lazy<String> expression2 = Lazy.lazy(() -> "two#" + counter.incrementAndGet());
     assertThat(expression1.get()).isEqualTo("one#1");
     assertThat(expression1.getIfInitialized()).contains("one#1");
     assertThat(expression2.getIfInitialized()).isEmpty();
diff --git a/java/test/org/openqa/selenium/grid/router/ProxyWebsocketTest.java b/java/test/org/openqa/selenium/grid/router/ProxyWebsocketTest.java
@@ -141,7 +141,7 @@ void shouldForwardTextMessageToServer(Supplier<String> values)
       socket.sendText("Cheese!");
 
       assertThat(latch.await(5, SECONDS)).isTrue();
-      assertThat(text.get()).isEqualTo("Cheese!");
+      assertThat(text).hasValue("Cheese!");
     }
   }
 
@@ -184,7 +184,7 @@ public void onText(CharSequence data) {
       socket.sendText("Cheese!");
 
       assertThat(latch.await(5, SECONDS)).isTrue();
-      assertThat(text.get()).isEqualTo("Asiago");
+      assertThat(text).hasValue("Asiago");
     }
   }
 
@@ -272,7 +272,7 @@ public void onText(CharSequence data) {
       socket.sendText("Cheese!");
 
       assertThat(latch.await(5, SECONDS)).isTrue();
-      assertThat(text.get()).isEqualTo("Cheddar");
+      assertThat(text).hasValue("Cheddar");
     }
 
     secureProxyServer.stop();
diff --git a/java/test/org/openqa/selenium/json/JsonOutputTest.java b/java/test/org/openqa/selenium/json/JsonOutputTest.java
@@ -619,7 +619,7 @@ void whenConvertingObjectsContainingClassesDoNotBeNoisy() {
 
     JsonObject converted = JsonParser.parseString(json).getAsJsonObject();
 
-    assertThat(converted).hasSize(1);
+    assertThat(converted.size()).isEqualTo(1);
     assertThat(converted.getAsJsonPrimitive("thing").getAsString())
         .isEqualTo(SimpleBean.class.getName());
   }
diff --git a/java/test/org/openqa/selenium/netty/server/NettyServerTest.java b/java/test/org/openqa/selenium/netty/server/NettyServerTest.java
@@ -78,11 +78,11 @@ void ensureMultipleCallsWorkAsExpected() {
 
     HttpResponse res = client.execute(new HttpRequest(GET, "/does-not-matter"));
     outputHeaders(res);
-    assertThat(count.get()).isEqualTo(1);
+    assertThat(count).hasValue(1);
 
     client.execute(new HttpRequest(GET, "/does-not-matter"));
     outputHeaders(res);
-    assertThat(count.get()).isEqualTo(2);
+    assertThat(count).hasValue(2);
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/remote/RemotableByTest.java b/java/test/org/openqa/selenium/remote/RemotableByTest.java
@@ -17,12 +17,12 @@
 
 package org.openqa.selenium.remote;
 
+import static com.google.common.collect.ImmutableMap.of;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.openqa.selenium.remote.ErrorCodes.SUCCESS_STRING;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -56,8 +56,7 @@ void shouldCallW3CLocatorWithW3CParameters() {
             });
     driver.findElement(By.cssSelector("#foo"));
 
-    assertThat(parameters.get())
-        .isEqualTo(ImmutableMap.of("using", "css selector", "value", "#foo"));
+    assertThat(parameters).hasValue(of("using", "css selector", "value", "#foo"));
   }
 
   @Test
@@ -79,8 +78,7 @@ public List<WebElement> findElements(SearchContext context) {
           }
         });
 
-    assertThat(parameters.get())
-        .isEqualTo(ImmutableMap.of("using", "css selector", "value", "#foo"));
+    assertThat(parameters).hasValue(of("using", "css selector", "value", "#foo"));
   }
 
   @Test
@@ -108,8 +106,7 @@ public List<WebElement> findElements(SearchContext context) {
 
     driver.findElement(new CustomBy());
 
-    assertThat(parameters.get())
-        .isEqualTo(ImmutableMap.of("using", "magic", "value", "abracadabra"));
+    assertThat(parameters).hasValue(of("using", "magic", "value", "abracadabra"));
   }
 
   @Test
@@ -138,8 +135,7 @@ public List<WebElement> findElements(SearchContext context) {
 
     driver.findElement(new CustomBy());
 
-    assertThat(parameters.get())
-        .isEqualTo(ImmutableMap.of("using", "css selector", "value", "not-magic"));
+    assertThat(parameters).hasValue(of("using", "css selector", "value", "not-magic"));
   }
 
   @Test
@@ -192,8 +188,7 @@ public Parameters getRemoteParameters() {
     driver.findElement(new CustomBy("two"));
     driver.findElement(new CustomBy("three"));
 
-    assertThat(parameters.get())
-        .isEqualTo(ImmutableMap.of("using", "css selector", "value", "three"));
+    assertThat(parameters).hasValue(of("using", "css selector", "value", "three"));
   }
 
   private Response createResponse(Object value) {
diff --git a/java/test/org/openqa/selenium/remote/RemoteWebDriverBuilderTest.java b/java/test/org/openqa/selenium/remote/RemoteWebDriverBuilderTest.java
@@ -232,7 +232,7 @@ void ifARemoteUrlIsGivenThatIsUsedForTheSession() {
                 })
         .build();
 
-    assertThat(seen.get()).isEqualTo(uri);
+    assertThat(seen).hasValue(uri);
   }
 
   @Test
@@ -259,7 +259,7 @@ public URL getUrl() {
             })
         .build();
 
-    assertThat(seen.get()).isEqualTo(uri);
+    assertThat(seen).hasValue(uri);
   }
 
   @Test
@@ -310,7 +310,7 @@ void shouldBeAbleToSetClientConfigDirectly() {
             })
         .build();
 
-    assertThat(seen.get()).isEqualTo(uri);
+    assertThat(seen).hasValue(uri);
   }
 
   @Test
@@ -330,7 +330,7 @@ void shouldSetRemoteHostUriOnClientConfigIfSet() {
             })
         .build();
 
-    assertThat(seen.get()).isEqualTo(uri);
+    assertThat(seen).hasValue(uri);
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/remote/http/FilterTest.java b/java/test/org/openqa/selenium/remote/http/FilterTest.java
@@ -113,9 +113,9 @@ void eachFilterShouldOnlyBeCalledOnce() {
 
     root.execute(new HttpRequest(GET, "/cheese"));
 
-    assertThat(rootCalls.get()).isEqualTo(1);
-    assertThat(filterOneCount.get()).isEqualTo(1);
-    assertThat(filterTwoCount.get()).isEqualTo(1);
+    assertThat(rootCalls).hasValue(1);
+    assertThat(filterOneCount).hasValue(1);
+    assertThat(filterTwoCount).hasValue(1);
   }
 
   @Test
diff --git a/java/test/org/openqa/selenium/remote/http/PrefixedRouteTest.java b/java/test/org/openqa/selenium/remote/http/PrefixedRouteTest.java
@@ -17,11 +17,11 @@
 
 package org.openqa.selenium.remote.http;
 
+import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.openqa.selenium.remote.http.HttpMethod.GET;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import org.junit.jupiter.api.Tag;
@@ -89,8 +89,8 @@ void pathWhichDoesMatchHasPrefixAsAttributeWhenHandling() {
 
     route.execute(new HttpRequest(GET, "/cheese/and/peas"));
 
-    assertThat(path.get()).isEqualTo("/and/peas");
-    assertThat(parts.get()).isEqualTo(singletonList("/cheese"));
+    assertThat(path).hasValue("/and/peas");
+    assertThat(parts).hasValue(singletonList("/cheese"));
   }
 
   @Test
@@ -115,7 +115,7 @@ void nestingPrefixesAlsoCausesPathStoredInAttributeToBeExtended() {
 
     route.execute(new HttpRequest(GET, "/cheese/and/peas"));
 
-    assertThat(path.get()).isEqualTo("/peas");
-    assertThat(parts.get()).isEqualTo(Arrays.asList("/cheese", "/and"));
+    assertThat(path).hasValue("/peas");
+    assertThat(parts).hasValue(asList("/cheese", "/and"));
   }
 }
diff --git a/java/test/org/openqa/selenium/remote/http/RetryRequestTest.java b/java/test/org/openqa/selenium/remote/http/RetryRequestTest.java
diff --git a/java/test/org/openqa/selenium/remote/internal/WebSocketTestBase.java b/java/test/org/openqa/selenium/remote/internal/WebSocketTestBase.java
diff --git a/java/test/org/openqa/selenium/support/events/EventFiringDecoratorTest.java b/java/test/org/openqa/selenium/support/events/EventFiringDecoratorTest.java

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ void canListenToUserPromptClosedEvent()`
`213`	`213`	`UserPromptClosed userPromptClosed = future.get(5, TimeUnit.SECONDS);`
`214`	`214`	`assertThat(userPromptClosed.getBrowsingContextId()).isEqualTo(context.getId());`
`215`	`215`	`assertThat(userPromptClosed.getUserText().isPresent()).isTrue();`
`216`		`- assertThat(userPromptClosed.getUserText().get()).isEqualTo("selenium");`
	`216`	`+ assertThat(userPromptClosed.getUserText()).hasValue("selenium");`
`217`	`217`	`assertThat(userPromptClosed.getAccepted()).isTrue();`
`218`	`218`	`}`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ void canCancelAuth() throws InterruptedException {`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`latch.await(10, TimeUnit.SECONDS);`
`277`		`- assertThat(status.get()).isEqualTo(401);`
	`277`	`+ assertThat(status).hasValue(401);`
`278`	`278`	`}`
`279`	`279`	`}`
`280`	`280`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ void canCallFunctionWithDateArgument() {`
`392`	`392`	`EvaluateResultSuccess successResult = (EvaluateResultSuccess) result;`
`393`	`393`	`assertThat(successResult.getResult().getType()).isEqualTo("date");`
`394`	`394`	`assertThat(successResult.getResult().getValue().isPresent()).isTrue();`
`395`		`- assertThat(successResult.getResult().getValue().get()).isEqualTo("2022-05-31T13:47:29.000Z");`
	`395`	`+ assertThat(successResult.getResult().getValue()).hasValue("2022-05-31T13:47:29.000Z");`
`396`	`396`	`}`
`397`	`397`
`398`	`398`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,10 @@ void canListenToChannelMessage()`
`57`	`57`	`assertThat(message.getChannel()).isEqualTo("channel_name");`
`58`	`58`	`assertThat(message.getData().getType()).isEqualTo("string");`
`59`	`59`	`assertThat(message.getData().getValue().isPresent()).isTrue();`
`60`		`- assertThat(message.getData().getValue().get()).isEqualTo("foo");`
	`60`	`+ assertThat(message.getData().getValue()).hasValue("foo");`
`61`	`61`	`assertThat(message.getSource().getRealm()).isNotNull();`
`62`	`62`	`assertThat(message.getSource().getBrowsingContext().isPresent()).isTrue();`
`63`		`- assertThat(message.getSource().getBrowsingContext().get())`
`64`		`- .isEqualTo(driver.getWindowHandle());`
	`63`	`+ assertThat(message.getSource().getBrowsingContext()).hasValue(driver.getWindowHandle());`
`65`	`64`	`}`
`66`	`65`	`}`
`67`	`66`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ void shouldForwardTextMessageToServer(Supplier<String> values)`
`141`	`141`	`socket.sendText("Cheese!");`
`142`	`142`
`143`	`143`	`assertThat(latch.await(5, SECONDS)).isTrue();`
`144`		`- assertThat(text.get()).isEqualTo("Cheese!");`
	`144`	`+ assertThat(text).hasValue("Cheese!");`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
`@@ -184,7 +184,7 @@ public void onText(CharSequence data) {`
`184`	`184`	`socket.sendText("Cheese!");`
`185`	`185`
`186`	`186`	`assertThat(latch.await(5, SECONDS)).isTrue();`
`187`		`- assertThat(text.get()).isEqualTo("Asiago");`
	`187`	`+ assertThat(text).hasValue("Asiago");`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`
`@@ -272,7 +272,7 @@ public void onText(CharSequence data) {`
`272`	`272`	`socket.sendText("Cheese!");`
`273`	`273`
`274`	`274`	`assertThat(latch.await(5, SECONDS)).isTrue();`
`275`		`- assertThat(text.get()).isEqualTo("Cheddar");`
	`275`	`+ assertThat(text).hasValue("Cheddar");`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`secureProxyServer.stop();`