Merge pull request #148 from arjantijms/htmlunit310

Update to HTMLUnit 3.11
jakartaee · Mar 12, 2024 · c8a25c1 · c8a25c1
2 parents 7d4c193 + 1a1f975
commit c8a25c1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/tck/app-custom-policy/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicyIT.java b/tck/app-custom-policy/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicyIT.java
@@ -23,7 +23,7 @@
 import static ee.jakarta.tck.authorization.util.Assert.assertDefaultNotAuthenticated;
 import static ee.jakarta.tck.authorization.util.ShrinkWrap.mavenWar;
 
-import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider;
+import org.htmlunit.DefaultCredentialsProvider;
 import ee.jakarta.tck.authorization.util.ArquillianBase;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;

diff --git a/...pp-custom-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicy2IT.java b/...pp-custom-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicy2IT.java
@@ -21,8 +21,8 @@
 import static ee.jakarta.tck.authorization.util.Assert.assertDefaultNoAccess;
 import static ee.jakarta.tck.authorization.util.ShrinkWrap.mavenWar;
 
-import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider;
 import ee.jakarta.tck.authorization.util.ArquillianBase;
+import org.htmlunit.DefaultCredentialsProvider;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
@@ -48,7 +48,7 @@ public static Archive<?> createDeployment() {
     @Test
     public void testAuthenticatedWrongRole() {
         DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
-        credentialsProvider.addCredentials("reza", "secret1");
+        credentialsProvider.addCredentials("reza", "secret1".toCharArray());
 
         getWebClient().setCredentialsProvider(credentialsProvider);
 
@@ -74,7 +74,7 @@ public void testNotAuthenticated() {
     @Test
     public void testNotAuthenticatedWrongName() {
         DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
-        credentialsProvider.addCredentials("romo", "secret1");
+        credentialsProvider.addCredentials("romo", "secret1".toCharArray());
 
         getWebClient().setCredentialsProvider(credentialsProvider);
 
@@ -105,7 +105,7 @@ public void testNotAuthenticatedSpecial() {
     @Test
     public void testAuthenticatedSpecial() {
         DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
-        credentialsProvider.addCredentials("reza", "secret1");
+        credentialsProvider.addCredentials("reza", "secret1".toCharArray());
 
         getWebClient().setCredentialsProvider(credentialsProvider);
 

diff --git a/...hin-servlet/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyWithinServletIT.java b/...hin-servlet/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyWithinServletIT.java
@@ -20,7 +20,7 @@
 import static ee.jakarta.tck.authorization.util.ShrinkWrap.mavenWar;
 import static org.junit.Assert.assertTrue;
 
-import com.gargoylesoftware.htmlunit.DefaultCredentialsProvider;
+import org.htmlunit.DefaultCredentialsProvider;
 import ee.jakarta.tck.authorization.util.ArquillianBase;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -44,7 +44,7 @@ public static Archive<?> createDeployment() {
     @Test
     public void testAuthenticated() {
         DefaultCredentialsProvider credentialsProvider = new DefaultCredentialsProvider();
-        credentialsProvider.addCredentials("reza", "secret1");
+        credentialsProvider.addCredentials("reza", "secret1".toCharArray());
 
         getWebClient().setCredentialsProvider(credentialsProvider);
 

diff --git a/tck/common/pom.xml b/tck/common/pom.xml
@@ -51,9 +51,9 @@
         </dependency>
 
         <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
+            <groupId>org.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.70.0</version>
+            <version>3.11.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/tck/common/src/main/java/ee/jakarta/tck/authorization/util/ArquillianBase.java b/tck/common/src/main/java/ee/jakarta/tck/authorization/util/ArquillianBase.java
@@ -26,20 +26,18 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.logging.Logger;
-
+import org.htmlunit.DefaultCssErrorHandler;
+import org.htmlunit.FailingHttpStatusCodeException;
+import org.htmlunit.Page;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebResponse;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
 
-import com.gargoylesoftware.htmlunit.DefaultCssErrorHandler;
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebResponse;
-
 public class ArquillianBase {
 
     private static final Logger logger = Logger.getLogger(ArquillianBase.class.getName());

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -137,9 +137,9 @@
         </dependency>
 
         <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
+            <groupId>org.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.70.0</version>
+            <version>3.11.0</version>
             <scope>test</scope>
         </dependency>