Migrate /convert tests to JUnit 5 (#4307)

FasterXML · Jan 8, 2024 · d0bb16b · d0bb16b
1 parent e1eae02
commit d0bb16b
Show file tree

Hide file tree

Showing 29 changed files with 503 additions and 92 deletions.
diff --git a/src/test/java/com/fasterxml/jackson/databind/convert/CoerceBoolToStringTest.java b/src/test/java/com/fasterxml/jackson/databind/convert/CoerceBoolToStringTest.java
@@ -1,15 +1,20 @@
 package com.fasterxml.jackson.databind.convert;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.cfg.CoercionAction;
 import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.type.LogicalType;
 
-public class CoerceBoolToStringTest extends BaseMapTest
+import static org.junit.jupiter.api.Assertions.*;
+
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.*;
+
+public class CoerceBoolToStringTest
 {
     private final ObjectMapper DEFAULT_MAPPER = newJsonMapper();
 
@@ -33,16 +38,19 @@ public class CoerceBoolToStringTest extends BaseMapTest
                     cfg.setCoercion(CoercionInputShape.Boolean, CoercionAction.AsEmpty))
             .build();
 
+    @Test
     public void testDefaultBooleanToStringCoercion() throws JsonProcessingException
     {
         assertSuccessfulBooleanToStringCoercionWith(DEFAULT_MAPPER);
     }
 
+    @Test
     public void testCoerceConfigToConvert() throws JsonProcessingException
     {
         assertSuccessfulBooleanToStringCoercionWith(MAPPER_TRY_CONVERT);
     }
 
+    @Test
     public void testCoerceConfigToNull() throws JsonProcessingException
     {
         assertNull(MAPPER_TO_NULL.readValue("true", String.class));
@@ -53,6 +61,7 @@ public void testCoerceConfigToNull() throws JsonProcessingException
         assertNull(arr[0]);
     }
 
+    @Test
     public void testCoerceConfigToEmpty() throws JsonProcessingException
     {
         assertEquals("", MAPPER_TO_EMPTY.readValue("true", String.class));
@@ -63,6 +72,7 @@ public void testCoerceConfigToEmpty() throws JsonProcessingException
         assertEquals("", arr[0]);
     }
 
+    @Test
     public void testCoerceConfigToFail() throws JsonProcessingException
     {
         _verifyCoerceFail(MAPPER_TO_FAIL, String.class, "true");

diff --git a/src/test/java/com/fasterxml/jackson/databind/convert/CoerceContainersTest.java b/src/test/java/com/fasterxml/jackson/databind/convert/CoerceContainersTest.java
@@ -1,14 +1,23 @@
 package com.fasterxml.jackson.databind.convert;
 
-import java.util.*;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.*;
+import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DatabindException;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.cfg.CoercionAction;
 import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
 
-public class CoerceContainersTest extends BaseMapTest
+import static org.junit.jupiter.api.Assertions.*;
+
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.*;
+
+public class CoerceContainersTest
 {
     private final String JSON_EMPTY = q("");
 
@@ -25,6 +34,7 @@ public class CoerceContainersTest extends BaseMapTest
     /********************************************************
      */
 
+    @Test
     public void testScalarCollections() throws Exception
     {
         final JavaType listType = VANILLA_MAPPER.getTypeFactory()
@@ -48,6 +58,7 @@ public void testScalarCollections() throws Exception
         assertEquals(0, result.size());
     }
 
+    @Test
     public void testStringCollections() throws Exception
     {
         final JavaType listType = VANILLA_MAPPER.getTypeFactory()
@@ -64,6 +75,7 @@ public void testStringCollections() throws Exception
     /********************************************************
      */
 
+    @Test
     public void testScalarMap() throws Exception
     {
         final JavaType mapType = VANILLA_MAPPER.getTypeFactory()
@@ -74,6 +86,7 @@ public void testScalarMap() throws Exception
         assertEquals(0, result.size());
     }
 
+    @Test
     public void testEnumMap() throws Exception
     {
         final JavaType mapType = VANILLA_MAPPER.getTypeFactory()
@@ -90,6 +103,7 @@ public void testEnumMap() throws Exception
     /********************************************************
      */
 
+    @Test
     public void testObjectArray() throws Exception
     {
         final JavaType arrayType = VANILLA_MAPPER.getTypeFactory()
@@ -100,6 +114,7 @@ public void testObjectArray() throws Exception
         assertEquals(0, result.length);
     }
 
+    @Test
     public void testStringArray() throws Exception
     {
         final JavaType arrayType = VANILLA_MAPPER.getTypeFactory()
@@ -110,6 +125,7 @@ public void testStringArray() throws Exception
         assertEquals(0, result.length);
     }
 
+    @Test
     public void testBooleanArray() throws Exception
     {
         _verifyNoCoercion(boolean[].class);
@@ -118,6 +134,7 @@ public void testBooleanArray() throws Exception
         assertEquals(0, result.length);
     }
 
+    @Test
     public void testIntArray() throws Exception
     {
         _verifyNoCoercion(int[].class);
@@ -126,6 +143,7 @@ public void testIntArray() throws Exception
         assertEquals(0, result.length);
     }
 
+    @Test
     public void testLongArray() throws Exception
     {
         _verifyNoCoercion(long[].class);
@@ -134,6 +152,7 @@ public void testLongArray() throws Exception
         assertEquals(0, result.length);
     }
 
+    @Test
     public void testFloatArray() throws Exception
     {
         _verifyNoCoercion(float[].class);
@@ -142,6 +161,7 @@ public void testFloatArray() throws Exception
         assertEquals(0, result.length);
     }
 
+    @Test
     public void testDoubleArray() throws Exception
     {
         _verifyNoCoercion(double[].class);
@@ -150,6 +170,7 @@ public void testDoubleArray() throws Exception
         assertEquals(0, result.length);
     }
 
+    @Test
     public void testPOJOArray() throws Exception
     {
         _verifyNoCoercion(StringWrapper[].class);

diff --git a/src/test/java/com/fasterxml/jackson/databind/convert/CoerceEmptyArrayTest.java b/src/test/java/com/fasterxml/jackson/databind/convert/CoerceEmptyArrayTest.java
@@ -6,20 +6,27 @@
 import java.net.URL;
 import java.util.*;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.cfg.CoercionAction;
 import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 import com.fasterxml.jackson.databind.type.LogicalType;
 
+import static org.junit.jupiter.api.Assertions.*;
+
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.*;
+
 /**
  * Tests to verify implementation of [databind#540]; also for
  * follow up work of:
  *
  * - [databind#994]
  */
-public class CoerceEmptyArrayTest extends BaseMapTest
+public class CoerceEmptyArrayTest
 {
     private final ObjectMapper DEFAULT_MAPPER = sharedMapper();
     private final ObjectReader DEFAULT_READER = DEFAULT_MAPPER.reader();
@@ -64,6 +71,7 @@ public boolean equals(Object o) {
     /**********************************************************
      */
 
+    @Test
     public void testSettings() {
         assertFalse(DEFAULT_MAPPER.isEnabled(DeserializationFeature.ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT));
         assertFalse(DEFAULT_READER.isEnabled(DeserializationFeature.ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT));
@@ -77,6 +85,7 @@ public void testSettings() {
      */
 
     // [databind#540]
+    @Test
     public void testPOJOFromEmptyArray() throws Exception
     {
         final Class<?> targetType = Bean.class;
@@ -113,6 +122,7 @@ public void testPOJOFromEmptyArray() throws Exception
     /**********************************************************
      */
 
+    @Test
     public void testMapFromEmptyArray() throws Exception
     {
         final Class<?> targetType = Map.class;
@@ -129,10 +139,11 @@ public void testMapFromEmptyArray() throws Exception
         // assume overrides work ok since POJOs test it
     }
 
+    @Test
     public void testEnumMapFromEmptyArray() throws Exception
     {
         final JavaType targetType = DEFAULT_READER.getTypeFactory()
-                .constructType(new TypeReference<EnumMap<ABC,String>>() { });
+                .constructType(new TypeReference<EnumMap<DatabindTestUtil.ABC,String>>() { });
 
         assertNull(MAPPER_TO_NULL.readerFor(targetType).readValue(EMPTY_ARRAY));
 
@@ -147,6 +158,7 @@ public void testEnumMapFromEmptyArray() throws Exception
     /**********************************************************
      */
 
+    @Test
     public void testNumbersFromEmptyArray() throws Exception
     {
         for (Class<?> targetType : new Class<?>[] {
@@ -180,6 +192,7 @@ public void testNumbersFromEmptyArray() throws Exception
         _verifyToEmptyCoercion(MAPPER_TO_EMPTY, BigDecimal.class, new BigDecimal(BigInteger.ZERO));
     }
 
+    @Test
     public void testOtherScalarsFromEmptyArray() throws Exception
     {
         for (Class<?> targetType : new Class<?>[] {

diff --git a/src/test/java/com/fasterxml/jackson/databind/convert/CoerceEmptyToInt3234Test.java b/src/test/java/com/fasterxml/jackson/databind/convert/CoerceEmptyToInt3234Test.java
@@ -1,9 +1,16 @@
 package com.fasterxml.jackson.databind.convert;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.*;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.a2q;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
+
 // [databind#3234]
-public class CoerceEmptyToInt3234Test extends BaseMapTest
+public class CoerceEmptyToInt3234Test
 {
     static class BasicIntWrapper {
         public int value = 13;
@@ -24,12 +31,14 @@ static class BasicDoubleWrapper {
 
     // // // Ints
 
+    @Test
     public void testSimpleIntFromEmpty() throws Exception
     {
         BasicIntWrapper w = READER_INT_BASIC.readValue(a2q("{'value':''}"));
         assertEquals(0, w.value);
     }
 
+    @Test
     public void testSimpleIntFromBlank() throws Exception
     {
         BasicIntWrapper w = READER_INT_BASIC.readValue(a2q("{'value':' '}"));
@@ -38,12 +47,14 @@ public void testSimpleIntFromBlank() throws Exception
 
     // // // Long
 
+    @Test
     public void testSimpleLongFromEmpty() throws Exception
     {
         BasicLongWrapper w = READER_LONG_BASIC.readValue(a2q("{'value':''}"));
         assertEquals(0L, w.value);
     }
 
+    @Test
     public void testSimpleLongFromBlank() throws Exception
     {
         BasicLongWrapper w = READER_LONG_BASIC.readValue(a2q("{'value':' '}"));
@@ -52,12 +63,14 @@ public void testSimpleLongFromBlank() throws Exception
 
     // // // Double
 
+    @Test
     public void testSimpleDoublegFromEmpty() throws Exception
     {
         BasicDoubleWrapper w = READER_DOUBLE_BASIC.readValue(a2q("{'value':''}"));
         assertEquals((double) 0, w.value);
     }
 
+    @Test
     public void testSimpleDoubleFromBlank() throws Exception
     {
         BasicDoubleWrapper w = READER_DOUBLE_BASIC.readValue(a2q("{'value':' '}"));