Switch to JUnit4 for "tests"

Author: gbrail

tests/src/test/java/org/mozilla/classfile/tests/ClassFileWriterTest.java

@@ -1,12 +1,12 @@
 package org.mozilla.classfile.tests;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mozilla.classfile.ClassFileWriter.ACC_PUBLIC;
 import static org.mozilla.classfile.ClassFileWriter.ACC_STATIC;
 
 import java.lang.reflect.Method;
 import java.math.BigInteger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mozilla.classfile.ByteCode;
 import org.mozilla.classfile.ClassFileWriter;
 import org.mozilla.javascript.DefiningClassLoader;

tests/src/test/java/org/mozilla/javascript/drivers/JsTestsBase.java

@@ -4,12 +4,12 @@
 
 package org.mozilla.javascript.drivers;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.ContextFactory;
 import org.mozilla.javascript.Scriptable;
@@ -21,7 +21,7 @@ public abstract class JsTestsBase {
 
     private static ContextFactory threadSafeFactory;
 
-    @BeforeClass
+    @BeforeAll
     public static void init() {
         threadSafeFactory = Utils.contextFactoryWithFeatures(Context.FEATURE_THREAD_SAFE_OBJECTS);
     }

tests/src/test/java/org/mozilla/javascript/drivers/ScriptTestsBase.java

@@ -4,19 +4,15 @@
 
 package org.mozilla.javascript.drivers;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.jupiter.api.Test;
 import org.mozilla.javascript.Callable;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.JavaScriptException;
@@ -33,7 +29,6 @@
  * represented by a class that extends this class, and has a "RhinoTest" annotation at the class
  * level that returns the file name of the script to execute.
  */
-@RunWith(BlockJUnit4ClassRunner.class)
 public abstract class ScriptTestsBase {
 
     private Object executeRhinoScript(boolean interpretedMode) {

tests/src/test/java/org/mozilla/javascript/testing/TestErrorReporter.java

@@ -4,6 +4,9 @@
 
 package org.mozilla.javascript.testing;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import org.junit.Assert;
 import org.mozilla.javascript.ErrorReporter;
 import org.mozilla.javascript.EvaluatorException;

tests/src/test/java/org/mozilla/javascript/tests/ApplyTest.java

@@ -1,6 +1,6 @@
 package org.mozilla.javascript.tests;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mozilla.javascript.testutils.Utils;
 
 public class ApplyTest {

tests/src/test/java/org/mozilla/javascript/tests/BracelessIfElseWithCommentsParseTest.java

@@ -4,8 +4,8 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.stream.Collectors;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mozilla.javascript.CompilerEnvirons;
 import org.mozilla.javascript.Parser;
 import org.mozilla.javascript.ast.AstRoot;
@@ -35,10 +35,10 @@ public void testBracelessIfElseWithMultipleComments() throws IOException {
 
         // Parsing should not throw a syntax error
         AstRoot ast = parser.parse(source, "test", 1);
-        Assert.assertNotNull(ast);
+        Assertions.assertNotNull(ast);
 
         // The fixture has 18 comments — verify they were all recorded
-        Assert.assertEquals(14, ast.getComments().size());
+        Assertions.assertEquals(14, ast.getComments().size());
     }
 
     @Test
@@ -56,8 +56,8 @@ public void testMinimalTwoCommentRepro() {
 
         Parser parser = new Parser(env);
         AstRoot ast = parser.parse(source, "test", 1);
-        Assert.assertNotNull(ast);
-        Assert.assertEquals(1, ast.getComments().size());
+        Assertions.assertNotNull(ast);
+        Assertions.assertEquals(1, ast.getComments().size());
     }
 
     @Test
@@ -74,8 +74,8 @@ public void testSingleCommentStillWorks() {
 
         Parser parser = new Parser(env);
         AstRoot ast = parser.parse(source, "test", 1);
-        Assert.assertNotNull(ast);
-        Assert.assertEquals(1, ast.getComments().size());
+        Assertions.assertNotNull(ast);
+        Assertions.assertEquals(1, ast.getComments().size());
     }
 
     @Test
@@ -100,7 +100,7 @@ public void testConsecutiveCommentsAreMergedInToSource() {
                         + "  doSomething();\n"
                         + "else \n"
                         + "  doSomethingElse();\n";
-        Assert.assertEquals(expected, ast.toSource());
+        Assertions.assertEquals(expected, ast.toSource());
     }
 
     @Test
@@ -116,12 +116,12 @@ public void testCommentContentAfterMerging() {
 
         // Check how many comments are in the global list
         java.util.SortedSet<org.mozilla.javascript.ast.Comment> comments = ast.getComments();
-        Assert.assertEquals(1, comments.size());
+        Assertions.assertEquals(1, comments.size());
 
         java.util.Iterator<org.mozilla.javascript.ast.Comment> it = comments.iterator();
         org.mozilla.javascript.ast.Comment c1 = it.next();
 
-        Assert.assertEquals("// comment 1\n// comment 2", c1.getValue());
+        Assertions.assertEquals("// comment 1\n// comment 2", c1.getValue());
     }
 
     @Test
@@ -139,6 +139,6 @@ public void testWithoutRecordingCommentsStillWorks() {
 
         Parser parser = new Parser(env);
         AstRoot ast = parser.parse(source, "test", 1);
-        Assert.assertNotNull(ast);
+        Assertions.assertNotNull(ast);
     }
 }

tests/src/test/java/org/mozilla/javascript/tests/BuiltinCtorTest.java

@@ -1,9 +1,9 @@
 package org.mozilla.javascript.tests;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.TopLevel;
@@ -29,11 +29,11 @@ public void checkCtorArity() {
                         continue;
                     }
                     assertTrue(
-                            String.format("Expected %s() to return an object", bi.name()),
-                            res instanceof Scriptable);
+                            res instanceof Scriptable,
+                            String.format("Expected %s() to return an object", bi.name()));
                     assertNotNull(
-                            String.format("Expected %s() to set parent scope", bi.name()),
-                            ((Scriptable) res).getParentScope());
+                            ((Scriptable) res).getParentScope(),
+                            String.format("Expected %s() to set parent scope", bi.name()));
                 }
             }
         }

tests/src/test/java/org/mozilla/javascript/tests/CharacterAssignmentTest.java

@@ -2,7 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mozilla.javascript.testutils.Utils;
 import org.mozilla.javascript.tools.shell.Global;
 

tests/src/test/java/org/mozilla/javascript/tests/ComparatorTest.java

@@ -1,11 +1,11 @@
 package org.mozilla.javascript.tests;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mozilla.javascript.ArrayLikeAbstractOperations.*;
 
 import java.io.FileReader;
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.RhinoException;
 import org.mozilla.javascript.Scriptable;

tests/src/test/java/org/mozilla/javascript/tests/ComputedPropertiesTest.java

@@ -4,7 +4,7 @@
 
 package org.mozilla.javascript.tests;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mozilla.javascript.testutils.Utils;
 
 public class ComputedPropertiesTest {