Merge branch 'SeleniumHQ:trunk' into pattern_improvements

Author: zodac-personal

java/src/org/openqa/selenium/html5/AppCacheStatus.java

@@ -17,8 +17,12 @@
 
 package org.openqa.selenium.html5;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
 /** Represents the application cache status. */
 @Deprecated
+@NullMarked
 public enum AppCacheStatus {
   UNCACHED(0),
   IDLE(1),
@@ -43,7 +47,7 @@ public int value() {
    * @param value The input value
    * @return {@link AppCacheStatus} The corresponding appcache status
    */
-  public static AppCacheStatus getEnum(int value) {
+  public static @Nullable AppCacheStatus getEnum(int value) {
     for (AppCacheStatus status : AppCacheStatus.values()) {
       if (value == status.value()) {
         return status;
@@ -52,7 +56,7 @@ public static AppCacheStatus getEnum(int value) {
     return null;
   }
 
-  public static AppCacheStatus getEnum(String value) {
+  public static @Nullable AppCacheStatus getEnum(String value) {
     for (AppCacheStatus status : AppCacheStatus.values()) {
       if (status.toString().equalsIgnoreCase(value)) {
         return status;

java/src/org/openqa/selenium/interactions/Coordinates.java

@@ -17,12 +17,14 @@
 
 package org.openqa.selenium.interactions;
 
+import org.jspecify.annotations.NullMarked;
 import org.openqa.selenium.Point;
 
 /**
  * Provides coordinates of an element for advanced interactions. Note that some coordinates (such as
  * screen coordinates) are evaluated lazily since the element may have to be scrolled into view.
  */
+@NullMarked
 public interface Coordinates {
 
   /**

java/src/org/openqa/selenium/interactions/Interactive.java

@@ -18,11 +18,13 @@
 package org.openqa.selenium.interactions;
 
 import java.util.Collection;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Indicates that a class can be used with the W3C WebDriver <a
  * href="https://www.w3.org/TR/webdriver/#actions">Actions commands</a>.
  */
+@NullMarked
 public interface Interactive {
   void perform(Collection<Sequence> actions);
 

java/src/org/openqa/selenium/interactions/SourceType.java

@@ -17,20 +17,24 @@
 
 package org.openqa.selenium.interactions;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
 /** One of the allowing types for an {@link InputSource}. */
+@NullMarked
 public enum SourceType {
   KEY("key"),
   NONE(null),
   POINTER("pointer"),
   WHEEL("wheel");
 
-  private final String type;
+  private final @Nullable String type;
 
-  SourceType(String type) {
+  SourceType(@Nullable String type) {
     this.type = type;
   }
 
-  public String getType() {
+  public @Nullable String getType() {
     return type;
   }
 }

java/src/org/openqa/selenium/internal/Either.java

@@ -21,8 +21,11 @@
 import java.util.Iterator;
 import java.util.function.Function;
 import java.util.stream.Stream;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
-public class Either<A, B> implements Iterable<B> {
+@NullMarked
+public class Either<A extends @Nullable Object, B extends @Nullable Object> implements Iterable<B> {
   private final A left;
   private final B right;
 
@@ -31,11 +34,11 @@ private Either(A a, B b) {
     right = b;
   }
 
-  public static <A, B> Either<A, B> left(A a) {
+  public static <A extends @Nullable Object, B extends @Nullable Object> Either<A, B> left(A a) {
     return new Either<>(a, null);
   }
 
-  public static <A, B> Either<A, B> right(B b) {
+  public static <A extends @Nullable Object, B extends @Nullable Object> Either<A, B> right(B b) {
     return new Either<>(null, b);
   }
 

java/src/org/openqa/selenium/virtualauthenticator/Credential.java

@@ -63,14 +63,21 @@ public static Credential createResidentCredential(
 
   /** Creates a credential from a map. */
   public static Credential fromMap(Map<String, Object> map) {
+    Object credentialId = Require.nonNull("credentialId", map.get("credentialId"));
+    Object isResidentCredential =
+        Require.nonNull("isResidentCredential", map.get("isResidentCredential"));
+    Object rpId = Require.nonNull("rpId", map.get("rpId"));
+    Object privateKey = Require.nonNull("privateKey", map.get("privateKey"));
+    Object userHandle = map.get("userHandle");
+    Object signCount = Require.nonNull("signCount", map.get("signCount"));
     Base64.Decoder decoder = Base64.getUrlDecoder();
     return new Credential(
-        decoder.decode((String) map.get("credentialId")),
-        (boolean) map.get("isResidentCredential"),
-        (String) map.get("rpId"),
-        new PKCS8EncodedKeySpec(decoder.decode((String) map.get("privateKey"))),
-        map.get("userHandle") == null ? null : decoder.decode((String) map.get("userHandle")),
-        ((Long) map.get("signCount")).intValue());
+        decoder.decode((String) credentialId),
+        (boolean) isResidentCredential,
+        (String) rpId,
+        new PKCS8EncodedKeySpec(decoder.decode((String) privateKey)),
+        userHandle == null ? null : decoder.decode((String) userHandle),
+        ((Long) signCount).intValue());
   }
 
   private Credential(

rb/lib/selenium/webdriver/remote/bridge.rb

@@ -323,7 +323,7 @@ def add_cookie(cookie)
         end
 
         def delete_cookie(name)
-          raise ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.strip.empty?
+          raise ArgumentError, 'Cookie name cannot be null or empty' if name.nil? || name.to_s.strip.empty?
 
           execute :delete_cookie, name: name
         end

rb/spec/integration/selenium/webdriver/manager_spec.rb

@@ -268,6 +268,12 @@ module WebDriver
           expect { driver.manage.delete_cookie(nil) }
             .to raise_error(ArgumentError, /Cookie name cannot be null or empty/)
         end
+
+        it 'allows deleting a cookies using a symbol' do
+          driver.manage.add_cookie name: :foo, value: 'bar'
+          driver.manage.delete_cookie(:foo)
+          expect(driver.manage.all_cookies).to be_empty
+        end
       end
     end # Options
   end # WebDriver

rust/tests/browser_tests.rs

@@ -20,6 +20,7 @@ use crate::common::{assert_output, get_selenium_manager, get_stdout};
 use exitcode::DATAERR;
 use rstest::rstest;
 use std::env::consts::OS;
+use std::path::Path;
 
 mod common;
 
@@ -134,7 +135,7 @@ fn invalid_geckodriver_version_test() {
     r"/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
 )]
 fn browser_path_test(#[case] os: String, #[case] browser: String, #[case] browser_path: String) {
-    if OS.eq(&os) {
+    if OS.eq(&os) && Path::new(&browser_path).exists() {
         let mut cmd = get_selenium_manager();
         cmd.args(["--browser", &browser, "--browser-path", &browser_path])
             .assert()