From b07f0f13d930ea1ade9ab6533e1b9a9167b2512a Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Fri, 10 Jan 2025 15:33:46 -0800 Subject: [PATCH] Remove remaining unintended direct JUnit 4 usage --- .../creators/jdk8/DelegatingCreatorTest.java | 93 ------------------- .../deser/creators/jdk8/EnumNamingTest.java | 39 -------- .../deser/creators/jdk8/ImmutableBean.java | 69 -------------- .../jdk8/ImmutableBeanWithStaticFactory.java | 62 ------------- .../deser/creators/jdk8/JsonCreatorTest.java | 38 -------- .../deser/creators/jdk8/PersonTest.java | 55 ----------- .../ext/jdk8/ContextualOptionalTest.java | 3 + .../ext/jdk8/CreatorForOptionalTest.java | 3 + .../ext/jdk8/DoubleStreamSerializerTest.java | 4 +- .../ext/jdk8/IntStreamSerializerTest.java | 4 +- .../databind/ext/jdk8/JDK8TypesTest.java | 3 + .../ext/jdk8/LongStreamSerializerTest.java | 4 +- .../databind/ext/jdk8/OptionalBasicTest.java | 44 ++++++--- .../ext/jdk8/OptionalBooleanTest.java | 3 + .../databind/ext/jdk8/OptionalMapsTest.java | 3 + .../databind/ext/jdk8/OptionalMergeTest.java | 3 + .../ext/jdk8/OptionalNumbersTest.java | 23 ++++- .../databind/ext/jdk8/OptionalTest.java | 18 +++- .../ext/jdk8/OptionalUnwrappedTest.java | 30 +++--- .../ext/jdk8/OptionalWithEmptyTest.java | 4 + .../ext/jdk8/OptionalnclusionTest.java | 10 ++ ...Test.java => PolymorphicOptionalTest.java} | 5 +- .../databind/ext/jdk8/SchemaVisitorTest.java | 4 + .../ext/jdk8/StreamSerializerTest.java | 3 +- .../databind/ext/jdk8/StreamTestBase.java | 2 +- .../ext/jdk8/TestOptionalWithPolymorphic.java | 8 +- .../databind/seq/PolyMapWriter827Test.java | 7 +- .../util/UnlimitedLookupCacheTest.java | 6 +- 28 files changed, 150 insertions(+), 400 deletions(-) delete mode 100644 src/test/java/tools/jackson/databind/deser/creators/jdk8/DelegatingCreatorTest.java delete mode 100644 src/test/java/tools/jackson/databind/deser/creators/jdk8/EnumNamingTest.java delete mode 100644 src/test/java/tools/jackson/databind/deser/creators/jdk8/ImmutableBean.java delete mode 100644 src/test/java/tools/jackson/databind/deser/creators/jdk8/ImmutableBeanWithStaticFactory.java delete mode 100644 src/test/java/tools/jackson/databind/deser/creators/jdk8/JsonCreatorTest.java delete mode 100644 src/test/java/tools/jackson/databind/deser/creators/jdk8/PersonTest.java rename src/test/java/tools/jackson/databind/ext/jdk8/{PolymoprhicOptionalTest.java => PolymorphicOptionalTest.java} (94%) diff --git a/src/test/java/tools/jackson/databind/deser/creators/jdk8/DelegatingCreatorTest.java b/src/test/java/tools/jackson/databind/deser/creators/jdk8/DelegatingCreatorTest.java deleted file mode 100644 index ed80c7f2e3..0000000000 --- a/src/test/java/tools/jackson/databind/deser/creators/jdk8/DelegatingCreatorTest.java +++ /dev/null @@ -1,93 +0,0 @@ -package tools.jackson.databind.deser.creators.jdk8; - -import java.util.*; - -import org.junit.*; - -import com.fasterxml.jackson.annotation.*; - -import tools.jackson.core.type.*; -import tools.jackson.databind.*; - -import static org.assertj.core.api.BDDAssertions.*; - -public class DelegatingCreatorTest -{ - static class ClassWithDelegatingCreator { - private final String value; - - @JsonCreator(mode = JsonCreator.Mode.DELEGATING) - ClassWithDelegatingCreator(Map props) { - this.value = props.get("value"); - } - - String getValue() { - return value; - } - } - - public static class IntWrapper - { - private final int value; - - @JsonCreator(mode=JsonCreator.Mode.PROPERTIES) - public IntWrapper(int value) { - this.value = value; - } - - public int getValue() { - return value; - } - } - - public static class GenericWrapper - { - private final T value; - - @JsonCreator(mode=JsonCreator.Mode.PROPERTIES) - public GenericWrapper(T value) { - this.value = value; - } - - public T getValue() { - return value; - } - } - - - /* - @Test - public void shouldNotOverrideJsonCreatorAnnotationWithSpecifiedMode() throws IOException { - - // given - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.registerModule(new ParameterNamesModule(JsonCreator.Mode.PROPERTIES)); - - // when - ClassWithDelegatingCreator actual = objectMapper.readValue("{\"value\":\"aValue\"}", - ClassWithDelegatingCreator.class); - - // then - Map props = new HashMap<>(); - props.put("value", "aValue"); - ClassWithDelegatingCreator expected = new ClassWithDelegatingCreator(props); - then(actual).isEqualToComparingFieldByField(expected); - } - */ - - @Test - public void shouldDeserializeIntWrapper() throws Exception { - ObjectMapper mapper = new ObjectMapper(); - IntWrapper actual = mapper.readValue - ("{\"value\":13}", IntWrapper.class); - then(actual).isEqualToComparingFieldByField(new IntWrapper(13)); - } - - @Test - public void shouldDeserializeGenericWrapper() throws Exception { - ObjectMapper mapper = new ObjectMapper(); - GenericWrapper actual = mapper.readValue - ("{\"value\":\"aValue\"}", new TypeReference>() { }); - then(actual).isEqualToComparingFieldByField(new GenericWrapper<>("aValue")); - } -} diff --git a/src/test/java/tools/jackson/databind/deser/creators/jdk8/EnumNamingTest.java b/src/test/java/tools/jackson/databind/deser/creators/jdk8/EnumNamingTest.java deleted file mode 100644 index abcba20598..0000000000 --- a/src/test/java/tools/jackson/databind/deser/creators/jdk8/EnumNamingTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package tools.jackson.databind.deser.creators.jdk8; - -import org.junit.Test; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import tools.jackson.databind.ObjectMapper; - -import static org.junit.Assert.assertEquals; - -public class EnumNamingTest -{ - enum SurprisingEnum32 { - @JsonProperty("customValue") - ENUM_NAME; - } - - // for [module-parameter-names#32] - @Test - public void testCustomEnumName() throws Exception - { - final String EXP = "\"customValue\""; - - // First, verify default handling - - String json = new ObjectMapper() - .writeValueAsString(SurprisingEnum32.ENUM_NAME); - assertEquals(EXP, json); - - // and then with parameter names module - final ObjectMapper mapperWithNames = new ObjectMapper(); - json = mapperWithNames.writeValueAsString(SurprisingEnum32.ENUM_NAME); - assertEquals(EXP, json); - - // plus read back: - SurprisingEnum32 value = mapperWithNames.readValue(json, SurprisingEnum32.class); - assertEquals(SurprisingEnum32.ENUM_NAME, value); - } -} diff --git a/src/test/java/tools/jackson/databind/deser/creators/jdk8/ImmutableBean.java b/src/test/java/tools/jackson/databind/deser/creators/jdk8/ImmutableBean.java deleted file mode 100644 index bee07f9687..0000000000 --- a/src/test/java/tools/jackson/databind/deser/creators/jdk8/ImmutableBean.java +++ /dev/null @@ -1,69 +0,0 @@ -package tools.jackson.databind.deser.creators.jdk8; - -import com.fasterxml.jackson.annotation.JsonCreator; - -/** - * @author Lovro Pandzic - */ -class ImmutableBean { - - private final String name; - private final Integer value; - - // needed because names are implicit (as of Jackson 2.4), not explicit - @JsonCreator - public ImmutableBean(String name, Integer value) { - - this.name = name; - this.value = value; - } - - public String getName() { - - return name; - } - - public Integer getValue() { - - return value; - } - - @Override - public int hashCode() { - - int result = name != null ? name.hashCode() : 0; - result = 31 * result + (value != null ? value.hashCode() : 0); - return result; - } - - @Override - public boolean equals(Object o) { - - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - final ImmutableBean that = (ImmutableBean) o; - - if (name != null ? !name.equals(that.name) : that.name != null) { - return false; - } - if (value != null ? !value.equals(that.value) : that.value != null) { - return false; - } - - return true; - } - - @Override - public String toString() { - - return "ImmutableBean{" + - "name='" + name + '\'' + - ", value=" + value + - '}'; - } -} diff --git a/src/test/java/tools/jackson/databind/deser/creators/jdk8/ImmutableBeanWithStaticFactory.java b/src/test/java/tools/jackson/databind/deser/creators/jdk8/ImmutableBeanWithStaticFactory.java deleted file mode 100644 index f4d6305cf3..0000000000 --- a/src/test/java/tools/jackson/databind/deser/creators/jdk8/ImmutableBeanWithStaticFactory.java +++ /dev/null @@ -1,62 +0,0 @@ -package tools.jackson.databind.deser.creators.jdk8; - -import com.fasterxml.jackson.annotation.JsonCreator; - -/** - * @author Lovro Pandzic - */ -class ImmutableBeanWithStaticFactory { - @JsonCreator - public static ImmutableBeanWithStaticFactory of(String name, Integer value) { - return new ImmutableBeanWithStaticFactory(name, value); - } - - private ImmutableBeanWithStaticFactory(String name, Integer value) { - this.name = name; - this.value = value; - } - - private final String name; - private final Integer value; - - public String getName() { return name;} - public Integer getValue() { return value; } - - @Override - public boolean equals(Object o) { - - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - final ImmutableBeanWithStaticFactory that = (ImmutableBeanWithStaticFactory) o; - - if (name != null ? !name.equals(that.name) : that.name != null) { - return false; - } - if (value != null ? !value.equals(that.value) : that.value != null) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - - int result = name != null ? name.hashCode() : 0; - result = 31 * result + (value != null ? value.hashCode() : 0); - return result; - } - - @Override - public String toString() { - return "ImmutableBeanWithStaticFactory{" + - "name='" + name + '\'' + - ", value=" + value + - '}'; - } -} diff --git a/src/test/java/tools/jackson/databind/deser/creators/jdk8/JsonCreatorTest.java b/src/test/java/tools/jackson/databind/deser/creators/jdk8/JsonCreatorTest.java deleted file mode 100644 index b72399f223..0000000000 --- a/src/test/java/tools/jackson/databind/deser/creators/jdk8/JsonCreatorTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package tools.jackson.databind.deser.creators.jdk8; - -import org.junit.jupiter.api.Test; - -import com.fasterxml.jackson.annotation.*; - -import tools.jackson.databind.*; -import tools.jackson.databind.testutil.DatabindTestUtil; - -import static org.assertj.core.api.BDDAssertions.then; - -public class JsonCreatorTest extends DatabindTestUtil -{ - static class ClassWithJsonCreatorOnStaticMethod { - final String first; - final String second; - - ClassWithJsonCreatorOnStaticMethod(String first, String second) { - this.first = first; - this.second = second; - } - - @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) - static ClassWithJsonCreatorOnStaticMethod factory(String first, String second) { - return new ClassWithJsonCreatorOnStaticMethod(first, second); - } - } - - @Test - public void testJsonCreatorOnStaticMethod() throws Exception { - ObjectMapper objectMapper = newJsonMapper(); - - String json = a2q("{'first':'1st','second':'2nd'}"); - ClassWithJsonCreatorOnStaticMethod actual = objectMapper.readValue(json, ClassWithJsonCreatorOnStaticMethod.class); - - then(actual).isEqualToComparingFieldByField(new ClassWithJsonCreatorOnStaticMethod("1st", "2nd")); - } -} diff --git a/src/test/java/tools/jackson/databind/deser/creators/jdk8/PersonTest.java b/src/test/java/tools/jackson/databind/deser/creators/jdk8/PersonTest.java deleted file mode 100644 index 2d2ffa82eb..0000000000 --- a/src/test/java/tools/jackson/databind/deser/creators/jdk8/PersonTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package tools.jackson.databind.deser.creators.jdk8; - -import java.io.IOException; - -import tools.jackson.databind.ObjectMapper; -import tools.jackson.databind.testutil.DatabindTestUtil; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class PersonTest extends DatabindTestUtil -{ - static class Person { - - // mandatory fields - private final String name; - private final String surname; - - // optional fields - private String nickname; - - // 29-Jan-2018, tatu: Should (apparently?! nice) work without annotation, as long as - // parameter names exist -// @JsonCreator(mode = JsonCreator.Mode.PROPERTIES) - public Person(String name, String surname) { - - this.name = name; - this.surname = surname; - } - - public String getName() { - return name; - } - - public String getSurname() { - return surname; - } - - public String getNickname() { - return nickname; - } - - public void setNickname(String nickname) { - this.nickname = nickname; - } - } - public void testPersonDeserialization() throws IOException - { - final ObjectMapper mapper = new ObjectMapper(); - Person actual = mapper.readValue("{\"name\":\"joe\",\"surname\":\"smith\",\"nickname\":\"joey\"}", Person.class); - - assertEquals("joe", actual.getName()); - assertEquals("smith", actual.getSurname()); - assertEquals("joey", actual.getNickname()); - } -} diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/ContextualOptionalTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/ContextualOptionalTest.java index 19805d80ca..886e3bf53a 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/ContextualOptionalTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/ContextualOptionalTest.java @@ -5,6 +5,8 @@ import java.util.Optional; import java.util.TimeZone; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -35,6 +37,7 @@ static class ContextualOptionals /********************************************************** */ + @Test public void testContextualOptionals() throws Exception { SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd"); diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/CreatorForOptionalTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/CreatorForOptionalTest.java index 183b37d410..838256632a 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/CreatorForOptionalTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/CreatorForOptionalTest.java @@ -2,6 +2,8 @@ import java.util.Optional; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -38,6 +40,7 @@ public CreatorWithOptionalStrings(@JsonProperty("a") Optional a, /** * Test to ensure that creator parameters use defaulting */ + @Test public void testCreatorWithOptional() throws Exception { CreatorWithOptionalStrings bean = MAPPER.readValue( diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/DoubleStreamSerializerTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/DoubleStreamSerializerTest.java index fa6b888766..423a21d0ea 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/DoubleStreamSerializerTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/DoubleStreamSerializerTest.java @@ -4,9 +4,9 @@ import java.io.UncheckedIOException; import java.util.stream.DoubleStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; public class DoubleStreamSerializerTest extends StreamTestBase { diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/IntStreamSerializerTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/IntStreamSerializerTest.java index 02cc2fa553..9f860c1b62 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/IntStreamSerializerTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/IntStreamSerializerTest.java @@ -4,9 +4,9 @@ import java.io.UncheckedIOException; import java.util.stream.IntStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; public class IntStreamSerializerTest extends StreamTestBase { diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/JDK8TypesTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/JDK8TypesTest.java index 0210d179db..9d44251efa 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/JDK8TypesTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/JDK8TypesTest.java @@ -5,6 +5,8 @@ import java.util.OptionalInt; import java.util.OptionalLong; +import org.junit.jupiter.api.Test; + import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; import tools.jackson.databind.type.ReferenceType; @@ -16,6 +18,7 @@ public class JDK8TypesTest { private final ObjectMapper MAPPER = newJsonMapper(); + @Test public void testOptionalsAreReferentialTypes() throws Exception { JavaType t = MAPPER.constructType(Optional.class); diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/LongStreamSerializerTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/LongStreamSerializerTest.java index 497f5b9885..01caa5cdd7 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/LongStreamSerializerTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/LongStreamSerializerTest.java @@ -4,9 +4,9 @@ import java.io.UncheckedIOException; import java.util.stream.LongStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; public class LongStreamSerializerTest extends StreamTestBase { diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalBasicTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalBasicTest.java index 1631380a1c..5fd3f367a6 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalBasicTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalBasicTest.java @@ -2,6 +2,8 @@ import java.util.*; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonTypeInfo.As; @@ -64,6 +66,7 @@ public static class ContainedImpl implements Contained { } private final ObjectMapper MAPPER = newJsonMapper(); + @Test public void testOptionalTypeResolution() throws Exception { // With 2.6, we need to recognize it as ReferenceType JavaType t = MAPPER.constructType(Optional.class); @@ -72,29 +75,33 @@ public void testOptionalTypeResolution() throws Exception { assertTrue(t.isReferenceType()); } - public void testDeserAbsent() throws Exception { - Optional value = MAPPER.readValue("null", - new TypeReference>() { - }); - assertFalse(value.isPresent()); - } + @Test + public void testDeserAbsent() throws Exception { + Optional value = MAPPER.readValue("null", + new TypeReference>() { + }); + assertFalse(value.isPresent()); + } - public void testDeserSimpleString() throws Exception { + @Test + public void testDeserSimpleString() throws Exception { Optional value = MAPPER.readValue("\"simpleString\"", new TypeReference>() { }); assertTrue(value.isPresent()); assertEquals("simpleString", value.get()); - } + } - public void testDeserInsideObject() throws Exception { + @Test + public void testDeserInsideObject() throws Exception { OptionalData data = MAPPER.readValue("{\"myString\":\"simpleString\"}", OptionalData.class); assertTrue(data.myString.isPresent()); assertEquals("simpleString", data.myString.get()); - } + } - public void testDeserComplexObject() throws Exception { + @Test + public void testDeserComplexObject() throws Exception { TypeReference> type = new TypeReference>() { }; Optional data = MAPPER.readValue( @@ -102,8 +109,9 @@ public void testDeserComplexObject() throws Exception { assertTrue(data.isPresent()); assertTrue(data.get().myString.isPresent()); assertEquals("simpleString", data.get().myString.get()); - } + } + @Test public void testDeserGeneric() throws Exception { TypeReference>> type = new TypeReference>>() { }; @@ -114,16 +122,19 @@ public void testDeserGeneric() throws Exception { assertEquals("simpleString", data.get().myData.get()); } + @Test public void testSerAbsent() throws Exception { String value = MAPPER.writeValueAsString(Optional.empty()); assertEquals("null", value); } + @Test public void testSerSimpleString() throws Exception { String value = MAPPER.writeValueAsString(Optional.of("simpleString")); assertEquals("\"simpleString\"", value); } + @Test public void testSerInsideObject() throws Exception { OptionalData data = new OptionalData(); data.myString = Optional.of("simpleString"); @@ -131,6 +142,7 @@ public void testSerInsideObject() throws Exception { assertEquals("{\"myString\":\"simpleString\"}", value); } + @Test public void testSerComplexObject() throws Exception { OptionalData data = new OptionalData(); data.myString = Optional.of("simpleString"); @@ -138,6 +150,7 @@ public void testSerComplexObject() throws Exception { assertEquals("{\"myString\":\"simpleString\"}", value); } + @Test public void testSerGeneric() throws Exception { OptionalGenericData data = new OptionalGenericData(); data.myData = Optional.of("simpleString"); @@ -145,6 +158,7 @@ public void testSerGeneric() throws Exception { assertEquals("{\"myData\":\"simpleString\"}", value); } + @Test public void testSerOptDefault() throws Exception { OptionalData data = new OptionalData(); data.myString = Optional.empty(); @@ -155,6 +169,7 @@ public void testSerOptDefault() throws Exception { assertEquals("{\"myString\":null}", value); } + @Test public void testSerOptNull() throws Exception { OptionalData data = new OptionalData(); data.myString = null; @@ -164,6 +179,7 @@ public void testSerOptNull() throws Exception { assertEquals("{}", value); } + @Test public void testSerOptNonEmpty() throws Exception { OptionalData data = new OptionalData(); data.myString = null; @@ -174,6 +190,7 @@ public void testSerOptNonEmpty() throws Exception { assertEquals("{}", value); } + @Test public void testWithTypingEnabled() throws Exception { final ObjectMapper mapper = jsonMapperBuilder() // ENABLE TYPING @@ -190,6 +207,7 @@ public void testWithTypingEnabled() throws Exception { assertEquals(myData.myString, deserializedMyData.myString); } + @Test public void testObjectId() throws Exception { final Unit input = new Unit(); input.link(input); @@ -202,6 +220,7 @@ public void testObjectId() throws Exception { assertSame(result, base); } + @Test public void testOptionalCollection() throws Exception { TypeReference>> typeReference = new TypeReference>>() { @@ -222,6 +241,7 @@ public void testOptionalCollection() throws Exception { } } + @Test public void testPolymorphic() throws Exception { final Container dto = new Container(); diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalBooleanTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalBooleanTest.java index 75e551c217..602efc2ebd 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalBooleanTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalBooleanTest.java @@ -2,6 +2,8 @@ import java.util.Optional; +import org.junit.jupiter.api.Test; + import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; @@ -22,6 +24,7 @@ public BooleanBean(Boolean b) { private final ObjectMapper MAPPER = newJsonMapper(); // for [datatype-jdk8#23] + @Test public void testBoolean() throws Exception { // First, serialization diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalMapsTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalMapsTest.java index 6905c2954f..0a87528b5d 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalMapsTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalMapsTest.java @@ -4,6 +4,8 @@ import java.util.Map; import java.util.Optional; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonInclude; import tools.jackson.databind.ObjectMapper; @@ -29,6 +31,7 @@ public OptMapBean(String key, Optional v) { /********************************************************************** */ + @Test public void testMapElementInclusion() throws Exception { ObjectMapper mapper = jsonMapperBuilder().changeDefaultPropertyInclusion( diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalMergeTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalMergeTest.java index 15695d5bed..e4fe0e2531 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalMergeTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalMergeTest.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Optional; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonMerge; import tools.jackson.databind.ObjectMapper; @@ -23,6 +25,7 @@ static class OptionalListWrapper { private final ObjectMapper MAPPER = newJsonMapper(); // [modules-java8#214]: ReferenceType of List, merge + @Test public void testMergeToListViaRef() throws Exception { OptionalListWrapper base = MAPPER.readValue(a2q("{'list':['a']}"), diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalNumbersTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalNumbersTest.java index 52faee4fce..739d77df53 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalNumbersTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalNumbersTest.java @@ -4,13 +4,14 @@ import java.util.OptionalInt; import java.util.OptionalLong; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonInclude; import tools.jackson.databind.*; import tools.jackson.databind.exc.MismatchedInputException; import tools.jackson.databind.testutil.DatabindTestUtil; -import static org.junit.Assert.assertThrows; import static org.junit.jupiter.api.Assertions.*; public class OptionalNumbersTest @@ -54,12 +55,14 @@ static class OptionalDoubleBean { /********************************************************** */ + @Test public void testOptionalIntAbsent() throws Exception { String json = MAPPER.writeValueAsString(OptionalInt.empty()); assertFalse(MAPPER.readValue(json, OptionalInt.class).isPresent()); } + @Test public void testOptionalIntInArrayAbsent() throws Exception { OptionalInt[] ints = MAPPER.readValue("[null]", OptionalInt[].class); @@ -68,11 +71,13 @@ public void testOptionalIntInArrayAbsent() throws Exception assertFalse(ints[0].isPresent()); } + @Test public void testOptionalIntPresent() throws Exception { assertEquals(5, MAPPER.readValue(MAPPER.writeValueAsBytes(OptionalInt.of(5)), OptionalInt.class).getAsInt()); } + @Test public void testOptionalIntCoerceFromString() throws Exception { OptionalInt opt = MAPPER.readValue(q("123"), OptionalInt.class); @@ -97,11 +102,13 @@ public void testOptionalIntCoerceFromString() throws Exception /********************************************************** */ + @Test public void testOptionalLongAbsent() throws Exception { assertFalse(MAPPER.readValue(MAPPER.writeValueAsBytes(OptionalLong.empty()), OptionalLong.class).isPresent()); } + @Test public void testOptionalLongInArrayAbsent() throws Exception { OptionalLong[] arr = MAPPER.readValue("[null]", OptionalLong[].class); @@ -110,11 +117,13 @@ public void testOptionalLongInArrayAbsent() throws Exception assertFalse(arr[0].isPresent()); } + @Test public void testOptionalLongPresent() throws Exception { assertEquals(Long.MAX_VALUE, MAPPER.readValue(MAPPER.writeValueAsBytes(OptionalLong.of(Long.MAX_VALUE)), OptionalLong.class).getAsLong()); } + @Test public void testOptionalLongCoerceFromString() throws Exception { OptionalLong opt = MAPPER.readValue(q("123"), OptionalLong.class); @@ -135,6 +144,7 @@ public void testOptionalLongCoerceFromString() throws Exception assertEquals(19L, bean.value.getAsLong()); } + @Test public void testOptionalLongSerializeFilter() throws Exception { ObjectMapper mapper = jsonMapperBuilder() @@ -162,11 +172,13 @@ public void testOptionalLongSerializeFilter() throws Exception /********************************************************** */ + @Test public void testOptionalDoubleAbsent() throws Exception { assertFalse(MAPPER.readValue(MAPPER.writeValueAsBytes(OptionalInt.empty()), OptionalInt.class).isPresent()); } + @Test public void testOptionalDoubleInArrayAbsent() throws Exception { OptionalDouble[] arr = MAPPER.readValue("[null]", OptionalDouble[].class); @@ -175,11 +187,13 @@ public void testOptionalDoubleInArrayAbsent() throws Exception assertFalse(arr[0].isPresent()); } + @Test public void testOptionalDoublePresent() throws Exception { assertEquals(Double.MIN_VALUE, MAPPER.readValue(MAPPER.writeValueAsBytes(OptionalDouble.of(Double.MIN_VALUE)), OptionalDouble.class).getAsDouble()); } + @Test public void testOptionalDoubleCoerceFromString() throws Exception { OptionalDouble opt = MAPPER.readValue(q("0.25"), OptionalDouble.class); @@ -200,6 +214,7 @@ public void testOptionalDoubleCoerceFromString() throws Exception assertEquals(0.5, bean.value.getAsDouble()); } + @Test public void testOptionalDoubleInArraySpecialValues() throws Exception { OptionalDouble[] actual = MAPPER.readValue( @@ -216,6 +231,7 @@ public void testOptionalDoubleInArraySpecialValues() throws Exception assertArrayEquals(expected, actual); } + @Test public void testOptionalDoubleInArraySpecialValuesWithoutCoercion() throws Exception { OptionalDouble[] actual = MAPPER_WITHOUT_COERCION.readValue( @@ -231,12 +247,14 @@ public void testOptionalDoubleInArraySpecialValuesWithoutCoercion() throws Excep assertArrayEquals(expected, actual); } + @Test public void testQuotedOptionalDoubleWithoutCoercion() { assertThrows(MismatchedInputException.class, () -> MAPPER_WITHOUT_COERCION.readValue(a2q("['1']"), OptionalDouble[].class)); } + @Test public void testOptionalDoubleBeanSpecialValuesWithoutCoercion_null() throws Exception { OptionalDoubleBean bean = MAPPER_WITHOUT_COERCION.readValue( @@ -244,6 +262,7 @@ public void testOptionalDoubleBeanSpecialValuesWithoutCoercion_null() throws Exc assertEquals(OptionalDouble.empty(), bean.value); } + @Test public void testOptionalDoubleBeanSpecialValuesWithoutCoercion_nan() throws Exception { OptionalDoubleBean bean = MAPPER_WITHOUT_COERCION.readValue( @@ -251,6 +270,7 @@ public void testOptionalDoubleBeanSpecialValuesWithoutCoercion_nan() throws Exce assertEquals(OptionalDouble.of(Double.NaN), bean.value); } + @Test public void testOptionalDoubleBeanSpecialValuesWithoutCoercion_positiveInfinity() throws Exception { OptionalDoubleBean bean = MAPPER_WITHOUT_COERCION.readValue( @@ -258,6 +278,7 @@ public void testOptionalDoubleBeanSpecialValuesWithoutCoercion_positiveInfinity( assertEquals(OptionalDouble.of(Double.POSITIVE_INFINITY), bean.value); } + @Test public void testOptionalDoubleBeanSpecialValuesWithoutCoercion_negativeInfinity() throws Exception { OptionalDoubleBean bean = MAPPER_WITHOUT_COERCION.readValue( diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalTest.java index e4ed9e0f60..f0875f0961 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalTest.java @@ -4,6 +4,8 @@ import java.util.*; import java.util.concurrent.atomic.AtomicReference; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.*; import tools.jackson.core.JsonGenerator; @@ -117,35 +119,40 @@ public String deserialize(JsonParser p, DeserializationContext ctxt) } } - private ObjectMapper MAPPER = newJsonMapper(); - /* /********************************************************** /* Test methods /********************************************************** */ + private final ObjectMapper MAPPER = newJsonMapper(); + + @Test public void testStringAbsent() throws Exception { assertFalse(roundtrip(Optional.empty(), OPTIONAL_STRING_TYPE).isPresent()); } + @Test public void testStringPresent() throws Exception { assertEquals("test", roundtrip(Optional.of("test"), OPTIONAL_STRING_TYPE).get()); } + @Test public void testBeanAbsent() throws Exception { assertFalse(roundtrip(Optional.empty(), OPTIONAL_BEAN_TYPE).isPresent()); } + @Test public void testBeanPresent() throws Exception { final TestBean bean = new TestBean(Integer.MAX_VALUE, "woopwoopwoopwoopwoop"); assertEquals(bean, roundtrip(Optional.of(bean), OPTIONAL_BEAN_TYPE).get()); } + @Test public void testBeanWithCreator() throws Exception { final Issue4Entity emptyEntity = new Issue4Entity(Optional.empty()); @@ -157,6 +164,7 @@ public void testBeanWithCreator() throws Exception } } + @Test public void testOptionalStringInBean() throws Exception { OptionalStringBean bean = MAPPER.readValue("{\"value\":\"xyz\"}", OptionalStringBean.class); @@ -165,6 +173,7 @@ public void testOptionalStringInBean() throws Exception } // To support [datatype-jdk8#8] + @Test public void testExcludeIfOptionalAbsent() throws Exception { ObjectMapper mapper = jsonMapperBuilder() @@ -186,6 +195,7 @@ public void testExcludeIfOptionalAbsent() throws Exception mapper.writeValueAsString(new OptionalStringBean(null))); } + @Test public void testWithCustomDeserializer() throws Exception { CaseChangingStringWrapper w = MAPPER.readValue(a2q("{'value':'FoobaR'}"), @@ -194,6 +204,7 @@ public void testWithCustomDeserializer() throws Exception } // [modules-java8#36] + @Test public void testWithCustomDeserializerIfOptionalAbsent() throws Exception { // 10-Aug-2017, tatu: Actually this is not true: missing value does not trigger @@ -207,6 +218,7 @@ public void testWithCustomDeserializerIfOptionalAbsent() throws Exception CaseChangingStringWrapper.class).value); } + @Test public void testCustomSerializer() throws Exception { final String VALUE = "fooBAR"; @@ -214,6 +226,7 @@ public void testCustomSerializer() throws Exception assertEquals(json, a2q("{'value':'FOOBAR'}")); } + @Test public void testCustomSerializerIfOptionalAbsent() throws Exception { ObjectMapper mapper = jsonMapperBuilder() @@ -236,6 +249,7 @@ public void testCustomSerializerIfOptionalAbsent() throws Exception } // [modules-java8#33]: Verify against regression... + @Test public void testOtherRefSerializers() throws Exception { String json = MAPPER.writeValueAsString(new AtomicReference("foo")); diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalUnwrappedTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalUnwrappedTest.java index 407dace573..fdcd8e2db5 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalUnwrappedTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalUnwrappedTest.java @@ -3,6 +3,8 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonUnwrapped; import tools.jackson.core.json.JsonFactory; @@ -52,30 +54,30 @@ static class Bean2 { public String name; } + private final ObjectMapper MAPPER = newJsonMapper(); + + @Test public void testUntypedWithOptionalsNotNulls() throws Exception { - final ObjectMapper mapper = newJsonMapper(); String jsonExp = a2q("{'XX.name':'Bob'}"); - String jsonAct = mapper.writeValueAsString(new OptionalParent()); + String jsonAct = MAPPER.writeValueAsString(new OptionalParent()); assertEquals(jsonExp, jsonAct); } // for [datatype-jdk8#20] - public void testShouldSerializeUnwrappedOptional() throws Exception { - final ObjectMapper mapper = newJsonMapper(); - - assertEquals("{\"id\":\"foo\"}", - mapper.writeValueAsString(new Bean("foo", Optional.empty()))); - } - - // for [datatype-jdk8#26] - public void testPropogatePrefixToSchema() throws Exception { - final ObjectMapper mapper = newJsonMapper(); + @Test + public void testShouldSerializeUnwrappedOptional() throws Exception { + assertEquals("{\"id\":\"foo\"}", + MAPPER.writeValueAsString(new Bean("foo", Optional.empty()))); + } + // for [datatype-jdk8#26] + @Test + public void testPropogatePrefixToSchema() throws Exception { final AtomicReference propertyName = new AtomicReference<>(); - mapper.acceptJsonFormatVisitor(OptionalParent.class, new JsonFormatVisitorWrapper.Base( + MAPPER.acceptJsonFormatVisitor(OptionalParent.class, new JsonFormatVisitorWrapper.Base( new SerializationContextExt.Impl(new JsonFactory(), - mapper.serializationConfig(), null, + MAPPER.serializationConfig(), null, BeanSerializerFactory.instance, new SerializerCache())) { @Override public JsonObjectFormatVisitor expectObjectFormat(JavaType type) { diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalWithEmptyTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalWithEmptyTest.java index 2313963e97..f51b92f72a 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalWithEmptyTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalWithEmptyTest.java @@ -2,6 +2,8 @@ import java.util.Optional; +import org.junit.jupiter.api.Test; + import tools.jackson.core.type.TypeReference; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; @@ -22,12 +24,14 @@ public BooleanBean(Boolean b) { } } + @Test public void testOptionalFromEmpty() throws Exception { Optional value = MAPPER.readValue(q(""), new TypeReference>() {}); assertEquals(false, value.isPresent()); } // for [datatype-jdk8#23] + @Test public void testBooleanWithEmpty() throws Exception { // and looks like a special, somewhat non-conforming case is what a user had diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalnclusionTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalnclusionTest.java index cebd0e519d..0ae355ba73 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/OptionalnclusionTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/OptionalnclusionTest.java @@ -2,6 +2,8 @@ import java.util.Optional; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonInclude; @@ -48,6 +50,7 @@ public static OptionalGenericData construct(T data) { private final ObjectMapper MAPPER = newJsonMapper(); + @Test public void testSerOptNonEmpty() throws Exception { OptionalData data = new OptionalData(); @@ -59,6 +62,7 @@ public void testSerOptNonEmpty() throws Exception assertEquals("{}", value); } + @Test public void testSerOptNonDefault() throws Exception { OptionalData data = new OptionalData(); @@ -70,6 +74,7 @@ public void testSerOptNonDefault() throws Exception assertEquals("{}", value); } + @Test public void testSerOptNonAbsent() throws Exception { OptionalData data = new OptionalData(); @@ -81,6 +86,7 @@ public void testSerOptNonAbsent() throws Exception assertEquals("{}", value); } + @Test public void testExcludeEmptyStringViaOptional() throws Exception { String json = MAPPER.writeValueAsString(new OptionalNonEmptyStringBean("x")); @@ -91,6 +97,7 @@ public void testExcludeEmptyStringViaOptional() throws Exception assertEquals("{}", json); } + @Test public void testSerPropInclusionAlways() throws Exception { ObjectMapper mapper = jsonMapperBuilder() @@ -101,6 +108,7 @@ public void testSerPropInclusionAlways() throws Exception mapper.writeValueAsString(OptionalGenericData.construct(Boolean.TRUE))); } + @Test public void testSerPropInclusionNonNull() throws Exception { ObjectMapper mapper = jsonMapperBuilder().changeDefaultPropertyInclusion( @@ -110,6 +118,7 @@ public void testSerPropInclusionNonNull() throws Exception mapper.writeValueAsString(OptionalGenericData.construct(Boolean.TRUE))); } + @Test public void testSerPropInclusionNonAbsent() throws Exception { ObjectMapper mapper = jsonMapperBuilder() @@ -120,6 +129,7 @@ public void testSerPropInclusionNonAbsent() throws Exception mapper.writeValueAsString(OptionalGenericData.construct(Boolean.TRUE))); } + @Test public void testSerPropInclusionNonEmpty() throws Exception { ObjectMapper mapper = jsonMapperBuilder() diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/PolymoprhicOptionalTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/PolymorphicOptionalTest.java similarity index 94% rename from src/test/java/tools/jackson/databind/ext/jdk8/PolymoprhicOptionalTest.java rename to src/test/java/tools/jackson/databind/ext/jdk8/PolymorphicOptionalTest.java index 0ad6e5f5ef..3c263bd234 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/PolymoprhicOptionalTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/PolymorphicOptionalTest.java @@ -2,6 +2,8 @@ import java.util.Optional; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.annotation.JsonTypeInfo.As; @@ -10,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.*; -public class PolymoprhicOptionalTest +public class PolymorphicOptionalTest extends DatabindTestUtil { // For [datatype-jdk8#14] @@ -29,6 +31,7 @@ public static class ContainedImpl implements Contained { } private final ObjectMapper MAPPER = newJsonMapper(); // [datatype-jdk8#14] + @Test public void testPolymorphic14() throws Exception { final Container dto = new Container(); diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/SchemaVisitorTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/SchemaVisitorTest.java index 3b4337eed6..d6b1a71f23 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/SchemaVisitorTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/SchemaVisitorTest.java @@ -3,6 +3,8 @@ import java.util.*; import java.util.concurrent.atomic.AtomicReference; +import org.junit.jupiter.api.Test; + import tools.jackson.core.JsonParser; import tools.jackson.core.JsonParser.NumberType; import tools.jackson.databind.*; @@ -37,6 +39,7 @@ public void numberType(NumberType t) { } // for [datatype-jdk8#25] + @Test public void testOptionalLong() throws Exception { final AtomicReference result = new AtomicReference<>(); @@ -56,6 +59,7 @@ public void numberType(NumberType t) { } // for [datatype-jdk8#25] + @Test public void testOptionalDouble() throws Exception { final AtomicReference result = new AtomicReference<>(); diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/StreamSerializerTest.java b/src/test/java/tools/jackson/databind/ext/jdk8/StreamSerializerTest.java index d41a6d06eb..eb5c39b815 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/StreamSerializerTest.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/StreamSerializerTest.java @@ -12,7 +12,8 @@ import tools.jackson.core.type.TypeReference; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class StreamSerializerTest extends StreamTestBase { diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/StreamTestBase.java b/src/test/java/tools/jackson/databind/ext/jdk8/StreamTestBase.java index d2e4c9bb97..b5e2c8457a 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/StreamTestBase.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/StreamTestBase.java @@ -14,7 +14,7 @@ import tools.jackson.databind.DatabindException; import tools.jackson.databind.ObjectMapper; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public abstract class StreamTestBase // 19-Sep-2017, tatu: For some reason doing this will break `ExpectedException` rule. diff --git a/src/test/java/tools/jackson/databind/ext/jdk8/TestOptionalWithPolymorphic.java b/src/test/java/tools/jackson/databind/ext/jdk8/TestOptionalWithPolymorphic.java index 15340fd5bb..c6c742a3b7 100644 --- a/src/test/java/tools/jackson/databind/ext/jdk8/TestOptionalWithPolymorphic.java +++ b/src/test/java/tools/jackson/databind/ext/jdk8/TestOptionalWithPolymorphic.java @@ -4,6 +4,8 @@ import java.util.Map; import java.util.Optional; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.*; import tools.jackson.databind.*; @@ -69,8 +71,9 @@ static class AbstractOptional { /********************************************************** */ - final ObjectMapper MAPPER = newJsonMapper(); + private final ObjectMapper MAPPER = newJsonMapper(); + @Test public void testOptionalMapsFoo() throws Exception { Map foo = new LinkedHashMap<>(); @@ -84,6 +87,7 @@ public void testOptionalMapsFoo() throws Exception { _test(MAPPER, foo); } + @Test public void testOptionalMapsBar() throws Exception { Map bar = new LinkedHashMap<>(); @@ -97,6 +101,7 @@ public void testOptionalMapsBar() throws Exception { _test(MAPPER, bar); } + @Test public void testOptionalMapsBaz() throws Exception { Map baz = new LinkedHashMap<>(); Map loop = new LinkedHashMap<>(); @@ -109,6 +114,7 @@ public void testOptionalMapsBaz() throws Exception { _test(MAPPER, baz); } + @Test public void testOptionalWithTypeAnnotation13() throws Exception { AbstractOptional result = MAPPER.readValue("{\"value\" : 5}", diff --git a/src/test/java/tools/jackson/databind/seq/PolyMapWriter827Test.java b/src/test/java/tools/jackson/databind/seq/PolyMapWriter827Test.java index 3f0dc3db21..c4f45e6406 100644 --- a/src/test/java/tools/jackson/databind/seq/PolyMapWriter827Test.java +++ b/src/test/java/tools/jackson/databind/seq/PolyMapWriter827Test.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; -import org.junit.Assert; +import org.junit.jupiter.api.Test; import tools.jackson.core.JsonGenerator; import tools.jackson.core.type.TypeReference; @@ -13,6 +13,8 @@ import tools.jackson.databind.testutil.DatabindTestUtil; import tools.jackson.databind.testutil.NoCheckSubTypeValidator; +import static org.junit.jupiter.api.Assertions.assertEquals; + // for [databind#827] public class PolyMapWriter827Test extends DatabindTestUtil { @@ -32,6 +34,7 @@ public void serialize(CustomKey key, JsonGenerator g, SerializationContext ctxt) } } + @Test public void testPolyCustomKeySerializer() throws Exception { ObjectMapper mapper = jsonMapperBuilder() @@ -48,6 +51,6 @@ public void testPolyCustomKeySerializer() throws Exception final ObjectWriter writer = mapper.writerFor(new TypeReference>() { }); String json = writer.writeValueAsString(map); - Assert.assertEquals("[\"java.util.HashMap\",{\"foo,1\":\"bar\"}]", json); + assertEquals("[\"java.util.HashMap\",{\"foo,1\":\"bar\"}]", json); } } diff --git a/src/test/java/tools/jackson/databind/util/UnlimitedLookupCacheTest.java b/src/test/java/tools/jackson/databind/util/UnlimitedLookupCacheTest.java index 3f5a974b3b..9b2f150e29 100644 --- a/src/test/java/tools/jackson/databind/util/UnlimitedLookupCacheTest.java +++ b/src/test/java/tools/jackson/databind/util/UnlimitedLookupCacheTest.java @@ -7,9 +7,9 @@ import tools.jackson.databind.testutil.UnlimitedLookupCache; import tools.jackson.databind.type.TypeFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class UnlimitedLookupCacheTest extends DatabindTestUtil