From cad94290cc5d0d8a4a6a004218bd13cd61b299d3 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 23 Oct 2024 21:07:45 -0700 Subject: [PATCH] Another cherry pick from #4759 --- .../jdk/BigDecimalForFloatDisabled3133Test.java | 7 ++++--- .../databind/objectid/ObjectIdSubTypes4610Test.java | 8 ++++---- .../tofix/CustomObjectKeyDeserializer4680Test.java | 13 +++++++------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/jdk/BigDecimalForFloatDisabled3133Test.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/jdk/BigDecimalForFloatDisabled3133Test.java index 59f0d12ce5..415969382b 100644 --- a/src/test/java/com/fasterxml/jackson/databind/jsontype/jdk/BigDecimalForFloatDisabled3133Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/jdk/BigDecimalForFloatDisabled3133Test.java @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -12,6 +11,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Unit test proving that below issue is fixed. *

@@ -55,11 +56,11 @@ public void testDeserializeWithDifferentOrdering3133() throws Exception // case 1 : type first String ordering1 = a2q("{'type': 'MAP','map': { 'doubleValue': 0.1 }}"); TestMapContainer3133 model1 = mapper.readValue(ordering1, TestMapContainer3133.class); - Assertions.assertTrue(model1.getMap().get("doubleValue") instanceof Double); + assertTrue(model1.getMap().get("doubleValue") instanceof Double); // case 2 : value first String ordering2 = a2q("{'map': { 'doubleValue': 0.1 }, 'type': 'MAP'}"); TestMapContainer3133 model2 = mapper.readValue(ordering2, TestMapContainer3133.class); - Assertions.assertTrue(model2.getMap().get("doubleValue") instanceof Double); + assertTrue(model2.getMap().get("doubleValue") instanceof Double); } } diff --git a/src/test/java/com/fasterxml/jackson/databind/objectid/ObjectIdSubTypes4610Test.java b/src/test/java/com/fasterxml/jackson/databind/objectid/ObjectIdSubTypes4610Test.java index 7fa3c87260..2897a1b59f 100644 --- a/src/test/java/com/fasterxml/jackson/databind/objectid/ObjectIdSubTypes4610Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/objectid/ObjectIdSubTypes4610Test.java @@ -2,7 +2,6 @@ import java.util.List; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.*; @@ -11,8 +10,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import static org.junit.Assert.fail; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.fail; public class ObjectIdSubTypes4610Test extends DatabindTestUtil { @@ -43,7 +43,7 @@ public void shouldHandleTypeDefinitionJson() throws Exception { .without(DeserializationFeature.FAIL_ON_UNRESOLVED_OBJECT_IDS) .readValue(input); - Assertions.assertInstanceOf(NumberTypeDefinition.class, model); + assertInstanceOf(NumberTypeDefinition.class, model); } @Test @@ -56,7 +56,7 @@ public void testRoundTrip() throws Exception { TypeDefinition model = MAPPER.readerFor(TypeDefinition.class) .with(DeserializationFeature.FAIL_ON_UNRESOLVED_OBJECT_IDS) .readValue(JSON); - Assertions.assertInstanceOf(NumberTypeDefinition.class, model); + assertInstanceOf(NumberTypeDefinition.class, model); } @Test diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java index 720212ce91..48045108d5 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java @@ -2,6 +2,8 @@ import java.util.Map; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.KeyDeserializer; @@ -10,8 +12,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; // [databind#4680] Custom key deserialiser registered for `Object.class` is ignored on nested JSON public class CustomObjectKeyDeserializer4680Test @@ -58,15 +59,15 @@ public Object deserializeKey(String key, DeserializationContext ctxt) { // THEN // depth 1 works as expected - Assertions.assertEquals("Erik", result.get("name_")); + assertEquals("Erik", result.get("name_")); // before fix, depth 2 does NOT work as expected Map addressMap = (Map) result.get("address_"); // before fix, null?? Fails here - Assertions.assertEquals("Elvirastr", addressMap.get("street_")); + assertEquals("Elvirastr", addressMap.get("street_")); Map cityMap = (Map) addressMap.get("city_"); - Assertions.assertEquals(1, cityMap.get("id_")); - Assertions.assertEquals("Berlin", cityMap.get("name_")); + assertEquals(1, cityMap.get("id_")); + assertEquals("Berlin", cityMap.get("name_")); } } \ No newline at end of file