use proper AssertJ asserts that generate a useful error message

In case of test failure, it's important that the error message shows all the needed information: what was the actual/expected value etc. This commit makes many asserts show this info.

For example,
* `assertThat(a == b).isTrue()` does NOT show what were `a` and `b` values;
* `assertThat(list.contain("foo")).isTrue()` does NOT show what was the `list` value;
* `assertThat(model == 32 || model == 64).isTrue()` does NOT show what was `model` value

etc.

Author: asolntsev

java/src/org/openqa/selenium/Architecture.java

@@ -142,6 +142,6 @@ public static Architecture extractFromSysProperty(String arch) {
       }
     }
 
-    throw new UnsupportedOperationException("Unknown architecture: " + arch);
+    throw new UnsupportedOperationException("Unknown architecture: \"" + arch + '"');
   }
 }

java/src/org/openqa/selenium/bidi/script/BUILD.bazel

@@ -20,5 +20,6 @@ java_library(
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/remote/http",
         artifact("com.google.auto.service:auto-service-annotations"),
+        artifact("org.jspecify:jspecify"),
     ],
 )

java/src/org/openqa/selenium/bidi/script/PrimitiveProtocolValue.java

@@ -52,4 +52,9 @@ public Map<String, Object> toJson() {
 
     return unmodifiableMap(toReturn);
   }
+
+  @Override
+  public String toString() {
+    return String.format("%s{type:%s, value:%s}", getClass().getSimpleName(), type, value);
+  }
 }

java/src/org/openqa/selenium/bidi/script/RegExpValue.java

@@ -18,19 +18,22 @@
 package org.openqa.selenium.bidi.script;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.json.JsonInput;
 
 public class RegExpValue extends LocalValue {
 
   private final String pattern;
-  private String flags;
+
+  @Nullable private final String flags;
 
   public RegExpValue(String pattern) {
-    this.pattern = pattern;
+    this(pattern, null);
   }
 
-  public RegExpValue(String pattern, String flags) {
+  public RegExpValue(String pattern, @Nullable String flags) {
     this.pattern = pattern;
     this.flags = flags;
   }
@@ -78,7 +81,25 @@ public String getPattern() {
     return pattern;
   }
 
+  @Nullable
   public String getFlags() {
     return flags;
   }
+
+  @Override
+  public boolean equals(Object object) {
+    if (!(object instanceof RegExpValue)) return false;
+    RegExpValue other = (RegExpValue) object;
+    return Objects.equals(pattern, other.pattern) && Objects.equals(flags, other.flags);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(pattern, flags);
+  }
+
+  @Override
+  public String toString() {
+    return String.format("%s{pattern:%s, flags:%s}", getClass().getSimpleName(), pattern, flags);
+  }
 }

java/src/org/openqa/selenium/bidi/script/RemoteValue.java

@@ -254,4 +254,10 @@ private static Object deserializeValue(Object value, Type type) {
 
     return finalValue;
   }
+
+  @Override
+  public String toString() {
+    return String.format(
+        "%s{type:%s, value:%s}", getClass().getSimpleName(), type, value.orElse(null));
+  }
 }

java/src/org/openqa/selenium/print/PageMargin.java

@@ -17,7 +17,6 @@
 
 package org.openqa.selenium.print;
 
-import java.util.HashMap;
 import java.util.Map;
 import org.jspecify.annotations.NullMarked;
 
@@ -59,12 +58,10 @@ public double getRight() {
   }
 
   public Map<String, Object> toMap() {
-    final Map<String, Object> options = new HashMap<>(7);
-    options.put("top", getTop());
-    options.put("bottom", getBottom());
-    options.put("left", getLeft());
-    options.put("right", getRight());
-
-    return options;
+    return Map.of(
+        "top", getTop(),
+        "bottom", getBottom(),
+        "left", getLeft(),
+        "right", getRight());
   }
 }

java/test/org/openqa/selenium/ArchitectureTest.java

@@ -121,14 +121,14 @@ void determineArchARM() {
   void determineArchEmpty() {
     assertThatExceptionOfType(UnsupportedOperationException.class)
         .isThrownBy(() -> Architecture.extractFromSysProperty(""))
-        .withMessageContaining("Unknown architecture");
+        .withMessage("Unknown architecture: \"\"");
   }
 
   @Test
   void determineArchBogus() {
     assertThatExceptionOfType(UnsupportedOperationException.class)
         .isThrownBy(() -> Architecture.extractFromSysProperty("hoobaflooba"))
-        .withMessageContaining("Unknown architecture");
+        .withMessage("Unknown architecture: \"hoobaflooba\"");
   }
 
   @Test
@@ -139,7 +139,7 @@ void determineArchMixedCasing() {
   @Test
   void dataModelIs32Or64BitOnCurrentArchitecture() {
     int model = Architecture.getCurrent().getDataModel();
-    assertThat(model == 32 || model == 64).isTrue();
+    assertThat(model).isIn(32, 64);
   }
 
   @Test

java/test/org/openqa/selenium/CookieImplementationTest.java

@@ -108,8 +108,7 @@ public void testGetAllCookies() {
     assertCookieIsNotPresentWithName(key1);
     assertCookieIsNotPresentWithName(key2);
 
-    Set<Cookie> cookies = driver.manage().getCookies();
-    int countBefore = cookies.size();
+    int countBefore = driver.manage().getCookies().size();
 
     Cookie one = new Cookie.Builder(key1, "value").build();
     Cookie two = new Cookie.Builder(key2, "value").build();
@@ -118,11 +117,10 @@ public void testGetAllCookies() {
     driver.manage().addCookie(two);
 
     openAnotherPage();
-    cookies = driver.manage().getCookies();
+    Set<Cookie> cookies = driver.manage().getCookies();
     assertThat(cookies).hasSize(countBefore + 2);
 
-    assertThat(cookies.contains(one)).isTrue();
-    assertThat(cookies.contains(two)).isTrue();
+    assertThat(cookies).contains(one, two);
   }
 
   @Test

java/test/org/openqa/selenium/ElementAttributeTest.java

@@ -258,7 +258,7 @@ void testCanReturnATextApproximationOfTheStyleAttribute() {
 
     String style = driver.findElement(By.id("red-item")).getAttribute("style");
 
-    assertThat(style.toLowerCase().contains("background-color")).isTrue();
+    assertThat(style).containsIgnoringCase("background-color");
   }
 
   @Test

java/test/org/openqa/selenium/ElementDomAttributeTest.java

@@ -221,7 +221,7 @@ void testCanReturnATextApproximationOfTheStyleAttribute() {
 
     String style = driver.findElement(By.id("red-item")).getDomAttribute("style");
 
-    assertThat(style.toLowerCase().contains("background-color")).isTrue();
+    assertThat(style).containsIgnoringCase("background-color");
   }
 
   @Test