Migrate /deser/dos, /deser/builder, /deser/enums tests to JUnit 5 (#4344)

Author: JooHyukKim

src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java

@@ -131,17 +131,6 @@ public ArrayWrapper(T[] v) {
         }
     }
 
-    /**
-     * Enumeration type with sub-classes per value.
-     */
-    protected enum EnumWithSubClass {
-        A { @Override public void foobar() { } }
-        ,B { @Override public void foobar() { } }
-        ;
-
-        public abstract void foobar();
-    }
-
     public enum ABC { A, B, C; }
 
     // since 2.8

src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderAdvancedTest.java

@@ -1,12 +1,21 @@
 package com.fasterxml.jackson.databind.deser.builder;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-public class BuilderAdvancedTest extends BaseMapTest
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.a2q;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
+
+public class BuilderAdvancedTest
 {
     @JsonDeserialize(builder=InjectableBuilderXY.class)
     static class InjectableXY
@@ -88,6 +97,7 @@ public ExternalBean build() {
     /**********************************************************
      */
 
+    @Test
     public void testWithInjectable() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();
@@ -101,6 +111,7 @@ public void testWithInjectable() throws Exception
         assertEquals("stuffValue", bean._stuff);
     }
 
+    @Test
     public void testWithExternalTypeId() throws Exception
     {
         ObjectMapper mapper = newJsonMapper();

src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderDeserializationTest2486.java

@@ -1,14 +1,20 @@
 package com.fasterxml.jackson.databind.deser.builder;
 
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.databind.BaseMapTest;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-import java.util.List;
+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;
 
 public class BuilderDeserializationTest2486
-        extends BaseMapTest
 {
     @JsonDeserialize(builder = MyPOJOWithArrayCreator.Builder.class)
     public static class MyPOJOWithArrayCreator {
@@ -104,24 +110,28 @@ public MyPOJOWithPrimitiveCreator build() {
     // pass in both cases.
     //
     // I left some notes in BeanDeserializerBase as to behavior.
+    @Test
     public void testPOJOWithArrayCreatorFromObjectRepresentation() throws Exception {
         final String json = a2q("{ 'index': 123 }");
         final MyPOJOWithArrayCreator deserialized = MAPPER.readValue(json, MyPOJOWithArrayCreator.class);
         assertEquals(123, deserialized.getIndex());
     }
 
+    @Test
     public void testPOJOWithArrayCreatorFromArrayRepresentation() throws Exception {
         final String json = "[123]";
         final MyPOJOWithArrayCreator deserialized = MAPPER.readValue(json, MyPOJOWithArrayCreator.class);
         assertEquals(123, deserialized.getIndex());
     }
 
+    @Test
     public void testPOJOWithPrimitiveCreatorFromObjectRepresentation() throws Exception {
         final String json = a2q("{ 'index': 123 }");
         final MyPOJOWithPrimitiveCreator deserialized = MAPPER.readValue(json, MyPOJOWithPrimitiveCreator.class);
         assertEquals(123, deserialized.getIndex());
     }
 
+    @Test
     public void testPOJOWithPrimitiveCreatorFromPrimitiveRepresentation() throws Exception {
         final String json ="123";
         final MyPOJOWithPrimitiveCreator deserialized = MAPPER.readValue(json, MyPOJOWithPrimitiveCreator.class);
@@ -134,24 +144,28 @@ public void testPOJOWithPrimitiveCreatorFromPrimitiveRepresentation() throws Exc
     // This fails the same as above. So the failure of default deserialization
     // from an object shape in the presence of a @JsonCreator accepting an array
     // is not specific to the use of Builders as an intermediary.
+    @Test
     public void testPOJOBuilderWithArrayCreatorFromObjectRepresentation() throws Exception {
         final String json = a2q("{ 'index': 123 }");
         final MyPOJOWithArrayCreator.Builder deserialized = MAPPER.readValue(json, MyPOJOWithArrayCreator.Builder.class);
         assertEquals(123, deserialized.index);
     }
 
+    @Test
     public void testPOJOBuilderWithArrayCreatorFromArrayRepresentation() throws Exception {
         final String json = "[123]";
         final MyPOJOWithArrayCreator.Builder deserialized = MAPPER.readValue(json, MyPOJOWithArrayCreator.Builder.class);
         assertEquals(123, deserialized.index);
     }
 
+    @Test
     public void testPOJOBuilderWithPrimitiveCreatorFromObjectRepresentation() throws Exception {
         final String json = a2q("{ 'index': 123 }");
         final MyPOJOWithPrimitiveCreator.Builder deserialized = MAPPER.readValue(json, MyPOJOWithPrimitiveCreator.Builder.class);
         assertEquals(123, deserialized.index);
     }
 
+    @Test
     public void testPOJOBuilderWithPrimitiveCreatorFromPrimitiveRepresentation() throws Exception {
         final String json = "123";
         final MyPOJOWithPrimitiveCreator.Builder deserialized = MAPPER.readValue(json, MyPOJOWithPrimitiveCreator.Builder.class);

src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderErrorHandling.java

@@ -1,13 +1,19 @@
 package com.fasterxml.jackson.databind.deser.builder;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonSetter;
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.exc.ValueInstantiationException;
 
-public class BuilderErrorHandling extends BaseMapTest
+import static org.junit.jupiter.api.Assertions.*;
+
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.*;
+
+public class BuilderErrorHandling
 {
     @JsonDeserialize(builder=SimpleBuilderXY.class)
     static class ValueClassXY
@@ -104,6 +110,7 @@ ValidatingValue build() {
             .disable(DeserializationFeature.WRAP_EXCEPTIONS)
             .build();
 
+    @Test
     public void testUnknownProperty() throws Exception
     {
         // first, default failure
@@ -122,6 +129,7 @@ public void testUnknownProperty() throws Exception
         assertEquals(5, result._y);
     }
 
+    @Test
     public void testWrongShape() throws Exception
     {
         try {
@@ -136,13 +144,15 @@ public void testWrongShape() throws Exception
 
     // [databind#2938]
 
+    @Test
     public void testSuccessfulValidatingBuilder() throws Exception
     {
         ValidatingValue result = MAPPER.readValue(a2q("{'a':'1','b':'2'}"), ValidatingValue.class);
         assertEquals("1", result.first);
         assertEquals("2", result.second);
     }
 
+    @Test
     public void testFailingValidatingBuilderWithExceptionWrapping() throws Exception
     {
         try {
@@ -154,6 +164,7 @@ public void testFailingValidatingBuilderWithExceptionWrapping() throws Exception
         }
     }
 
+    @Test
     public void testFailingValidatingBuilderWithExceptionWrappingFromTree() throws Exception
     {
         try {
@@ -166,6 +177,7 @@ public void testFailingValidatingBuilderWithExceptionWrappingFromTree() throws E
         }
     }
 
+    @Test
     public void testFailingValidatingBuilderWithoutExceptionWrapping() throws Exception
     {
         try {
@@ -177,6 +189,7 @@ public void testFailingValidatingBuilderWithoutExceptionWrapping() throws Except
         }
     }
 
+    @Test
     public void testFailingValidatingBuilderWithoutExceptionWrappingFromTree() throws Exception
     {
         try {

src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderFailTest.java

@@ -1,11 +1,18 @@
 package com.fasterxml.jackson.databind.deser.builder;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 
-public class BuilderFailTest extends BaseMapTest
+import static org.junit.jupiter.api.Assertions.fail;
+
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.a2q;
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.verifyException;
+
+public class BuilderFailTest
 {
     @JsonDeserialize(builder=SimpleBuilderXY.class)
     static class ValueClassXY
@@ -63,6 +70,7 @@ public ValueClassXY build() {
 
     private final ObjectMapper MAPPER = new ObjectMapper();
 
+    @Test
     public void testBuilderMethodReturnInvalidType() throws Exception
     {
         final String json = "{\"x\":1}";
@@ -76,6 +84,7 @@ public void testBuilderMethodReturnInvalidType() throws Exception
         }
     }
 
+    @Test
     public void testExtraFields() throws Exception
     {
         final String json = a2q("{'x':1,'y':2,'z':3}");

src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderInfiniteLoop1978Test.java

@@ -1,13 +1,17 @@
 package com.fasterxml.jackson.databind.deser.builder;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 import com.fasterxml.jackson.databind.*;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-public class BuilderInfiniteLoop1978Test extends BaseMapTest
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class BuilderInfiniteLoop1978Test
 {
     static class Builder
     {
@@ -85,6 +89,7 @@ static class SubBean
      */
 
     // for [databind#1978]
+    @Test
     public void testInfiniteLoop1978() throws Exception
     {
         String json = "{\"sub.el1\":34,\"sub.el2\":\"some text\"}";

src/test/java/com/fasterxml/jackson/databind/deser/builder/BuilderSimpleTest.java

@@ -2,6 +2,8 @@
 
 import java.util.*;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.*;
 
 import com.fasterxml.jackson.core.Version;
@@ -12,7 +14,11 @@
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector;
 
-public class BuilderSimpleTest extends BaseMapTest
+import static org.junit.jupiter.api.Assertions.*;
+
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.*;
+
+public class BuilderSimpleTest
 {
     // // Simple 2-property value class, builder with standard naming
 
@@ -303,6 +309,7 @@ private Value2354 build() {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    @Test
     public void testSimple() throws Exception
     {
         String json = a2q("{'x':1,'y':2}");
@@ -316,6 +323,7 @@ public void testSimple() throws Exception
     }
 
     // related to [databind#1214]
+    @Test
     public void testSimpleWithIgnores() throws Exception
     {
         // 'z' is unknown, and would fail by default:
@@ -344,6 +352,7 @@ public void testSimpleWithIgnores() throws Exception
         assertEquals(value._y, 3);
     }
 
+    @Test
     public void testMultiAccess() throws Exception
     {
         String json = a2q("{'c':3,'a':2,'b':-9}");
@@ -362,6 +371,7 @@ public void testMultiAccess() throws Exception
     }
 
     // test for Immutable builder, to ensure return value is used
+    @Test
     public void testImmutable() throws Exception
     {
         final String json = "{\"value\":13}";
@@ -370,6 +380,7 @@ public void testImmutable() throws Exception
     }
 
     // test with custom 'with-prefix'
+    @Test
     public void testCustomWith() throws Exception
     {
         final String json = "{\"value\":1}";
@@ -379,20 +390,23 @@ public void testCustomWith() throws Exception
 
     // for [databind#761]
 
+    @Test
     public void testBuilderMethodReturnMoreGeneral() throws Exception
     {
         final String json = "{\"x\":1}";
         ValueInterface value = MAPPER.readValue(json, ValueInterface.class);
         assertEquals(2, value.getX());
     }
 
+    @Test
     public void testBuilderMethodReturnMoreSpecific() throws Exception
     {
         final String json = "{\"x\":1}";
         ValueInterface2 value = MAPPER.readValue(json, ValueInterface2.class);
         assertEquals(2, value.getX());
     }
 
+    @Test
     public void testSelfBuilder777() throws Exception
     {
         SelfBuilder777 result = MAPPER.readValue(a2q("{'x':3}'"),
@@ -401,6 +415,7 @@ public void testSelfBuilder777() throws Exception
         assertEquals(3, result.x);
     }
 
+    @Test
     public void testWithAnySetter822() throws Exception
     {
         final String json = "{\"extra\":3,\"foobar\":[ ],\"x\":1,\"name\":\"bob\"}";
@@ -416,6 +431,7 @@ public void testWithAnySetter822() throws Exception
         assertTrue(((List<?>) ob).isEmpty());
     }
 
+    @Test
     public void testPOJOConfigResolution1557() throws Exception
     {
         final String json = "{\"value\":1}";
@@ -425,6 +441,7 @@ public void testPOJOConfigResolution1557() throws Exception
     }
 
     // related to [databind#2354] (ensure private inner builder classes are ok)
+    @Test
     public void testPrivateInnerBuilder() throws Exception
     {
         String json = a2q("{'value':13}");