From 10837becd57f822f4d81567696db65c37ca91dd2 Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Fri, 13 Sep 2024 08:12:46 +0900 Subject: [PATCH 1/7] Implement --- .../deser}/JsonSetter2572Test.java | 8 ++-- .../failing/JacksonTestFailureExpected.java | 13 ++++++ ...JacksonTestFailureExpectedInterceptor.java | 46 +++++++++++++++++++ .../JacksonTestShouldFailException.java | 16 +++++++ 4 files changed, 80 insertions(+), 3 deletions(-) rename src/test/java/com/fasterxml/jackson/{failing => databind/deser}/JsonSetter2572Test.java (91%) create mode 100644 src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpected.java create mode 100644 src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpectedInterceptor.java create mode 100644 src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonSetter2572Test.java b/src/test/java/com/fasterxml/jackson/databind/deser/JsonSetter2572Test.java similarity index 91% rename from src/test/java/com/fasterxml/jackson/failing/JsonSetter2572Test.java rename to src/test/java/com/fasterxml/jackson/databind/deser/JsonSetter2572Test.java index a7a3b07bde..8075a77f00 100644 --- a/src/test/java/com/fasterxml/jackson/failing/JsonSetter2572Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/deser/JsonSetter2572Test.java @@ -1,7 +1,8 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.deser; import java.util.Objects; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.*; @@ -14,6 +15,7 @@ // different from 2.10 in that no exception thrown and databind quietly just // left `null` for Beans as `null` even if "EMPTY" was indicated by configuration. class JsonSetter2572Test extends DatabindTestUtil { + static class Outer { @JsonProperty("inner") final Inner inner; @@ -34,6 +36,7 @@ public Inner(@JsonProperty("field") String field) { } } + @JacksonTestFailureExpected @Test void setterWithEmpty() throws Exception { /* @@ -48,7 +51,6 @@ void setterWithEmpty() throws Exception { Outer result = mapper.readValue(json, Outer.class); assertNotNull(result); assertNotNull(result.inner); // converted to "empty" bean - -//System.err.println("Final -> "+mapper.writeValueAsString(result)); } + } diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpected.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpected.java new file mode 100644 index 0000000000..27cc0475cd --- /dev/null +++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpected.java @@ -0,0 +1,13 @@ +package com.fasterxml.jackson.databind.testutil.failing; + +import org.junit.jupiter.api.extension.ExtendWith; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +@ExtendWith(JacksonTestFailureExpectedInterceptor.class) +public @interface JacksonTestFailureExpected { } diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpectedInterceptor.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpectedInterceptor.java new file mode 100644 index 0000000000..78e6f45e08 --- /dev/null +++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpectedInterceptor.java @@ -0,0 +1,46 @@ +package com.fasterxml.jackson.databind.testutil.failing; + +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.InvocationInterceptor; +import org.junit.jupiter.api.extension.ReflectiveInvocationContext; + +import java.lang.reflect.Method; +import java.util.List; + +/** + * Custom {@link InvocationInterceptor} that intercepts test method invocation. + * To pass the test ***only if*** test fails with an exception, and fail the test otherwise. + * + * @since 2.19 + */ +public class JacksonTestFailureExpectedInterceptor + implements InvocationInterceptor +{ + + @Override + public void interceptTestMethod(Invocation invocation, + ReflectiveInvocationContext invocationContext, ExtensionContext extensionContext) + throws Throwable { + try { + invocation.proceed(); + } catch (Throwable t) { + // do-nothing, we do expect an exception + return; + } + handleUnexpectePassingTest(invocationContext); + } + + private void handleUnexpectePassingTest(ReflectiveInvocationContext invocationContext) { + // Collect information we need + Object targetClass = invocationContext.getTargetClass(); + Object testMethod = invocationContext.getExecutable().getName(); + List arguments = invocationContext.getArguments(); + + // Create message + String message = String.format("Test method %s.%s() passed, but should have failed", targetClass, testMethod); + + // throw exception + throw new JacksonTestShouldFailException(message); + } + +} diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java new file mode 100644 index 0000000000..8d193c8607 --- /dev/null +++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java @@ -0,0 +1,16 @@ +package com.fasterxml.jackson.databind.testutil.failing; + +/** + * Exception used to alert that a test is passing, but should be failing. + * + * WARNING : This only for test code, and should never be thrown from production code. + * + * @since 2.19 + */ +public class JacksonTestShouldFailException + extends RuntimeException +{ + public JacksonTestShouldFailException(String msg) { + super(msg); + } +} \ No newline at end of file From cb6001b68a36b9782d267be10d6e11e0b7f24ff7 Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Fri, 13 Sep 2024 08:14:24 +0900 Subject: [PATCH 2/7] Update JacksonTestShouldFailException.java --- .../testutil/failing/JacksonTestShouldFailException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java index 8d193c8607..aaa46673d2 100644 --- a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java +++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java @@ -13,4 +13,4 @@ public class JacksonTestShouldFailException public JacksonTestShouldFailException(String msg) { super(msg); } -} \ No newline at end of file +} From 8d4084dc72fb285b26b6a84057c35326056037d4 Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Sat, 14 Sep 2024 21:32:32 +0900 Subject: [PATCH 3/7] Move all failing tests --- .../{failing => databind/tofix}/AnyGetterSorting518Test.java | 2 +- .../tofix}/AnySetterAsCreatorFallback1401Test.java | 2 +- .../tofix}/AsEmptyPOJONoDefaultCtor2572Test.java | 2 +- .../{failing => databind/tofix}/BackReference1516Test.java | 2 +- .../tofix}/BigDecimalParsing4694Test.java | 2 +- .../tofix}/BuilderWithBackRef2686Test.java | 2 +- .../{failing => databind/tofix}/CreatorFallback2438Test.java | 2 +- .../tofix}/CustomObjectKeyDeserializer4680Test.java | 2 +- .../tofix}/DefaultTypingOverride1391Test.java | 2 +- .../tofix}/ExternalTypeIdWithUnwrapped2039Test.java | 2 +- .../{failing => databind/tofix}/JacksonInject2465Test.java | 2 +- .../{failing => databind/tofix}/JacksonInject2678Test.java | 2 +- .../{failing => databind/tofix}/JacksonInject4218Test.java | 2 +- .../tofix}/JsonIdentityInfoAndBackReferences3964Test.java | 2 +- .../tofix}/JsonIgnoreProperties2803Test.java | 2 +- .../jackson/databind/{deser => tofix}/JsonSetter2572Test.java | 2 +- .../tofix}/JsonTypeIdConflict3681Test.java | 2 +- .../{failing => databind/tofix}/KevinFail1410Test.java | 2 +- .../{failing => databind/tofix}/MapEntryFormat1419Test.java | 2 +- .../{failing => databind/tofix}/MapInclusion1649Test.java | 2 +- .../{failing => databind/tofix}/MergeWithCreator1921Test.java | 2 +- .../{failing => databind/tofix}/NoTypeInfo1654Test.java | 2 +- .../tofix}/ObjectIdDeserializationFailTest.java | 4 ++-- .../tofix}/ObjectIdWithBuilder1496Test.java | 2 +- .../tofix}/ObjectIdWithInjectable639Test.java | 2 +- .../tofix}/ObjectIdWithInjectables639Test.java | 2 +- .../tofix}/ObjectIdWithUnwrapping1298Test.java | 2 +- .../tofix}/ParsingContextExtTypeId2747Test.java | 2 +- .../tofix}/PolymorphicArrays3194Test.java | 2 +- .../tofix}/RecursiveIgnoreProperties1755Test.java | 2 +- .../tofix}/RecursiveWildcard4118Test.java | 2 +- .../{failing => databind/tofix}/SetterlessList2692Test.java | 2 +- .../tofix}/SetterlessProperties501Test.java | 2 +- .../{failing => databind/tofix}/StaticTyping1515Test.java | 2 +- .../{failing => databind/tofix}/UnwrappedCaching2461Test.java | 2 +- .../tofix}/UnwrappedWithUnknown650Test.java | 2 +- 36 files changed, 37 insertions(+), 37 deletions(-) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/AnyGetterSorting518Test.java (96%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/AnySetterAsCreatorFallback1401Test.java (96%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/AsEmptyPOJONoDefaultCtor2572Test.java (96%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/BackReference1516Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/BigDecimalParsing4694Test.java (96%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/BuilderWithBackRef2686Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/CreatorFallback2438Test.java (96%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/CustomObjectKeyDeserializer4680Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/DefaultTypingOverride1391Test.java (96%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/ExternalTypeIdWithUnwrapped2039Test.java (97%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/JacksonInject2465Test.java (97%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/JacksonInject2678Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/JacksonInject4218Test.java (97%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/JsonIdentityInfoAndBackReferences3964Test.java (99%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/JsonIgnoreProperties2803Test.java (96%) rename src/test/java/com/fasterxml/jackson/databind/{deser => tofix}/JsonSetter2572Test.java (97%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/JsonTypeIdConflict3681Test.java (97%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/KevinFail1410Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/MapEntryFormat1419Test.java (96%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/MapInclusion1649Test.java (96%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/MergeWithCreator1921Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/NoTypeInfo1654Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/ObjectIdDeserializationFailTest.java (96%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/ObjectIdWithBuilder1496Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/ObjectIdWithInjectable639Test.java (97%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/ObjectIdWithInjectables639Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/ObjectIdWithUnwrapping1298Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/ParsingContextExtTypeId2747Test.java (97%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/PolymorphicArrays3194Test.java (97%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/RecursiveIgnoreProperties1755Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/RecursiveWildcard4118Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/SetterlessList2692Test.java (96%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/SetterlessProperties501Test.java (97%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/StaticTyping1515Test.java (98%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/UnwrappedCaching2461Test.java (97%) rename src/test/java/com/fasterxml/jackson/{failing => databind/tofix}/UnwrappedWithUnknown650Test.java (95%) diff --git a/src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java index 0cf9f53d1c..e77d315d2b 100644 --- a/src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java index a01eb0db33..228dcdffd8 100644 --- a/src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java index e11af3c60c..de354bf899 100644 --- a/src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.Objects; diff --git a/src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java index de2774f847..b9ef511d4e 100644 --- a/src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.beans.ConstructorProperties; diff --git a/src/test/java/com/fasterxml/jackson/failing/BigDecimalParsing4694Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BigDecimalParsing4694Test.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/BigDecimalParsing4694Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/BigDecimalParsing4694Test.java index 71183d0d0d..da2e5edae5 100644 --- a/src/test/java/com/fasterxml/jackson/failing/BigDecimalParsing4694Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BigDecimalParsing4694Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.math.BigDecimal; diff --git a/src/test/java/com/fasterxml/jackson/failing/BuilderWithBackRef2686Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/BuilderWithBackRef2686Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java index 08058a65a3..c82c13d446 100644 --- a/src/test/java/com/fasterxml/jackson/failing/BuilderWithBackRef2686Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.beans.ConstructorProperties; diff --git a/src/test/java/com/fasterxml/jackson/failing/CreatorFallback2438Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/CreatorFallback2438Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java index 6109e65c85..61a07f39af 100644 --- a/src/test/java/com/fasterxml/jackson/failing/CreatorFallback2438Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/CustomObjectKeyDeserializer4680Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/CustomObjectKeyDeserializer4680Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java index c05de238b7..072ab61f22 100644 --- a/src/test/java/com/fasterxml/jackson/failing/CustomObjectKeyDeserializer4680Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.Map; diff --git a/src/test/java/com/fasterxml/jackson/failing/DefaultTypingOverride1391Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/DefaultTypingOverride1391Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java index e71117d567..fa7a786ff8 100644 --- a/src/test/java/com/fasterxml/jackson/failing/DefaultTypingOverride1391Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.Collection; import java.util.Collections; diff --git a/src/test/java/com/fasterxml/jackson/failing/ExternalTypeIdWithUnwrapped2039Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java similarity index 97% rename from src/test/java/com/fasterxml/jackson/failing/ExternalTypeIdWithUnwrapped2039Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java index 2c19289cef..2495e55f2f 100644 --- a/src/test/java/com/fasterxml/jackson/failing/ExternalTypeIdWithUnwrapped2039Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java similarity index 97% rename from src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java index b03b88d1bd..2bc5434d0c 100644 --- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java index 8d2a385d97..b194c078a2 100644 --- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.Objects; diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject4218Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java similarity index 97% rename from src/test/java/com/fasterxml/jackson/failing/JacksonInject4218Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java index 8896397573..a3cc3eb71f 100644 --- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject4218Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonIdentityInfoAndBackReferences3964Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java similarity index 99% rename from src/test/java/com/fasterxml/jackson/failing/JsonIdentityInfoAndBackReferences3964Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java index 8442e4a887..6761666167 100644 --- a/src/test/java/com/fasterxml/jackson/failing/JsonIdentityInfoAndBackReferences3964Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.List; diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java index 7486714ca9..78a4e6e0db 100644 --- a/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/JsonSetter2572Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java similarity index 97% rename from src/test/java/com/fasterxml/jackson/databind/deser/JsonSetter2572Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java index 8075a77f00..f94613307d 100644 --- a/src/test/java/com/fasterxml/jackson/databind/deser/JsonSetter2572Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.databind.deser; +package com.fasterxml.jackson.databind.tofix; import java.util.Objects; diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonTypeIdConflict3681Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java similarity index 97% rename from src/test/java/com/fasterxml/jackson/failing/JsonTypeIdConflict3681Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java index 9908d7f9db..ddf90d7f86 100644 --- a/src/test/java/com/fasterxml/jackson/failing/JsonTypeIdConflict3681Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/KevinFail1410Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/KevinFail1410Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java index 7eafac0eb4..6edb1f7e15 100644 --- a/src/test/java/com/fasterxml/jackson/failing/KevinFail1410Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/MapEntryFormat1419Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/MapEntryFormat1419Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java index 8316bdd89f..8152611514 100644 --- a/src/test/java/com/fasterxml/jackson/failing/MapEntryFormat1419Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/com/fasterxml/jackson/failing/MapInclusion1649Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/MapInclusion1649Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java index 9c1789fd2d..7c3a13c3ff 100644 --- a/src/test/java/com/fasterxml/jackson/failing/MapInclusion1649Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.io.IOException; import java.util.LinkedHashMap; diff --git a/src/test/java/com/fasterxml/jackson/failing/MergeWithCreator1921Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/MergeWithCreator1921Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java index 34105a7d9c..c32f292fc6 100644 --- a/src/test/java/com/fasterxml/jackson/failing/MergeWithCreator1921Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.Objects; diff --git a/src/test/java/com/fasterxml/jackson/failing/NoTypeInfo1654Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/NoTypeInfo1654Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java index 0902fa0f23..3fc893a147 100644 --- a/src/test/java/com/fasterxml/jackson/failing/NoTypeInfo1654Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.io.IOException; import java.util.Arrays; diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdDeserializationFailTest.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdDeserializationFailTest.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java index 84b10e74bc..0cfac917f2 100644 --- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdDeserializationFailTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.ArrayList; import java.util.EnumMap; @@ -10,7 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.objectid.TestObjectId.Employee; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.failing.ObjectIdDeserializationFailTest.EnumMapCompany.FooEnum; +import com.fasterxml.jackson.databind.tofix.ObjectIdDeserializationFailTest.EnumMapCompany.FooEnum; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithBuilder1496Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithBuilder1496Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java index a98d1a4b93..acc3dc1285 100644 --- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithBuilder1496Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectable639Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java similarity index 97% rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectable639Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java index 24a23d429a..8e5ea2a26c 100644 --- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectable639Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectables639Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectables639Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java index c44c7c956d..d0edc7683d 100644 --- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectables639Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithUnwrapping1298Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithUnwrapping1298Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java index 06ef109c65..42475c2993 100644 --- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithUnwrapping1298Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.io.StringWriter; import java.util.ArrayList; diff --git a/src/test/java/com/fasterxml/jackson/failing/ParsingContextExtTypeId2747Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java similarity index 97% rename from src/test/java/com/fasterxml/jackson/failing/ParsingContextExtTypeId2747Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java index a6c9f48a00..72db4e7510 100644 --- a/src/test/java/com/fasterxml/jackson/failing/ParsingContextExtTypeId2747Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/PolymorphicArrays3194Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java similarity index 97% rename from src/test/java/com/fasterxml/jackson/failing/PolymorphicArrays3194Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java index 19416e9356..7446a952f3 100644 --- a/src/test/java/com/fasterxml/jackson/failing/PolymorphicArrays3194Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/RecursiveIgnoreProperties1755Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/RecursiveIgnoreProperties1755Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java index 59af117c1f..93399658be 100644 --- a/src/test/java/com/fasterxml/jackson/failing/RecursiveIgnoreProperties1755Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.math.BigDecimal; import java.util.List; diff --git a/src/test/java/com/fasterxml/jackson/failing/RecursiveWildcard4118Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/RecursiveWildcard4118Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java index 55248a26c5..f0e89620c6 100644 --- a/src/test/java/com/fasterxml/jackson/failing/RecursiveWildcard4118Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/test/java/com/fasterxml/jackson/failing/SetterlessList2692Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/failing/SetterlessList2692Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java index 750e1607af..72d6d52659 100644 --- a/src/test/java/com/fasterxml/jackson/failing/SetterlessList2692Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java similarity index 97% rename from src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java index 9eba2549b7..fb84086190 100644 --- a/src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/test/java/com/fasterxml/jackson/failing/StaticTyping1515Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java similarity index 98% rename from src/test/java/com/fasterxml/jackson/failing/StaticTyping1515Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java index 8d2c74556f..a401349bf8 100644 --- a/src/test/java/com/fasterxml/jackson/failing/StaticTyping1515Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/com/fasterxml/jackson/failing/UnwrappedCaching2461Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java similarity index 97% rename from src/test/java/com/fasterxml/jackson/failing/UnwrappedCaching2461Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java index fe8409d88f..d895a8f66a 100644 --- a/src/test/java/com/fasterxml/jackson/failing/UnwrappedCaching2461Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java similarity index 95% rename from src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java rename to src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java index fb19a43917..97b0943cc8 100644 --- a/src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import org.junit.jupiter.api.Test; From 482ee3a45ba483c62029828e8d7fdd137a16497a Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Sat, 14 Sep 2024 21:52:46 +0900 Subject: [PATCH 4/7] Add new annotation move tests to where they belong --- .../DuplicatePropertyDeserializationRecord4690Test.java | 5 ++++- .../{failing => tofix}/RecordUpdate3079FailingTest.java | 4 +++- .../{tofix => deser/jdk}/BigDecimalParsing4694Test.java | 2 +- .../jackson/databind/tofix/AnyGetterSorting518Test.java | 2 ++ .../databind/tofix/AnySetterAsCreatorFallback1401Test.java | 2 ++ .../databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java | 2 ++ .../jackson/databind/tofix/BackReference1516Test.java | 2 ++ .../jackson/databind/tofix/BuilderWithBackRef2686Test.java | 2 ++ .../jackson/databind/tofix/CreatorFallback2438Test.java | 2 ++ .../databind/tofix/CustomObjectKeyDeserializer4680Test.java | 2 ++ .../databind/tofix/DefaultTypingOverride1391Test.java | 2 ++ .../databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java | 2 ++ .../jackson/databind/tofix/JacksonInject2465Test.java | 2 ++ .../jackson/databind/tofix/JacksonInject2678Test.java | 2 ++ .../jackson/databind/tofix/JacksonInject4218Test.java | 2 ++ .../tofix/JsonIdentityInfoAndBackReferences3964Test.java | 3 +++ .../jackson/databind/tofix/JsonIgnoreProperties2803Test.java | 2 ++ .../jackson/databind/tofix/JsonTypeIdConflict3681Test.java | 2 ++ .../fasterxml/jackson/databind/tofix/KevinFail1410Test.java | 2 ++ .../jackson/databind/tofix/MapEntryFormat1419Test.java | 2 ++ .../jackson/databind/tofix/MapInclusion1649Test.java | 2 ++ .../jackson/databind/tofix/MergeWithCreator1921Test.java | 2 ++ .../fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java | 3 +++ .../databind/tofix/ObjectIdDeserializationFailTest.java | 4 ++++ .../jackson/databind/tofix/ObjectIdWithBuilder1496Test.java | 2 ++ .../databind/tofix/ObjectIdWithInjectable639Test.java | 2 ++ .../databind/tofix/ObjectIdWithInjectables639Test.java | 2 ++ .../databind/tofix/ObjectIdWithUnwrapping1298Test.java | 2 ++ .../databind/tofix/ParsingContextExtTypeId2747Test.java | 2 ++ .../jackson/databind/tofix/PolymorphicArrays3194Test.java | 2 ++ .../databind/tofix/RecursiveIgnoreProperties1755Test.java | 3 +++ .../jackson/databind/tofix/RecursiveWildcard4118Test.java | 3 +++ .../jackson/databind/tofix/SetterlessList2692Test.java | 2 ++ .../jackson/databind/tofix/SetterlessProperties501Test.java | 2 ++ .../jackson/databind/tofix/StaticTyping1515Test.java | 3 +++ .../jackson/databind/tofix/UnwrappedCaching2461Test.java | 2 ++ .../jackson/databind/tofix/UnwrappedWithUnknown650Test.java | 2 ++ 37 files changed, 83 insertions(+), 3 deletions(-) rename src/test-jdk17/java/com/fasterxml/jackson/{failing => databind/tofix}/DuplicatePropertyDeserializationRecord4690Test.java (85%) rename src/test-jdk17/java/com/fasterxml/jackson/databind/{failing => tofix}/RecordUpdate3079FailingTest.java (86%) rename src/test/java/com/fasterxml/jackson/databind/{tofix => deser/jdk}/BigDecimalParsing4694Test.java (95%) diff --git a/src/test-jdk17/java/com/fasterxml/jackson/failing/DuplicatePropertyDeserializationRecord4690Test.java b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java similarity index 85% rename from src/test-jdk17/java/com/fasterxml/jackson/failing/DuplicatePropertyDeserializationRecord4690Test.java rename to src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java index 5bc1c8534c..49b37ba2f1 100644 --- a/src/test-jdk17/java/com/fasterxml/jackson/failing/DuplicatePropertyDeserializationRecord4690Test.java +++ b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java @@ -1,7 +1,9 @@ -package com.fasterxml.jackson.failing; +package com.fasterxml.jackson.databind.tofix; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,6 +19,7 @@ record MyRecord(String first) { } private final ObjectMapper mapper = newJsonMapper(); + @JacksonTestFailureExpected @Test void testDuplicatePropertyDeserialization() throws Exception { final String json = a2q("{'first':'value','first':'value2'}"); diff --git a/src/test-jdk17/java/com/fasterxml/jackson/databind/failing/RecordUpdate3079FailingTest.java b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java similarity index 86% rename from src/test-jdk17/java/com/fasterxml/jackson/databind/failing/RecordUpdate3079FailingTest.java rename to src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java index de24fe331a..b86369384e 100644 --- a/src/test-jdk17/java/com/fasterxml/jackson/databind/failing/RecordUpdate3079FailingTest.java +++ b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.databind.failing; +package com.fasterxml.jackson.databind.tofix; import java.util.Collections; @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.records.RecordUpdate3079Test; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; @@ -17,6 +18,7 @@ public class RecordUpdate3079FailingTest extends DatabindTestUtil private final ObjectMapper MAPPER = newJsonMapper(); // [databind#3079]: Should be able to Record value directly + @JacksonTestFailureExpected @Test public void testDirectRecordUpdate() throws Exception { diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/BigDecimalParsing4694Test.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/BigDecimalParsing4694Test.java similarity index 95% rename from src/test/java/com/fasterxml/jackson/databind/tofix/BigDecimalParsing4694Test.java rename to src/test/java/com/fasterxml/jackson/databind/deser/jdk/BigDecimalParsing4694Test.java index da2e5edae5..7fe334d14e 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/BigDecimalParsing4694Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/BigDecimalParsing4694Test.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.databind.tofix; +package com.fasterxml.jackson.databind.deser.jdk; import java.math.BigDecimal; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java index e77d315d2b..a4d3d3de0e 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java @@ -4,6 +4,7 @@ import java.util.LinkedHashMap; import java.util.Map; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -43,6 +44,7 @@ public Bean(int a, int b, Map x) { private final ObjectMapper MAPPER = newJsonMapper(); + @JacksonTestFailureExpected @Test void anyBeanWithSort() throws Exception { diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java index 228dcdffd8..52b820f5a7 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java @@ -1,5 +1,6 @@ package com.fasterxml.jackson.databind.tofix; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -36,6 +37,7 @@ public void any(String key, Object value) { } private final ObjectMapper MAPPER = newJsonMapper(); // [databind#1401] + @JacksonTestFailureExpected @Test void creatorNoSetter() throws Exception { diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java index de354bf899..4e17a24d3f 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java @@ -2,6 +2,7 @@ import java.util.Objects; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.*; @@ -34,6 +35,7 @@ public Inner(@JsonProperty("field") String field) { } // [databind#2572] + @JacksonTestFailureExpected @Test void emptyForTypeThatCannotBeInstantiated() throws Exception { ObjectMapper mapper = jsonMapperBuilder() diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java index b9ef511d4e..058394cd4c 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java @@ -2,6 +2,7 @@ import java.beans.ConstructorProperties; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonBackReference; @@ -74,6 +75,7 @@ public ChildObject2(String id, String name, " 'child': { 'id': 'def', 'name':'Bert' }\n" + "}"); + @JacksonTestFailureExpected @Test void withParentCreator() throws Exception { ParentWithCreator result = MAPPER.readValue(PARENT_CHILD_JSON, diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java index c82c13d446..e14a45dbe2 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java @@ -2,6 +2,7 @@ import java.beans.ConstructorProperties; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonBackReference; @@ -90,6 +91,7 @@ Content build() { private final ObjectMapper MAPPER = newJsonMapper(); + @JacksonTestFailureExpected @Test void buildWithBackRefs2686() throws Exception { Container container = new Container(); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java index 61a07f39af..df5b0acac2 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -33,6 +34,7 @@ public void setValue(int v) { private final ObjectMapper MAPPER = newJsonMapper(); + @JacksonTestFailureExpected @Test void creator2438() throws Exception { // note: by default, duplicate-detection not enabled, so should not 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 072ab61f22..b3d7fe9a2a 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -16,6 +17,7 @@ public class CustomObjectKeyDeserializer4680Test { + @JacksonTestFailureExpected @Test void testCustomKeyDeserializer() throws Exception diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java index fa7a786ff8..6cc1d8cf89 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -25,6 +26,7 @@ static class ListWrapper { public Collection stuff = Collections.emptyList(); } + @JacksonTestFailureExpected @Test void collectionWithOverride() throws Exception { final ObjectMapper mapper = JsonMapper.builder() diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java index 2495e55f2f..6f51fa8349 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; @@ -41,6 +42,7 @@ public static class SubA2039 extends SubType2039 { public boolean bool; } + @JacksonTestFailureExpected @Test void externalWithUnwrapped2039() throws Exception { final ObjectMapper mapper = newJsonMapper(); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java index 2bc5434d0c..63ea098fd4 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -45,6 +46,7 @@ public Internal2465(String val) { } // [databind#2465] + @JacksonTestFailureExpected @Test void injectWithCreator() throws Exception { ObjectMapper mapper = jsonMapperBuilder() diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java index b194c078a2..6f5fa59c3b 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,6 +41,7 @@ public String getField2() { } // [databind#2678] + @JacksonTestFailureExpected @Test void readValueInjectables() throws Exception { final InjectableValues injectableValues = diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java index a3cc3eb71f..4b010548bb 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -49,6 +50,7 @@ public Object findInjectableValue( } // [databind#4218] + @JacksonTestFailureExpected @Test void injectFail4218() throws Exception { diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java index 6761666167..c4bb38d822 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -206,6 +207,7 @@ public static class Shrimp { /** * Fails : Original test */ + @JacksonTestFailureExpected @Test void original() throws Exception { String json = "{" + @@ -238,6 +240,7 @@ void original() throws Exception { /** * Fails : Lean version that fails and Without getters and setters */ + @JacksonTestFailureExpected @Test void leanWithoutGetterAndSetters() throws Exception { String json = a2q("{" + diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java index 78a4e6e0db..d5cec0abdd 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -29,6 +30,7 @@ static class Room2803 { private final ObjectMapper MAPPER = newJsonMapper(); // [databind#2803] + @JacksonTestFailureExpected @Test void ignoreProps2803() throws Exception { final String DOC = "{\"lobby\":{\"id\":\"L1\"}}"; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java index ddf90d7f86..375c873a72 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -57,6 +58,7 @@ private static class WrapperC { * private interface C extends A, B {} * */ + @JacksonTestFailureExpected @Test void failureWithTypeIdConflict() throws Exception { WrapperC c = MAPPER.readValue(a2q("{'c': {'type': 'c_impl'}}"), WrapperC.class); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java index 6edb1f7e15..7e393d5ec4 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -79,6 +80,7 @@ public String toString() { } } + @JacksonTestFailureExpected @Test void dupProps() throws Exception { ObjectMapper mapper = newJsonMapper(); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java index 8152611514..66486e6fcc 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -29,6 +30,7 @@ public BeanWithMapEntryAsObject(String key, String value) { private final ObjectMapper MAPPER = new ObjectMapper(); + @JacksonTestFailureExpected @Test void wrappedAsObjectRoundtrip() throws Exception { BeanWithMapEntryAsObject input = new BeanWithMapEntryAsObject("foo", "bar"); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java index 7c3a13c3ff..76c71c0d8d 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -26,6 +27,7 @@ public Bean1649(String key, String value) { final private ObjectMapper MAPPER = objectMapper(); // [databind#1649] + @JacksonTestFailureExpected @Test void nonEmptyViaClass() throws IOException { // non-empty/null, include diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java index c32f292fc6..f02727ace5 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.ValueInstantiationException; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.fail; @@ -66,6 +67,7 @@ public String getValidTo() { } } + @JacksonTestFailureExpected @Test void mergeWithCreator() throws Exception { final String JSON = "{ \"validity\": { \"validFrom\": \"2018-02-01\", \"validTo\": \"2018-01-31\" } }"; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java index 3fc893a147..cda8a52963 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java @@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -79,6 +80,7 @@ void noTypeElementOverride() throws Exception { } // [databind#1654] + @JacksonTestFailureExpected @Test void noTypeInfoOverrideSer() throws Exception { Value1654UntypedContainer cont = new Value1654UntypedContainer( @@ -90,6 +92,7 @@ void noTypeInfoOverrideSer() throws Exception { } // [databind#1654] + @JacksonTestFailureExpected @Test void noTypeInfoOverrideDeser() throws Exception { // and then actual failing case diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java index 0cfac917f2..330f50514b 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.objectid.TestObjectId.Employee; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import com.fasterxml.jackson.databind.tofix.ObjectIdDeserializationFailTest.EnumMapCompany.FooEnum; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -52,6 +53,7 @@ public void setReports(List reports) { private final ObjectMapper mapper = new ObjectMapper(); + @JacksonTestFailureExpected @Test void forwardReferenceInArray() throws Exception { String json = "{\"employees\":[" @@ -81,6 +83,7 @@ void forwardReferenceInQueue() throws Exception { assertEmployees(firstEmployee, secondEmployee); } + @JacksonTestFailureExpected @Test void forwardReferenceInEnumMap() throws Exception { @@ -96,6 +99,7 @@ void forwardReferenceInEnumMap() assertEmployees(firstEmployee, secondEmployee); } + @JacksonTestFailureExpected @Test void forwardReferenceWithDefensiveCopy() throws Exception { diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java index acc3dc1285..a29aaa4ba1 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java @@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -80,6 +81,7 @@ public POJO readFromCacheOrBuild() { private final ObjectMapper MAPPER = newJsonMapper(); + @JacksonTestFailureExpected @Test void builderId1496() throws Exception { POJO input = new POJOBuilder().id(123L).var(456).build(); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java index 8e5ea2a26c..fab2d99cf0 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -34,6 +35,7 @@ public Child2(@JsonProperty("parent") Parent2 parent) { } // for [databind#639] + @JacksonTestFailureExpected @Test void objectIdWithInjectable() throws Exception { ObjectMapper mapper = new ObjectMapper() diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java index d0edc7683d..d454825be2 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; // This is probably impossible to handle, in general case, since // there is a cycle for Parent2/Child2... unless special handling @@ -64,6 +65,7 @@ public Child2(@JacksonInject Context context, } } + @JacksonTestFailureExpected @Test void objectIdWithInjectables() throws Exception { ObjectMapper mapper = new ObjectMapper(); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java index 42475c2993..7c19d5ca1a 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java @@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; @@ -53,6 +54,7 @@ public Child(@JsonProperty("name") String name) { } } + @JacksonTestFailureExpected @Test void objectIdWithRepeatedChild() throws Exception { ObjectMapper mapper = JsonMapper.builder() diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java index 72db4e7510..7e579a41d3 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java @@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -54,6 +55,7 @@ static String getCurrentLocationAsString(JsonParser p) { } // [databind#2747] + @JacksonTestFailureExpected @Test void locationAccessWithExtTypeId() throws Exception { ObjectReader objectReader = newJsonMapper().readerFor(Wrapper.class); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java index 7446a952f3..1193c87f1f 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator; import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -18,6 +19,7 @@ static final class SomeBean { public Object[][] value; } + @JacksonTestFailureExpected @Test void twoDimensionalArrayMapping() throws Exception { PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder() diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java index 93399658be..c99982d30a 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -43,6 +44,7 @@ static class Item4417 { private final ObjectMapper MAPPER = newJsonMapper(); // for [databind#1755] + @JacksonTestFailureExpected @Test void recursiveIgnore1755() throws Exception { @@ -75,6 +77,7 @@ void recursiveIgnore1755() throws Exception } // for [databind#4417] + @JacksonTestFailureExpected @Test void recursiveIgnore4417() throws Exception { diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java index f0e89620c6..e5a478cd10 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -55,6 +56,7 @@ public TestObject4118(List> attributes) { private final ObjectMapper MAPPER = newJsonMapper(); // for [databind#4118] + @JacksonTestFailureExpected @Test void recursiveWildcard4118() throws Exception { Tree tree = MAPPER.readValue("[[[]]]", new TypeReference>() { @@ -66,6 +68,7 @@ void recursiveWildcard4118() throws Exception { } // for [databind#4118] + @JacksonTestFailureExpected @Test void deserWildcard4118() throws Exception { // Given diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java index 72d6d52659..a17a599249 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; class SetterlessList2692Test extends DatabindTestUtil { static class DataBean { @@ -35,6 +36,7 @@ public String toString() { } } + @JacksonTestFailureExpected @Test void issue2692() throws Exception { ObjectMapper om = newJsonMapper(); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java index fb84086190..00ae2301c7 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java @@ -12,6 +12,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; @@ -55,6 +56,7 @@ public Map getMap() { } // For [databind#501] + @JacksonTestFailureExpected @Test void setterlessWithPolymorphic() throws Exception { Issue501Bean input = new Issue501Bean("a", new Poly(13)); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java index a401349bf8..0c03e58919 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -67,12 +68,14 @@ static class Issue515Lists { .enable(MapperFeature.USE_STATIC_TYPING) .build(); + @JacksonTestFailureExpected @Test void staticTypingForProperties() throws Exception { String json = STAT_MAPPER.writeValueAsString(new Issue515Singles()); assertEquals(a2q("{'value':{'a':1},'aValue':{'a':1,'b':2},'dValue':{'a':3,'b':4}}"), json); } + @JacksonTestFailureExpected @Test void staticTypingForLists() throws Exception { String json = STAT_MAPPER.writeValueAsString(new Issue515Lists()); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java index d895a8f66a..08326a245c 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -38,6 +39,7 @@ static class OuterContainer { } // [databind#2461] + @JacksonTestFailureExpected @Test void unwrappedCaching() throws Exception { final InnerContainer inner = new InnerContainer(new Base("12345")); diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java index 97b0943cc8..2fab0351cf 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; +import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -22,6 +23,7 @@ static class B { private final ObjectMapper MAPPER = new ObjectMapper(); + @JacksonTestFailureExpected @Test void failOnUnknownPropertyUnwrapped() throws Exception { assertTrue(MAPPER.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)); From 1bf7b3942b772898bc1d36cc7c64897e0afe64d4 Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Sat, 14 Sep 2024 21:53:30 +0900 Subject: [PATCH 5/7] Change pkg name --- .../tofix/DuplicatePropertyDeserializationRecord4690Test.java | 2 +- .../jackson/databind/tofix/RecordUpdate3079FailingTest.java | 2 +- .../{failing => failure}/JacksonTestFailureExpected.java | 2 +- .../JacksonTestFailureExpectedInterceptor.java | 2 +- .../{failing => failure}/JacksonTestShouldFailException.java | 2 +- .../jackson/databind/tofix/AnyGetterSorting518Test.java | 2 +- .../databind/tofix/AnySetterAsCreatorFallback1401Test.java | 2 +- .../databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java | 2 +- .../fasterxml/jackson/databind/tofix/BackReference1516Test.java | 2 +- .../jackson/databind/tofix/BuilderWithBackRef2686Test.java | 2 +- .../jackson/databind/tofix/CreatorFallback2438Test.java | 2 +- .../databind/tofix/CustomObjectKeyDeserializer4680Test.java | 2 +- .../jackson/databind/tofix/DefaultTypingOverride1391Test.java | 2 +- .../databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java | 2 +- .../fasterxml/jackson/databind/tofix/JacksonInject2465Test.java | 2 +- .../fasterxml/jackson/databind/tofix/JacksonInject2678Test.java | 2 +- .../fasterxml/jackson/databind/tofix/JacksonInject4218Test.java | 2 +- .../tofix/JsonIdentityInfoAndBackReferences3964Test.java | 2 +- .../jackson/databind/tofix/JsonIgnoreProperties2803Test.java | 2 +- .../fasterxml/jackson/databind/tofix/JsonSetter2572Test.java | 2 +- .../jackson/databind/tofix/JsonTypeIdConflict3681Test.java | 2 +- .../com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java | 2 +- .../jackson/databind/tofix/MapEntryFormat1419Test.java | 2 +- .../fasterxml/jackson/databind/tofix/MapInclusion1649Test.java | 2 +- .../jackson/databind/tofix/MergeWithCreator1921Test.java | 2 +- .../fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java | 2 +- .../jackson/databind/tofix/ObjectIdDeserializationFailTest.java | 2 +- .../jackson/databind/tofix/ObjectIdWithBuilder1496Test.java | 2 +- .../jackson/databind/tofix/ObjectIdWithInjectable639Test.java | 2 +- .../jackson/databind/tofix/ObjectIdWithInjectables639Test.java | 2 +- .../jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java | 2 +- .../jackson/databind/tofix/ParsingContextExtTypeId2747Test.java | 2 +- .../jackson/databind/tofix/PolymorphicArrays3194Test.java | 2 +- .../databind/tofix/RecursiveIgnoreProperties1755Test.java | 2 +- .../jackson/databind/tofix/RecursiveWildcard4118Test.java | 2 +- .../jackson/databind/tofix/SetterlessList2692Test.java | 2 +- .../jackson/databind/tofix/SetterlessProperties501Test.java | 2 +- .../fasterxml/jackson/databind/tofix/StaticTyping1515Test.java | 2 +- .../jackson/databind/tofix/UnwrappedCaching2461Test.java | 2 +- .../jackson/databind/tofix/UnwrappedWithUnknown650Test.java | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) rename src/test/java/com/fasterxml/jackson/databind/testutil/{failing => failure}/JacksonTestFailureExpected.java (87%) rename src/test/java/com/fasterxml/jackson/databind/testutil/{failing => failure}/JacksonTestFailureExpectedInterceptor.java (96%) rename src/test/java/com/fasterxml/jackson/databind/testutil/{failing => failure}/JacksonTestShouldFailException.java (85%) diff --git a/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java index 49b37ba2f1..bc8c76658c 100644 --- a/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java +++ b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; diff --git a/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java index b86369384e..4c2767bac3 100644 --- a/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java +++ b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.records.RecordUpdate3079Test; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpected.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpected.java similarity index 87% rename from src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpected.java rename to src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpected.java index 27cc0475cd..b07479b382 100644 --- a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpected.java +++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpected.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.databind.testutil.failing; +package com.fasterxml.jackson.databind.testutil.failure; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpectedInterceptor.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java similarity index 96% rename from src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpectedInterceptor.java rename to src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java index 78e6f45e08..767511bd1c 100644 --- a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestFailureExpectedInterceptor.java +++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.databind.testutil.failing; +package com.fasterxml.jackson.databind.testutil.failure; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.InvocationInterceptor; diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestShouldFailException.java similarity index 85% rename from src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java rename to src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestShouldFailException.java index aaa46673d2..3a4d7375fd 100644 --- a/src/test/java/com/fasterxml/jackson/databind/testutil/failing/JacksonTestShouldFailException.java +++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestShouldFailException.java @@ -1,4 +1,4 @@ -package com.fasterxml.jackson.databind.testutil.failing; +package com.fasterxml.jackson.databind.testutil.failure; /** * Exception used to alert that a test is passing, but should be failing. diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java index a4d3d3de0e..436df2947c 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java @@ -4,7 +4,7 @@ import java.util.LinkedHashMap; import java.util.Map; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonAnyGetter; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java index 52b820f5a7..8ea90658e5 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java @@ -1,6 +1,6 @@ package com.fasterxml.jackson.databind.tofix; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonAnySetter; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java index 4e17a24d3f..7d2c801733 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java @@ -2,7 +2,7 @@ import java.util.Objects; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.*; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java index 058394cd4c..ed723d763b 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java @@ -2,7 +2,7 @@ import java.beans.ConstructorProperties; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonBackReference; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java index e14a45dbe2..89f79eac03 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java @@ -2,7 +2,7 @@ import java.beans.ConstructorProperties; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonBackReference; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java index df5b0acac2..3692e6d996 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; 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 b3d7fe9a2a..720212ce91 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java index 6cc1d8cf89..c7d7181c1c 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java index 6f51fa8349..fbf560468c 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java index 63ea098fd4..2838751948 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java index 6f5fa59c3b..20f1d41abc 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java index 4b010548bb..fad3164a95 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java index c4bb38d822..4a0d086b12 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java index d5cec0abdd..a3c13b747d 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java index f94613307d..ed495d852c 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java @@ -2,7 +2,7 @@ import java.util.Objects; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.*; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java index 375c873a72..09efa5431e 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java index 7e393d5ec4..7b4b4ac25e 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java index 66486e6fcc..d8810d5b27 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java index 76c71c0d8d..73ce902664 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java index f02727ace5..8e249d8f45 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.ValueInstantiationException; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.fail; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java index cda8a52963..148f0c0c79 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java index 330f50514b..460a4f048f 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.objectid.TestObjectId.Employee; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.databind.tofix.ObjectIdDeserializationFailTest.EnumMapCompany.FooEnum; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java index a29aaa4ba1..44ef296c8d 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java index fab2d99cf0..2b368ea819 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java index d454825be2..46453617d0 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; // This is probably impossible to handle, in general case, since // there is a cycle for Parent2/Child2... unless special handling diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java index 7c19d5ca1a..eaee5dc6ce 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java index 7e579a41d3..1161ec2722 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java index 1193c87f1f..5693eab006 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator; import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java index c99982d30a..3ffc3c1be0 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java index e5a478cd10..d8d113279a 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java index a17a599249..b7de71848a 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; class SetterlessList2692Test extends DatabindTestUtil { static class DataBean { diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java index 00ae2301c7..ea317b533d 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java index 0c03e58919..d2167b047b 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java index 08326a245c..dc3d867be9 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java index 2fab0351cf..666cf29660 100644 --- a/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; -import com.fasterxml.jackson.databind.testutil.failing.JacksonTestFailureExpected; +import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; From a2683136e370828537a9a3e6f9199fd8e514d259 Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Sun, 15 Sep 2024 09:08:18 +0900 Subject: [PATCH 6/7] Add JavaDoc --- .../failure/JacksonTestFailureExpected.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpected.java b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpected.java index b07479b382..66fca0d2cc 100644 --- a/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpected.java +++ b/src/test/java/com/fasterxml/jackson/databind/testutil/failure/JacksonTestFailureExpected.java @@ -7,6 +7,33 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + *

+ * Annotation used to indicate that a JUnit-5 based tests method is expected to fail. + * + *

+ * When a test method is annotated with {@code @JacksonTestFailureExpected}, the + * {@link JacksonTestFailureExpectedInterceptor} will intercept the test execution. + * If the test passes, which is an unexpected behavior, the interceptor will throw an exception to fail the test, + * indicating that the test was expected to fail but didn't. + *

+ * + *

Usage Example:

+ * + * 

+ *
+ *     @Test
+ *     @JacksonTestFailureExpected
+ *     public void testFeatureNotYetImplemented() {
+ *         // Test code that is expected to fail
+ *     }
+ * }
+ *
+ * + *

+ * + * @since 2.19 + */ @Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @ExtendWith(JacksonTestFailureExpectedInterceptor.class) From d2223dd58c5dc37c20c6d2e8010c26e2b0688b14 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Thu, 19 Sep 2024 08:34:20 -0700 Subject: [PATCH 7/7] Remove duplicate test (was merged to JDKNumberDeserTest) --- .../deser/jdk/BigDecimalParsing4694Test.java | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 src/test/java/com/fasterxml/jackson/databind/deser/jdk/BigDecimalParsing4694Test.java diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/BigDecimalParsing4694Test.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/BigDecimalParsing4694Test.java deleted file mode 100644 index 7fe334d14e..0000000000 --- a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/BigDecimalParsing4694Test.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fasterxml.jackson.databind.deser.jdk; - -import java.math.BigDecimal; - -import org.junit.jupiter.api.Test; - -import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; - -import static org.junit.Assert.assertEquals; - -public class BigDecimalParsing4694Test extends DatabindTestUtil -{ - private final String BIG_DEC_STR; - { - StringBuilder sb = new StringBuilder("-1234."); - // Above 500 chars we get a problem: - for (int i = 520; --i >= 0; ) { - sb.append('0'); - } - BIG_DEC_STR = sb.toString(); - } - private final BigDecimal BIG_DEC = new BigDecimal(BIG_DEC_STR); - - private final ObjectMapper MAPPER = newJsonMapper(); - - // [databind#4694]: decoded wrong by jackson-core/FDP for over 500 char numbers - @Test - public void bigDecimal4694FromString() throws Exception - { - assertEquals(BIG_DEC, MAPPER.readValue(BIG_DEC_STR, BigDecimal.class)); - } - - @Test - public void bigDecimal4694FromBytes() throws Exception - { - byte[] b = utf8Bytes(BIG_DEC_STR); - assertEquals(BIG_DEC, MAPPER.readValue(b, 0, b.length, BigDecimal.class)); - } -}