junit5

rbri · rbri · commit 3ab0e62582e9 · 2021-10-28T15:32:35.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -49,7 +49,8 @@ repositories {
 }
 
 dependencies {
-    testCompile "junit:junit:4.12"
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 }
 
 
diff --git a/src/test/java/net/sourceforge/htmlunit/ArgumentsTest.java b/src/test/java/net/sourceforge/htmlunit/ArgumentsTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/ArrayConcatTest.java b/src/test/java/net/sourceforge/htmlunit/ArrayConcatTest.java
@@ -1,6 +1,6 @@
 package net.sourceforge.htmlunit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=477604">Bug 477604 - 
diff --git a/src/test/java/net/sourceforge/htmlunit/ContextActionImpl.java b/src/test/java/net/sourceforge/htmlunit/ContextActionImpl.java
@@ -3,7 +3,7 @@
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
 
-public abstract class ContextActionImpl implements ContextAction {
+public abstract class ContextActionImpl implements ContextAction<Object> {
     @Override
     public Object run(final Context cx) {
         try {
@@ -14,5 +14,6 @@ public Object run(final Context cx) {
             throw new RuntimeException(e);
         }
     }
+
     protected abstract Object doRun(final Context cx) throws Exception;
 }
diff --git a/src/test/java/net/sourceforge/htmlunit/ContextMethodsTest.java b/src/test/java/net/sourceforge/htmlunit/ContextMethodsTest.java
@@ -1,12 +1,12 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/DecompileTest.java b/src/test/java/net/sourceforge/htmlunit/DecompileTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/DelegatorAndHostObjectTest.java b/src/test/java/net/sourceforge/htmlunit/DelegatorAndHostObjectTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/EvalScopeTest.java b/src/test/java/net/sourceforge/htmlunit/EvalScopeTest.java
@@ -1,10 +1,10 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.lang.reflect.Method;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/ExceptionMessageTest.java b/src/test/java/net/sourceforge/htmlunit/ExceptionMessageTest.java
@@ -1,12 +1,12 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.lang.reflect.Method;
 import java.util.Locale;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
@@ -22,7 +22,7 @@
  */
 public class ExceptionMessageTest {
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() throws Exception {
         Locale.setDefault(Locale.ENGLISH); // to be sure that error messages are in English
     }
diff --git a/src/test/java/net/sourceforge/htmlunit/ExceptionPropertiesTest.java b/src/test/java/net/sourceforge/htmlunit/ExceptionPropertiesTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/FunctionCallerTest.java b/src/test/java/net/sourceforge/htmlunit/FunctionCallerTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/FunctionNullSetTest.java b/src/test/java/net/sourceforge/htmlunit/FunctionNullSetTest.java
@@ -1,10 +1,10 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.lang.reflect.Method;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/FunctionTest.java b/src/test/java/net/sourceforge/htmlunit/FunctionTest.java
@@ -1,8 +1,9 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
@@ -50,13 +51,13 @@ public void varDefinedLater() {
         assertEvaluates("undefined", script);
     }
 
-    @Test(expected = EcmaError.class)
+    @Test
     public void varUsedLater() {
         String script = "var output = '';\n"
                 + "output += t;\n"
                 + "!function t() {output += 'hi';}();\n"
                 + "output";
-        assertEvaluates("undefined", script);
+        assertThrows(EcmaError.class, () -> assertEvaluates("undefined", script));
     }
 
     @Test
diff --git a/src/test/java/net/sourceforge/htmlunit/HostExceptionsTest.java b/src/test/java/net/sourceforge/htmlunit/HostExceptionsTest.java
@@ -1,9 +1,9 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/LookupSetterTest.java b/src/test/java/net/sourceforge/htmlunit/LookupSetterTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/MemberBoxTest.java b/src/test/java/net/sourceforge/htmlunit/MemberBoxTest.java
@@ -1,9 +1,9 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/NativeArrayTest.java b/src/test/java/net/sourceforge/htmlunit/NativeArrayTest.java
@@ -1,6 +1,6 @@
 package net.sourceforge.htmlunit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.DelegatorAndHostObjectTest.MyHostObject;
 import net.sourceforge.htmlunit.corejs.javascript.Context;
diff --git a/src/test/java/net/sourceforge/htmlunit/NativeErrorTest.java b/src/test/java/net/sourceforge/htmlunit/NativeErrorTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/NativeGlobalTest.java b/src/test/java/net/sourceforge/htmlunit/NativeGlobalTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/NativeObjectTest.java b/src/test/java/net/sourceforge/htmlunit/NativeObjectTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/NativeRegExpTest.java b/src/test/java/net/sourceforge/htmlunit/NativeRegExpTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/NumberTest.java b/src/test/java/net/sourceforge/htmlunit/NumberTest.java
@@ -1,6 +1,6 @@
 package net.sourceforge.htmlunit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=538172">Bug 538172 - 
diff --git a/src/test/java/net/sourceforge/htmlunit/ParserTest.java b/src/test/java/net/sourceforge/htmlunit/ParserTest.java
@@ -1,9 +1,9 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
diff --git a/src/test/java/net/sourceforge/htmlunit/PrimitiveTypeScopeResolutionTest.java b/src/test/java/net/sourceforge/htmlunit/PrimitiveTypeScopeResolutionTest.java
@@ -1,7 +1,6 @@
 package net.sourceforge.htmlunit;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.Context;
 import net.sourceforge.htmlunit.corejs.javascript.ContextAction;
@@ -13,7 +12,6 @@
  * String primitive prototype wrongly resolved when used with many top scopes</a>
  * @author Marc Guillemot
  */
-@RunWith(RhinoPatchedRunner.class)
 public class PrimitiveTypeScopeResolutionTest {
 
     /**
diff --git a/src/test/java/net/sourceforge/htmlunit/PropertiesOrderTest.java b/src/test/java/net/sourceforge/htmlunit/PropertiesOrderTest.java
@@ -1,6 +1,6 @@
 package net.sourceforge.htmlunit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test that Object properties are returned in the creation order.
diff --git a/src/test/java/net/sourceforge/htmlunit/RegExpImplSubclassingTest.java b/src/test/java/net/sourceforge/htmlunit/RegExpImplSubclassingTest.java
@@ -1,9 +1,9 @@
 package net.sourceforge.htmlunit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import net.sourceforge.htmlunit.corejs.javascript.regexp.RegExpImpl;
 import net.sourceforge.htmlunit.corejs.javascript.regexp.SubString;
@@ -13,9 +13,9 @@
  * We have to update this fields from our subclass.
  * Also tests that the class SubString is public. This
  * is needed to fill the fields with the right values.
- * 
+ *
  * https://bugzilla.mozilla.org/show_bug.cgi?id=598706
- * 
+ *
  * @author Ronald Brill
  */
 public class RegExpImplSubclassingTest {
@@ -65,8 +65,8 @@ protected void setRightContext(SubString rightContext) {
             this.rightContext = rightContext;
         }
     }
-    
-    
+
+
     /**
      * @throws Exception if the test fails
      */
diff --git a/src/test/java/net/sourceforge/htmlunit/RegExpUnescapedSlashTest.java b/src/test/java/net/sourceforge/htmlunit/RegExpUnescapedSlashTest.java
@@ -1,6 +1,6 @@
 package net.sourceforge.htmlunit;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test that regexp like "[/]" are parsed correctly.
diff --git a/src/test/java/net/sourceforge/htmlunit/RhinoPatchedRunner.java b/src/test/java/net/sourceforge/htmlunit/RhinoPatchedRunner.java
diff --git a/src/test/java/net/sourceforge/htmlunit/ScriptRuntimeTest.java b/src/test/java/net/sourceforge/htmlunit/ScriptRuntimeTest.java
diff --git a/src/test/java/net/sourceforge/htmlunit/ScriptableObjectTest.java b/src/test/java/net/sourceforge/htmlunit/ScriptableObjectTest.java
diff --git a/src/test/java/net/sourceforge/htmlunit/StackTraceTest.java b/src/test/java/net/sourceforge/htmlunit/StackTraceTest.java
diff --git a/src/test/java/net/sourceforge/htmlunit/UpperCaseHexTest.java b/src/test/java/net/sourceforge/htmlunit/UpperCaseHexTest.java

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ repositories {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`dependencies {`
`52`		`- testCompile "junit:junit:4.12"`
	`52`	`+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'`
	`53`	`+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'`
`53`	`54`	`}`
`54`	`55`
`55`	`56`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`import net.sourceforge.htmlunit.corejs.javascript.Context;`
`4`	`4`	`import net.sourceforge.htmlunit.corejs.javascript.ContextAction;`
`5`	`5`
`6`		`-public abstract class ContextActionImpl implements ContextAction {`
	`6`	`+public abstract class ContextActionImpl implements ContextAction<Object> {`
`7`	`7`	`@Override`
`8`	`8`	`public Object run(final Context cx) {`
`9`	`9`	`try {`
`@@ -14,5 +14,6 @@ public Object run(final Context cx) {`
`14`	`14`	`throw new RuntimeException(e);`
`15`	`15`	`}`
`16`	`16`	`}`
	`17`	`+`
`17`	`18`	`protected abstract Object doRun(final Context cx) throws Exception;`
`18`	`19`	`}`