Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to HTMLUnit 3.11 #148

Merged
merged 1 commit into from Mar 12, 2024
Merged

Update to HTMLUnit 3.11 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tck/app-custom-policy/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicyIT.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...pp-custom-policy2/src/test/java/ee/jakarta/tck/authorization/test/AppCustomPolicy2IT.java
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -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);

Expand All @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions ...hin-servlet/src/test/java/ee/jakarta/tck/authorization/test/AppPolicyWithinServletIT.java
View file
Open in desktop
Expand Up @@ -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;
Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions tck/common/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Expand Down
12 changes: 5 additions & 7 deletions tck/common/src/main/java/ee/jakarta/tck/authorization/util/ArquillianBase.java
View file
Open in desktop
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions tck/pom.xml
View file
Open in desktop
Expand Up @@ -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>

Expand Down