Upgrade to Selenium 4.33.0; fix timeout breaks (#295)

Author: sbabcoc

selenium4Deps.gradle

@@ -21,17 +21,17 @@ sourceSets {
     }
   }
 }
-  
+
 dependencies {
   constraints {
     api 'com.nordstrom.tools:testng-foundation:5.2.1-j11'
-    api 'org.seleniumhq.selenium:selenium-grid:4.32.0'
-    api 'org.seleniumhq.selenium:selenium-support:4.32.0'
-    api 'org.seleniumhq.selenium:selenium-chrome-driver:4.32.0'
-    api 'org.seleniumhq.selenium:selenium-edge-driver:4.32.0'
-    api 'org.seleniumhq.selenium:selenium-firefox-driver:4.32.0'
+    api 'org.seleniumhq.selenium:selenium-grid:4.33.0'
+    api 'org.seleniumhq.selenium:selenium-support:4.33.0'
+    api 'org.seleniumhq.selenium:selenium-chrome-driver:4.33.0'
+    api 'org.seleniumhq.selenium:selenium-edge-driver:4.33.0'
+    api 'org.seleniumhq.selenium:selenium-firefox-driver:4.33.0'
     api 'org.seleniumhq.selenium:selenium-opera-driver:4.4.0'
-    api 'org.seleniumhq.selenium:selenium-safari-driver:4.32.0'
+    api 'org.seleniumhq.selenium:selenium-safari-driver:4.33.0'
     api 'com.nordstrom.ui-tools:htmlunit-remote:4.32.0'
     api 'org.seleniumhq.selenium:htmlunit3-driver:4.32.0'
     api 'org.htmlunit:htmlunit:4.12.0'

src/main/java/com/nordstrom/automation/selenium/core/DriverManager.java

@@ -3,7 +3,6 @@
 import java.lang.reflect.Method;
 import java.time.Duration;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 import org.openqa.selenium.JavascriptExecutor;
@@ -180,13 +179,8 @@ public static WebDriver injectDriver(TestBase instance, final Method method) {
      */
     public static void setDriverTimeouts(final WebDriver driver, final SeleniumConfig config) {
         Timeouts timeouts = driver.manage().timeouts();
-        timeouts.implicitlyWait(WaitType.IMPLIED.getInterval(config), TimeUnit.SECONDS);
-        
-        try {
-            timeouts.pageLoadTimeout(WaitType.PAGE_LOAD.getInterval(config), TimeUnit.SECONDS);
-        } catch (WebDriverException eaten) {
-            // unsupported feature: nothing to do here
-        }
+        WebDriverUtils.implicitlyWait(timeouts, Duration.ofSeconds(WaitType.IMPLIED.getInterval(config)));
+        WebDriverUtils.pageLoadTimeout(timeouts, Duration.ofSeconds(WaitType.PAGE_LOAD.getInterval(config)));
     }
 
     /**

src/main/java/com/nordstrom/automation/selenium/model/RobustElementWrapper.java

@@ -2,11 +2,10 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.SearchContext;
@@ -333,14 +332,14 @@ public String toString() {
      * @throws StaleElementReferenceElementException if container element has gone stale
      * @throws NoSuchElementException if unable to find element specified by the wrapper
      */
-    @SuppressWarnings("deprecation")
     private static RobustElementWrapper acquireReference(final RobustElementWrapper wrapper) {
         NoSuchElementException thrown = null;
         SearchContext context = wrapper.context.getWrappedContext();
 
         if (wrapper.strategy == Strategy.LOCATOR) {
             // disable implicit wait
-            Timeouts timeouts = wrapper.driver.manage().timeouts().implicitlyWait(0, TimeUnit.SECONDS);
+            Timeouts timeouts = wrapper.driver.manage().timeouts();
+            WebDriverUtils.implicitlyWait(timeouts, Duration.ZERO);
             try {
                 // if index specified
                 if (wrapper.index > 0) {
@@ -370,7 +369,7 @@ private static RobustElementWrapper acquireReference(final RobustElementWrapper
                 }
             } finally {
                 // restore implicit wait
-                timeouts.implicitlyWait(WaitType.IMPLIED.getInterval(), TimeUnit.SECONDS);
+                WebDriverUtils.implicitlyWait(timeouts, Duration.ofSeconds(WaitType.IMPLIED.getInterval()));
             }
         } else {
             // if context is a container element

src/selenium3/java/com/nordstrom/automation/selenium/core/WebDriverUtils.java

@@ -1,16 +1,19 @@
 package com.nordstrom.automation.selenium.core;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ElementNotVisibleException;
 import org.openqa.selenium.HasCapabilities;
 import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.NotFoundException;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.SearchContext;
@@ -21,6 +24,7 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.WrapsDriver;
+import org.openqa.selenium.WebDriver.Timeouts;
 import org.openqa.selenium.remote.CapabilityType;
 
 import com.nordstrom.automation.selenium.model.RobustJavascriptExecutor;
@@ -146,6 +150,49 @@ public static String getDomAttributeOf(final WebElement element, final String na
         return JsUtility.runAndReturn(getDriver(element), script, element);
     }
 
+    /**
+     * Specifies the amount of time the driver should wait when searching for an element if it is
+     * not immediately present.
+     *
+     * <p>When searching for a single element, the driver should poll the page until the element has
+     * been found, or this timeout expires before throwing a {@link NoSuchElementException}. When
+     * searching for multiple elements, the driver should poll the page until at least one element
+     * has been found or this timeout has expired.
+     *
+     * <p>Increasing the implicit wait timeout should be used judiciously as it will have an adverse
+     * effect on test run time, especially when used with slower location strategies like XPath.
+     *
+     * <p>If the timeout is negative, not null, or greater than 2e16 - 1, an error code with invalid
+     * argument will be returned.
+     *
+     * @param timeouts target {@link Timeouts} object
+     * @param duration The duration to wait.
+     * @return A self reference.
+     */
+    public static Timeouts implicitlyWait(final Timeouts timeouts, final Duration duration) {
+        return timeouts.implicitlyWait(duration.getSeconds(), TimeUnit.SECONDS);
+    }
+    
+    /**
+     * Sets the amount of time to wait for a page load to complete before throwing an error. If the
+     * timeout is negative, not null, or greater than 2e16 - 1, an error code with invalid argument
+     * will be returned.
+     *
+     * @param timeouts target {@link Timeouts} object
+     * @param duration The timeout value.
+     * @return A Timeouts interface.
+     * @see <a href="https://www.w3.org/TR/webdriver/#set-timeouts">W3C WebDriver</a>
+     * @see <a href="https://www.w3.org/TR/webdriver/#dfn-timeouts-configuration">W3C WebDriver</a>
+     */
+    public static Timeouts pageLoadTimeout(final Timeouts timeouts, final Duration duration) {
+        try {
+            return timeouts.pageLoadTimeout(duration.getSeconds(), TimeUnit.SECONDS);
+        } catch (WebDriverException eaten) {
+            // unsupported
+            return timeouts;
+        }
+    }
+    
     /**
      * Remove hidden elements from specified list.
      * 

src/selenium4/java/com/nordstrom/automation/selenium/core/WebDriverUtils.java

@@ -1,5 +1,6 @@
 package com.nordstrom.automation.selenium.core;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
@@ -11,13 +12,15 @@
 import org.openqa.selenium.ElementNotInteractableException;
 import org.openqa.selenium.HasCapabilities;
 import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.NotFoundException;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.StaleElementReferenceException;
 import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.UnhandledAlertException;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebDriver.Timeouts;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.WrapsDriver;
@@ -150,6 +153,49 @@ public static String getDomAttributeOf(final WebElement element, final String na
         return element.getDomAttribute(name);
     }
 
+    /**
+     * Specifies the amount of time the driver should wait when searching for an element if it is
+     * not immediately present.
+     *
+     * <p>When searching for a single element, the driver should poll the page until the element has
+     * been found, or this timeout expires before throwing a {@link NoSuchElementException}. When
+     * searching for multiple elements, the driver should poll the page until at least one element
+     * has been found or this timeout has expired.
+     *
+     * <p>Increasing the implicit wait timeout should be used judiciously as it will have an adverse
+     * effect on test run time, especially when used with slower location strategies like XPath.
+     *
+     * <p>If the timeout is negative, not null, or greater than 2e16 - 1, an error code with invalid
+     * argument will be returned.
+     *
+     * @param timeouts target {@link Timeouts} object
+     * @param duration The duration to wait.
+     * @return A self reference.
+     */
+    public static Timeouts implicitlyWait(final Timeouts timeouts, final Duration duration) {
+        return timeouts.implicitlyWait(duration);
+    }
+    
+    /**
+     * Sets the amount of time to wait for a page load to complete before throwing an error. If the
+     * timeout is negative, not null, or greater than 2e16 - 1, an error code with invalid argument
+     * will be returned.
+     *
+     * @param timeouts target {@link Timeouts} object
+     * @param duration The timeout value.
+     * @return A Timeouts interface.
+     * @see <a href="https://www.w3.org/TR/webdriver/#set-timeouts">W3C WebDriver</a>
+     * @see <a href="https://www.w3.org/TR/webdriver/#dfn-timeouts-configuration">W3C WebDriver</a>
+     */
+    public static Timeouts pageLoadTimeout(final Timeouts timeouts, final Duration duration) {
+        try {
+            return timeouts.pageLoadTimeout(duration);
+        } catch (WebDriverException eaten) {
+            // unsupported
+            return timeouts;
+        }
+    }
+    
     /**
      * Remove hidden elements from specified list.
      *