Upgrade to version 4.36.0

Author: sbabcoc

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.nordstrom.ui-tools</groupId>
   <artifactId>htmlunit-remote</artifactId>
-  <version>4.35.1-SNAPSHOT</version>
+  <version>4.36.1-SNAPSHOT</version>
 
   <name>htmlunit-remote</name>
   <description>This is the remote wrapper for HtmlUnitDriver</description>
@@ -32,8 +32,8 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <selenium.version>4.35.0</selenium.version>
-    <htmlunit.version>4.35.0</htmlunit.version>
+    <selenium.version>4.36.0</selenium.version>
+    <htmlunit.version>4.36.1</htmlunit.version>
     <junit.version>4.13.2</junit.version>
     <checkstyle.version>10.15.0</checkstyle.version>
     <spotbugs.version>4.8.4</spotbugs.version>

src/assembly/assembly.xml

@@ -28,7 +28,6 @@
         <include>commons-io:commons-io</include>
         <include>commons-logging:commons-logging</include>
         <include>commons-codec:commons-codec</include>
-        <include>org.brotli:dec</include>
       </includes>
     </dependencySet>
   </dependencySets>

src/test/java/org/openqa/selenium/htmlunit/WebDriverTestCase.java

@@ -27,8 +27,8 @@
 import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
+
 import org.htmlunit.BrowserVersion;
 import org.htmlunit.WebClient;
 import org.htmlunit.WebClientOptions;
@@ -52,7 +52,7 @@
 
 public abstract class WebDriverTestCase extends WebTestCase {
 
-    private static final Log LOG = LogFactory.getLog(WebDriverTestCase.class);
+    private static final Logger LOG = Logger.getLogger(WebDriverTestCase.class.getName());
 
     /** The driver cache. */
     protected static final Map<BrowserVersion, WebDriver> WEB_DRIVERS_ = new HashMap<>();

src/test/java/org/openqa/selenium/htmlunit/WebTestCase.java

@@ -28,12 +28,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.SerializationUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.htmlunit.BrowserVersion;
 import org.htmlunit.MockWebConnection;
 import org.junit.After;
@@ -55,9 +52,6 @@
  */
 public abstract class WebTestCase {
 
-    /** Logging support. */
-    private static final Log LOG = LogFactory.getLog(WebTestCase.class);
-
     /** save the environment */
     private static final Locale SAVE_LOCALE = Locale.getDefault();
 

src/test/java/org/openqa/selenium/htmlunit/remote/HtmlUnitDriverRemoteActionsTest.java

@@ -34,7 +34,8 @@
 public class HtmlUnitDriverRemoteActionsTest extends RemoteWebDriverTestCase {
     @Test
     public void shouldBeAbleToProcessActions() throws Exception {
-        getWebDriver().get("https://www.selenium.dev/selenium/web/mouse_interaction.html");
+        suppressCssErrorsAndIncorrectnessWarnings();
+        getWebDriver().get(MOUSE_INTERACTION);
         HtmlUnitWebElement clickable = (HtmlUnitWebElement) getWebDriver().findElement(By.id("clickable"));
         Actions actions = new Actions(getWebDriver())
                 .moveToElement(clickable)

src/test/java/org/openqa/selenium/htmlunit/remote/HtmlUnitDriverRemoteCookieTest.java

@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.junit.Test;
 import org.openqa.selenium.Cookie;
 import org.openqa.selenium.json.TypeToken;
@@ -90,6 +91,7 @@ public void shouldBeAbleToDeleteAllCookies() {
     }
 
     private void setupCookies() {
+        suppressCssErrorsAndIncorrectnessWarnings();
         getWebDriver().get(HTMLUNIT_HOME);
         getWebDriver().manage().addCookie(new Cookie("cookie1", "value1"));
         getWebDriver().manage().addCookie(new Cookie("cookie2", "value2"));

src/test/java/org/openqa/selenium/htmlunit/remote/HtmlUnitDriverRemoteNavigationTest.java

@@ -34,6 +34,7 @@
 public class HtmlUnitDriverRemoteNavigationTest extends RemoteWebDriverTestCase {
     @Test
     public void shouldBeAbleToNavigateToUrl() {
+        suppressCssErrorsAndIncorrectnessWarnings();
         CommandPayload payload = DriverCommand.GET(HTMLUNIT_HOME);
         HttpRequest request = commandCodec.encode(new Command(sessionId(), payload));
         HttpResponse response = HtmlUnitDriverServer.navigateTo(request, sessionId);
@@ -43,6 +44,7 @@ public void shouldBeAbleToNavigateToUrl() {
 
     @Test
     public void shouldBeAbleToGetCurrentUrl() {
+        suppressCssErrorsAndIncorrectnessWarnings();
         getWebDriver().get(HTMLUNIT_HOME);
         HttpResponse response = HtmlUnitDriverServer.getCurrentUrl(sessionId);
         assertEquals("Failed getting current URL", HTTP_OK, response.getStatus());
@@ -51,6 +53,7 @@ public void shouldBeAbleToGetCurrentUrl() {
 
     @Test
     public void shouldBeAbleToNavigateBackAndForward() {
+        suppressCssErrorsAndIncorrectnessWarnings();
         getWebDriver().get(HTMLUNIT_HOME);
         getWebDriver().get(HTMLUNIT_HISTORY);
         assertEquals("Initial URL after setup", HTMLUNIT_HISTORY, getWebDriver().getCurrentUrl());
@@ -64,6 +67,7 @@ public void shouldBeAbleToNavigateBackAndForward() {
 
     @Test(expected = StaleElementReferenceException.class)
     public void shouldBeAbleToRefreshSession() {
+        suppressCssErrorsAndIncorrectnessWarnings();
         getWebDriver().get(HTMLUNIT_HOME);
         WebElement bannerImage = getWebDriver().findElement(By.cssSelector("img[alt=HtmlUnit]"));
         HttpResponse response = HtmlUnitDriverServer.refreshSession(sessionId);

src/test/java/org/openqa/selenium/htmlunit/remote/HtmlUnitDriverRemoteTimeoutTest.java

@@ -34,8 +34,8 @@ public void shouldBeAbleToGetTimeouts() {
         HttpResponse response = HtmlUnitDriverServer.getTimeouts(sessionId);
         assertEquals("Failed getting timeouts", HTTP_OK, response.getStatus());
         Map<String, Object> timeouts = extractMap(response);
-        assertEquals("Script timeout", 0L, timeouts.get("script"));
-        assertEquals("Page load timeout", 0L, timeouts.get("pageLoad"));
+        assertEquals("Script timeout", 30_000L, timeouts.get("script"));
+        assertEquals("Page load timeout", 300_000L, timeouts.get("pageLoad"));
         assertEquals("Implicit timeout", 0L, timeouts.get("implicit"));
     }
 

src/test/java/org/openqa/selenium/htmlunit/remote/RemoteWebDriverTestCase.java

@@ -25,6 +25,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.htmlunit.SilentCssErrorHandler;
+import org.htmlunit.SilentIncorrectnessListener;
+import org.htmlunit.WebClient;
 import org.junit.After;
 import org.junit.Before;
 import org.openqa.selenium.Capabilities;
@@ -48,6 +51,7 @@ public class RemoteWebDriverTestCase extends WebDriverTestCase {
     protected static final CommandCodec<HttpRequest> commandCodec;
     protected static final String HTMLUNIT_HOME = "https://www.htmlunit.org/";
     protected static final String HTMLUNIT_HISTORY = "https://www.htmlunit.org/history.html";
+    protected static final String MOUSE_INTERACTION = "https://www.selenium.dev/selenium/web/mouse_interaction.html";
 
     protected static final Type MAP_OF_OBJECTS = new TypeToken<Map<String, Object>>() {}.getType();
 
@@ -174,4 +178,10 @@ protected Boolean extractBoolean(final HttpResponse response) {
     protected Object toElement(final Object content) {
         return new JsonToHtmlUnitWebElementConverter((HtmlUnitDriver) getWebDriver()).apply(content);
     }
+    
+    protected void suppressCssErrorsAndIncorrectnessWarnings() {
+        WebClient webClient = ((HtmlUnitDriver) getWebDriver()).getWebClient();
+        webClient.setCssErrorHandler(new SilentCssErrorHandler());
+        webClient.setIncorrectnessListener(new SilentIncorrectnessListener());
+    }
 }