From f85dac0fa471a0130bc3aabcf204086cafaad982 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 29 Jan 2025 17:23:01 -0800 Subject: [PATCH] Fix last erroneously failing tests wrt #3406 --- .../jackson/databind/jsontype/ext/ExternalTypeIdTest.java | 2 +- .../jsontype/ext/ExternalTypeIdWithCreatorTest.java | 4 ++-- ...pertyCreatorSubtypesExternalPropertyMissingProperty.java | 6 +++--- .../ext/TestSubtypesExternalPropertyMissingProperty.java | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdTest.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdTest.java index 2aa842fd11..5a2161f30d 100644 --- a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdTest.java @@ -611,7 +611,7 @@ public Orange(@JsonProperty("name") String name, @JsonProperty("name") String co public void testIssue3008() throws Exception { ObjectReader r = MAPPER.readerFor(Box3008.class); - Box3008 deserOrangeBox = r.readValue("{\"type\":null,\"fruit\":null}}"); + Box3008 deserOrangeBox = r.readValue("{\"type\":null,\"fruit\":null}"); assertNull(deserOrangeBox.fruit); assertNull(deserOrangeBox.type); // error: "expected null, but was:" } diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdWithCreatorTest.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdWithCreatorTest.java index 05aaa15ec0..f2e7667365 100644 --- a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdWithCreatorTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdWithCreatorTest.java @@ -112,7 +112,7 @@ public void testExternalTypeId() throws Exception // [databind#1198] @Test public void testFails() throws Exception { - String json = "{ \"name\": \"foo\", \"attack\":\"right\" } }"; + String json = "{ \"name\": \"foo\", \"attack\":\"right\" } "; Character character = MAPPER.readValue(json, Character.class); @@ -124,7 +124,7 @@ public void testFails() throws Exception { // [databind#1198] @Test public void testWorks() throws Exception { - String json = "{ \"name\": \"foo\", \"preferredAttack\": \"KICK\", \"attack\":\"right\" } }"; + String json = "{ \"name\": \"foo\", \"preferredAttack\": \"KICK\", \"attack\":\"right\" }"; Character character = MAPPER.readValue(json, Character.class); diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestPropertyCreatorSubtypesExternalPropertyMissingProperty.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestPropertyCreatorSubtypesExternalPropertyMissingProperty.java index ff7a46e8fb..69bbd6a38e 100644 --- a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestPropertyCreatorSubtypesExternalPropertyMissingProperty.java +++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestPropertyCreatorSubtypesExternalPropertyMissingProperty.java @@ -104,9 +104,9 @@ public static Orange getOrange(@JsonProperty("name") String name, @JsonProperty( private static final Orange orange = new Orange("Orange", "orange"); private static final Box orangeBox = new Box("orange", orange); private static final String orangeBoxJson = "{\"type\":\"orange\",\"fruit\":{\"name\":\"Orange\",\"color\":\"orange\"}}"; - private static final String orangeBoxNullJson = "{\"type\":\"orange\",\"fruit\":null}}"; - private static final String orangeBoxEmptyJson = "{\"type\":\"orange\",\"fruit\":{}}}"; - private static final String orangeBoxMissingJson = "{\"type\":\"orange\"}}"; + private static final String orangeBoxNullJson = "{\"type\":\"orange\",\"fruit\":null}"; + private static final String orangeBoxEmptyJson = "{\"type\":\"orange\",\"fruit\":{}}"; + private static final String orangeBoxMissingJson = "{\"type\":\"orange\"}"; private static final Apple apple = new Apple("Apple", 16); private static Box appleBox = new Box("apple", apple); diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestSubtypesExternalPropertyMissingProperty.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestSubtypesExternalPropertyMissingProperty.java index e66352a5cc..e08ad6d171 100644 --- a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestSubtypesExternalPropertyMissingProperty.java +++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestSubtypesExternalPropertyMissingProperty.java @@ -101,9 +101,9 @@ public Orange(String name, String c) { private static final Orange orange = new Orange("Orange", "orange"); private static final Box orangeBox = new Box("orange", orange); private static final String orangeBoxJson = "{\"type\":\"orange\",\"fruit\":{\"name\":\"Orange\",\"color\":\"orange\"}}"; - private static final String orangeBoxNullJson = "{\"type\":\"orange\",\"fruit\":null}}"; - private static final String orangeBoxEmptyJson = "{\"type\":\"orange\",\"fruit\":{}}}"; - private static final String orangeBoxMissingJson = "{\"type\":\"orange\"}}"; + private static final String orangeBoxNullJson = "{\"type\":\"orange\",\"fruit\":null}"; + private static final String orangeBoxEmptyJson = "{\"type\":\"orange\",\"fruit\":{}}"; + private static final String orangeBoxMissingJson = "{\"type\":\"orange\"}"; private static final Apple apple = new Apple("Apple", 16); private static final Box appleBox = new Box("apple", apple);