junit4 is gone

rbri · rbri · commit 0d446ea15ee6 · 2025-06-18T15:13:02.000+02:00
diff --git a/src/test/java/org/htmlunit/SocksProxyTest.java b/src/test/java/org/htmlunit/SocksProxyTest.java
@@ -15,7 +15,6 @@
 package org.htmlunit;
 
 import static org.eclipse.jetty.http.HttpVersion.HTTP_1_1;
-import static org.junit.Assume.assumeTrue;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -28,6 +27,7 @@
 import org.eclipse.jetty.util.ssl.SslContextFactory.Server;
 import org.htmlunit.html.HtmlPage;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -98,7 +98,7 @@ private static void assumeSocksProxyInUse() {
             }
         }
         catch (final IOException e) {
-            assumeTrue("Socks proxy is not available", false);
+            Assumptions.assumeTrue(false, "Socks proxy is not available");
         }
     }
 
diff --git a/src/test/java/org/htmlunit/html/HtmlTextInput2Test.java b/src/test/java/org/htmlunit/html/HtmlTextInput2Test.java
@@ -25,7 +25,7 @@
 import org.htmlunit.javascript.host.event.KeyboardEvent;
 import org.htmlunit.junit.annotation.Alerts;
 import org.htmlunit.platform.AwtClipboardHandler;
-import org.junit.Assume;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -643,7 +643,7 @@ public void minLengthValidation() throws Exception {
      */
     @Test
     public void clipboardCopy() throws Exception {
-        Assume.assumeFalse(SKIP_);
+        Assumptions.assumeFalse(SKIP_);
 
         final String html = DOCTYPE_HTML
                 + "<html><head>\n"
@@ -678,7 +678,7 @@ public void clipboardCopy() throws Exception {
      */
     @Test
     public void clipboardPaste() throws Exception {
-        Assume.assumeFalse(SKIP_);
+        Assumptions.assumeFalse(SKIP_);
 
         final String html = DOCTYPE_HTML
                 + "<html><head>\n"
diff --git a/src/test/java/org/htmlunit/html/HtmlTextInputTest.java b/src/test/java/org/htmlunit/html/HtmlTextInputTest.java
@@ -24,8 +24,8 @@
 import org.htmlunit.WebDriverTestCase;
 import org.htmlunit.junit.annotation.Alerts;
 import org.htmlunit.util.MimeType;
-import org.junit.Assume;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.InvalidElementStateException;
@@ -1151,7 +1151,7 @@ private void validation(final String htmlPart, final String jsPart, final String
     @Test
     @Alerts({"abcx", "", "abcx", "abcx"})
     public void clipboard() throws Exception {
-        Assume.assumeFalse(SKIP_);
+        Assumptions.assumeFalse(SKIP_);
 
         final String html = DOCTYPE_HTML
                 + "<html><head>\n"
diff --git a/src/test/java/org/htmlunit/javascript/host/intl/DateTimeFormat2Test.java b/src/test/java/org/htmlunit/javascript/host/intl/DateTimeFormat2Test.java
@@ -19,8 +19,8 @@
 import org.htmlunit.junit.annotation.Alerts;
 import org.htmlunit.junit.annotation.BuggyWebDriver;
 import org.htmlunit.junit.annotation.HtmlUnitNYI;
-import org.junit.ComparisonFailure;
 import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
 
 /**
  * Tests for {@link DateTimeFormat}.
@@ -53,7 +53,7 @@ private void test(final String... string) throws Exception {
         try {
             loadPageVerifyTextArea2(html.toString());
         }
-        catch (final ComparisonFailure e) {
+        catch (final AssertionFailedError e) {
             final String msg = e.getMessage();
             for (int i = 0; i < msg.length(); i++) {
                 final char c = msg.charAt(i);
diff --git a/src/test/java/org/htmlunit/javascript/host/intl/NumberFormat2Test.java b/src/test/java/org/htmlunit/javascript/host/intl/NumberFormat2Test.java
@@ -17,8 +17,8 @@
 import org.apache.commons.lang3.CharUtils;
 import org.htmlunit.WebDriverTestCase;
 import org.htmlunit.junit.annotation.Alerts;
-import org.junit.ComparisonFailure;
 import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
 
 /**
  * Tests for {@link NumberFormat}.
@@ -50,7 +50,7 @@ private void test(final String... string) throws Exception {
         try {
             loadPageVerifyTextArea2(html.toString());
         }
-        catch (final ComparisonFailure e) {
+        catch (final AssertionFailedError e) {
             final String msg = e.getMessage();
             for (int i = 0; i < msg.length(); i++) {
                 final char c = msg.charAt(i);
diff --git a/src/test/java/org/htmlunit/javascript/host/xml/XMLHttpRequestTest.java b/src/test/java/org/htmlunit/javascript/host/xml/XMLHttpRequestTest.java
@@ -42,10 +42,10 @@
 import org.htmlunit.junit.annotation.Tries;
 import org.htmlunit.util.MimeType;
 import org.htmlunit.util.NameValuePair;
-import org.junit.ComparisonFailure;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
+import org.opentest4j.AssertionFailedError;
 
 /**
  * Tests for {@link XMLHttpRequest}.
@@ -235,7 +235,7 @@ private static void assertLog(final WebDriver driver, final String expected) thr
                 assertEquals(expected, text);
                 return;
             }
-            catch (final ComparisonFailure e) {
+            catch (final AssertionFailedError e) {
                 if (System.currentTimeMillis() > maxWait) {
                     throw e;
                 }
diff --git a/src/test/java/org/htmlunit/junit/TestCaseCorrector.java b/src/test/java/org/htmlunit/junit/TestCaseCorrector.java

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`package org.htmlunit;`
`16`	`16`
`17`	`17`	`import static org.eclipse.jetty.http.HttpVersion.HTTP_1_1;`
`18`		`-import static org.junit.Assume.assumeTrue;`
`19`	`18`
`20`	`19`	`import java.io.IOException;`
`21`	`20`	`import java.net.MalformedURLException;`
`@@ -28,6 +27,7 @@`
`28`	`27`	`import org.eclipse.jetty.util.ssl.SslContextFactory.Server;`
`29`	`28`	`import org.htmlunit.html.HtmlPage;`
`30`	`29`	`import org.junit.jupiter.api.Assertions;`
	`30`	`+import org.junit.jupiter.api.Assumptions;`
`31`	`31`	`import org.junit.jupiter.api.Test;`
`32`	`32`
`33`	`33`	`/**`
`@@ -98,7 +98,7 @@ private static void assumeSocksProxyInUse() {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`catch (final IOException e) {`
`101`		`- assumeTrue("Socks proxy is not available", false);`
	`101`	`+ Assumptions.assumeTrue(false, "Socks proxy is not available");`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`