Upgrade from JUnit 4 to the JUnit 5 with OpenRewrite recipe and some …

…corrections afterward Signed-off-by: Anton Pinsky <anton.pinsky@ionos.com>
api-from-the-ion · Nov 17, 2023 · a1444eb · a1444eb
1 parent 5c41302
commit a1444eb
Show file tree

Hide file tree

Showing 44 changed files with 1,016 additions and 796 deletions.
diff --git a/demos/customprovider-jdk9/pom.xml b/demos/customprovider-jdk9/pom.xml
@@ -74,8 +74,8 @@
             <artifactId>jakarta.json-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java b/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java
@@ -10,11 +10,13 @@
 
 package customprovider.test;
 
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+
 import jakarta.json.Json;
 import jakarta.json.stream.JsonGenerator;
+
 import org.eclipse.parsson.demos.customprovider.TestGenerator;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  *
@@ -23,9 +25,9 @@
 public class TestProviderTest {
 
     @Test
-    public void hello() {
+    void hello() {
         try (JsonGenerator generator = Json.createGenerator(System.out)) {
-            Assert.assertTrue("TestGenerator is not picked up", generator instanceof TestGenerator);
+            assertInstanceOf(TestGenerator.class, generator, "TestGenerator is not picked up");
             generator.writeStartArray().writeEnd();
         }
         System.out.println();

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -97,8 +97,14 @@
             <artifactId>jakarta.json-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/impl/src/test/java/org/eclipse/parsson/tests/Issue25Test.java b/impl/src/test/java/org/eclipse/parsson/tests/Issue25Test.java
@@ -16,14 +16,14 @@
 
 package org.eclipse.parsson.tests;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import jakarta.json.JsonObject;
 import jakarta.json.spi.JsonProvider;
@@ -32,7 +32,7 @@
 public class Issue25Test {
 
     @Test
-    public void doubleClose() throws IOException {
+    void doubleClose() throws IOException {
         byte[] content = "[\"test\"]".getBytes();
         JsonProvider json = JsonProvider.provider();
         for (int i = 0; i < 3; i++) {
@@ -54,7 +54,7 @@ public void doubleClose() throws IOException {
     }
 
     @Test
-    public void doubleCloseWithMoreContent() throws IOException {
+    void doubleCloseWithMoreContent() throws IOException {
         byte[] content = loadResource("/comments.json");
         JsonProvider json = JsonProvider.provider();
         for (int i = 0; i < 3; i++) {

diff --git a/impl/src/test/java/org/eclipse/parsson/tests/JsonArrayTest.java b/impl/src/test/java/org/eclipse/parsson/tests/JsonArrayTest.java
@@ -16,23 +16,30 @@
 
 package org.eclipse.parsson.tests;
 
-import junit.framework.TestCase;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
-import jakarta.json.*;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonNumber;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
+import jakarta.json.JsonWriter;
+
+import org.junit.jupiter.api.Test;
+
 /**
  * @author Jitendra Kotamraju
  */
-public class JsonArrayTest extends TestCase {
-    public JsonArrayTest(String testName) {
-        super(testName);
-    }
-
-    public void testArrayEquals() throws Exception {
+public class JsonArrayTest {
+    @Test
+    void testArrayEquals() throws Exception {
         JsonArray expected = Json.createArrayBuilder()
                 .add(JsonValue.TRUE)
                 .add(JsonValue.FALSE)
@@ -59,7 +66,8 @@ public void testArrayEquals() throws Exception {
         assertEquals(expected, actual);
     }
 
-    public void testArrayEqualsUsingCollection() {
+    @Test
+    void testArrayEqualsUsingCollection() {
         List<Object> list = new ArrayList<>();
         list.add(JsonValue.TRUE);
         list.add(JsonValue.FALSE);
@@ -87,21 +95,24 @@ public void testArrayEqualsUsingCollection() {
         assertEquals(expected, actual);
     }
 
-    public void testStringValue() throws Exception {
+    @Test
+    void testStringValue() throws Exception {
         JsonArray array = Json.createArrayBuilder()
                 .add("John")
                 .build();
         assertEquals("John", array.getString(0));
     }
 
-    public void testIntValue() throws Exception {
+    @Test
+    void testIntValue() throws Exception {
         JsonArray array = Json.createArrayBuilder()
                 .add(20)
                 .build();
         assertEquals(20, array.getInt(0));
     }
 
-    public void testAdd() {
+    @Test
+    void testAdd() {
         JsonArray array = Json.createArrayBuilder().build();
         try {
             array.add(JsonValue.FALSE);
@@ -111,7 +122,8 @@ public void testAdd() {
         }
     }
 
-    public void testRemove() {
+    @Test
+    void testRemove() {
         JsonArray array = Json.createArrayBuilder().build();
         try {
             array.remove(0);
@@ -121,7 +133,8 @@ public void testRemove() {
         }
     }
 
-    public void testNumberView() throws Exception {
+    @Test
+    void testNumberView() throws Exception {
         JsonArray array = Json.createArrayBuilder().add(20).add(10).build();
 
         List<JsonNumber> numberList = array.getValuesAs(JsonNumber.class);
@@ -133,7 +146,8 @@ public void testNumberView() throws Exception {
         assertEquals(10, array.getInt(1));
     }
 
-    public void testArrayBuilderNpe() {
+    @Test
+    void testArrayBuilderNpe() {
         try {
             JsonArray array = Json.createArrayBuilder().add((JsonValue)null).build();
             fail("JsonArrayBuilder#add(null) should throw NullPointerException");
@@ -142,7 +156,8 @@ public void testArrayBuilderNpe() {
         }
     }
 
-    public void testHashCode() {
+    @Test
+    void testHashCode() {
         JsonArray array1 = Json.createArrayBuilder().add(1).add(2).add(3).build();
         assertTrue(array1.hashCode() == array1.hashCode()); //1st call compute hashCode, 2nd call returns cached value
 

diff --git a/impl/src/test/java/org/eclipse/parsson/tests/JsonBigDecimalLengthLimitTest.java b/impl/src/test/java/org/eclipse/parsson/tests/JsonBigDecimalLengthLimitTest.java
@@ -16,38 +16,41 @@
 
 package org.eclipse.parsson.tests;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.io.StringReader;
 import java.math.BigDecimal;
 
 import jakarta.json.Json;
 import jakarta.json.JsonNumber;
 import jakarta.json.JsonReader;
 import jakarta.json.JsonValue;
-import junit.framework.TestCase;
+
 import org.eclipse.parsson.api.JsonConfig;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test maxBigDecimalLength limit set from System property.
  */
-public class JsonBigDecimalLengthLimitTest extends TestCase  {
-
-    public JsonBigDecimalLengthLimitTest(String testName) {
-        super(testName);
-    }
+public class JsonBigDecimalLengthLimitTest  {
 
-    @Override
-    protected void setUp() {
+    @BeforeEach
+    void setUp() {
         System.setProperty(JsonConfig.MAX_BIGDECIMAL_LEN, "500");
     }
 
-    @Override
-    protected void tearDown() {
+    @AfterEach
+    void tearDown() {
         System.clearProperty(JsonConfig.MAX_BIGDECIMAL_LEN);
     }
 
     // Test BigDecimal max source characters array length using length equal to system property limit of 500.
     // Parsing shall pass and return value equal to source String.
-    public void testLargeBigDecimalBellowLimit() {
+    @Test
+    void testLargeBigDecimalBellowLimit() {
         JsonReader reader = Json.createReader(new StringReader(JsonNumberTest.Π_500));
         JsonNumber check = Json.createValue(new BigDecimal(JsonNumberTest.Π_500));
         JsonValue value = reader.readValue();
@@ -57,7 +60,8 @@ public void testLargeBigDecimalBellowLimit() {
 
     // Test BigDecimal max source characters array length using length above system property limit of 500.
     // Parsing shall pass and return value equal to source String.
-    public void testLargeBigDecimalAboveLimit() {
+    @Test
+    void testLargeBigDecimalAboveLimit() {
         JsonReader reader = Json.createReader(new StringReader(JsonNumberTest.Π_501));
         try {
             reader.readValue();

diff --git a/impl/src/test/java/org/eclipse/parsson/tests/JsonBigDecimalScaleLimitTest.java b/impl/src/test/java/org/eclipse/parsson/tests/JsonBigDecimalScaleLimitTest.java
@@ -16,37 +16,41 @@
 
 package org.eclipse.parsson.tests;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
 import jakarta.json.Json;
-import junit.framework.TestCase;
+
 import org.eclipse.parsson.api.JsonConfig;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+
 /**
  * Test maxBigIntegerScale limit set from System property.
  */
-public class JsonBigDecimalScaleLimitTest extends TestCase {
+public class JsonBigDecimalScaleLimitTest {
 
     private static final int MAX_BIGINTEGER_SCALE = 50000;
-
-    public JsonBigDecimalScaleLimitTest(String testName) {
-        super(testName);
-    }
-
-    @Override
-    protected void setUp() {
+
+    @BeforeEach
+    void setUp() {
         System.setProperty(JsonConfig.MAX_BIGINTEGER_SCALE, Integer.toString(MAX_BIGINTEGER_SCALE));
     }
 
-    @Override
-    protected void tearDown() {
+    @AfterEach
+    void tearDown() {
         System.clearProperty(JsonConfig.MAX_BIGINTEGER_SCALE);
     }
 
     // Test BigInteger scale value limit set from system property using value bellow limit.
     // Call shall return value.
-    public void testSystemPropertyBigIntegerScaleBellowLimit() {
+    @Test
+    void testSystemPropertyBigIntegerScaleBellowLimit() {
         BigDecimal value = new BigDecimal("3.1415926535897932384626433");
         Json.createValue(value).bigIntegerValue();
     }
@@ -55,7 +59,8 @@ public void testSystemPropertyBigIntegerScaleBellowLimit() {
     // Call shall throw specific UnsupportedOperationException exception.
     // Default value is 100000 and system property lowered it to 50000 so value with scale 50001
     // test shall fail with exception message matching modified limits.
-    public void testSystemPropertyBigIntegerScaleAboveLimit() {
+    @Test
+    void testSystemPropertyBigIntegerScaleAboveLimit() {
         BigDecimal value = new BigDecimal("3.1415926535897932384626433")
                 .setScale(50001, RoundingMode.HALF_UP);
         try {
@@ -73,7 +78,8 @@ public void testSystemPropertyBigIntegerScaleAboveLimit() {
     // Call shall throw specific UnsupportedOperationException exception.
     // Default value is 100000 and system property lowered it to 50000 so value with scale -50001
     // test shall fail with exception message matching modified limits.
-    public void testSystemPropertyBigIntegerNegScaleAboveLimit() {
+    @Test
+    void testSystemPropertyBigIntegerNegScaleAboveLimit() {
         BigDecimal value = new BigDecimal("3.1415926535897932384626433")
                 .setScale(-50001, RoundingMode.HALF_UP);
         try {