From 8cc14a223a5cb66fc4b1354b15518b5a3d174acc Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 15 Jan 2025 18:05:03 -0800 Subject: [PATCH 1/3] Refactor to use shared jackson-core test-jar, JacksonTestUtilBase (#4901) --- pom.xml | 12 +++ src/test/java/module-info.java | 11 ++- .../JacksonAnnotationIntrospectorTest.java | 2 +- .../databind/testutil/DatabindTestUtil.java | 99 +------------------ 4 files changed, 25 insertions(+), 99 deletions(-) diff --git a/pom.xml b/pom.xml index b94498f126..dd0b8ad47a 100644 --- a/pom.xml +++ b/pom.xml @@ -108,6 +108,18 @@ + + + + tools.jackson.core + jackson-core + ${jackson.version.core} + tests + test-jar + test + org.junit.jupiter junit-jupiter diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java index fed0e4db08..d0b9a54b06 100644 --- a/src/test/java/module-info.java +++ b/src/test/java/module-info.java @@ -1,4 +1,4 @@ -// Jackson 3.x module-info for Tests +// Jackson 3.x module-info for jackson-databind Tests module tools.jackson.databind { requires java.desktop; @@ -14,6 +14,15 @@ // // Actual Test dependencies + // Shared Jackson test functionality + + // 15-Jan-2025, tatu: missing module-info for `tools.jackson.core` can't yet add + // (but will be included in Class path just not Module path) + // + //requires tools.jackson.core.testutil; + + // Test frameworks, libraries: + // Guava testlib needed by CLMH tests, alas; brings in junit4 requires guava.testlib; // JUnit4 should NOT be needed but is transitively required diff --git a/src/test/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java b/src/test/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java index d81695e9bb..b727733bd8 100644 --- a/src/test/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java +++ b/src/test/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospectorTest.java @@ -109,7 +109,7 @@ public QName deserialize(JsonParser p, DeserializationContext ctxt) if (!p.hasToken(JsonToken.VALUE_STRING)) { throw new IllegalArgumentException("Unexpected token "+p.currentToken()); } - return QName.valueOf(p.getText()); + return QName.valueOf(p.getString()); } } diff --git a/src/test/java/tools/jackson/databind/testutil/DatabindTestUtil.java b/src/test/java/tools/jackson/databind/testutil/DatabindTestUtil.java index 2d235a8c87..b38b840083 100644 --- a/src/test/java/tools/jackson/databind/testutil/DatabindTestUtil.java +++ b/src/test/java/tools/jackson/databind/testutil/DatabindTestUtil.java @@ -7,6 +7,7 @@ import tools.jackson.core.*; import tools.jackson.core.json.JsonFactory; +import tools.jackson.core.testutil.JacksonTestUtilBase; import tools.jackson.databind.*; import tools.jackson.databind.cfg.MapperConfig; import tools.jackson.databind.introspect.AnnotatedMember; @@ -22,6 +23,7 @@ * as part of JUnit 5 migration. */ public class DatabindTestUtil + extends JacksonTestUtilBase { // @since 2.18 // Helper annotation to work around lack of implicit name access with Jackson 2.x @@ -407,37 +409,12 @@ protected String serializeAsString(Object value) return serializeAsString(sharedMapper(), value); } - /* - /********************************************************************** - /* Encoding or String representations - /********************************************************************** - */ - - public static String a2q(String json) { - return json.replace("'", "\""); - } - - public static String q(String str) { - return '"'+str+'"'; - } - - public static byte[] utf8Bytes(String str) { - return str.getBytes(StandardCharsets.UTF_8); - } - /* /********************************************************************** /* Additional assertion methods /********************************************************************** */ - public static void assertToken(JsonToken expToken, JsonToken actToken) - { - if (actToken != expToken) { - fail("Expected token "+expToken+", current token "+actToken); - } - } - public static void assertValidLocation(TokenStreamLocation location) { assertNotNull(location, "Should have non-null location"); assertTrue(location.getLineNr() > 0, "Should have positive line number"); @@ -478,78 +455,6 @@ protected void assertStandardEquals(Object o) o.hashCode(); } - /** - * @param e Exception to check - * @param anyMatches Array of Strings of which AT LEAST ONE ("any") has to be included - * in {@code e.getMessage()} -- using case-INSENSITIVE comparison - */ - public static void verifyException(Throwable e, String... anyMatches) - { - String msg = e.getMessage(); - String lmsg = (msg == null) ? "" : msg.toLowerCase(); - for (String match : anyMatches) { - String lmatch = match.toLowerCase(); - if (lmsg.contains(lmatch)) { - return; - } - } - fail("Expected an exception with one of substrings (" - + Arrays.asList(anyMatches)+"): got one (of type "+e.getClass().getName() - +") with message \""+msg+"\""); - } - - /** - * Method that gets textual contents of the current token using - * available methods, and ensures results are consistent, before - * returning them - */ - protected static String getAndVerifyText(JsonParser jp) - { - // Ok, let's verify other accessors - int actLen = jp.getStringLength(); - char[] ch = jp.getStringCharacters(); - String str2 = new String(ch, jp.getStringOffset(), actLen); - String str = jp.getString(); - - if (str.length() != actLen) { - fail("Internal problem (jp.token == "+jp.currentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen); - } - assertEquals(str, str2, "String access via getText(), getTextXxx() must be the same"); - - return str; - } - - /* - /********************************************************** - /* JDK ser/deser - /********************************************************** - */ - - public static byte[] jdkSerialize(Object o) - { - ByteArrayOutputStream bytes = new ByteArrayOutputStream(2000); - try (ObjectOutputStream obOut = new ObjectOutputStream(bytes)) { - obOut.writeObject(o); - obOut.close(); - return bytes.toByteArray(); - } catch (IOException e) { - throw new UncheckedIOException(e); - } - } - - @SuppressWarnings("unchecked") - public static T jdkDeserialize(byte[] raw) - { - try (ObjectInputStream objIn = new ObjectInputStream(new ByteArrayInputStream(raw))) { - return (T) objIn.readObject(); - } catch (ClassNotFoundException e) { - fail("Missing class: "+e.getMessage()); - return null; - } catch (IOException e) { - throw new UncheckedIOException(e); - } - } - /* /********************************************************************** /* Helper methods, other From 799f77d8ddf310d5ecdd4a570a578cf8676a4e6a Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 15 Jan 2025 18:14:02 -0800 Subject: [PATCH 2/3] Remove unnecessary test --- .../testutil/UnlimitedLookupCache.java | 66 ------------------- .../util/UnlimitedLookupCacheTest.java | 44 ------------- 2 files changed, 110 deletions(-) delete mode 100644 src/test/java/tools/jackson/databind/testutil/UnlimitedLookupCache.java delete mode 100644 src/test/java/tools/jackson/databind/util/UnlimitedLookupCacheTest.java diff --git a/src/test/java/tools/jackson/databind/testutil/UnlimitedLookupCache.java b/src/test/java/tools/jackson/databind/testutil/UnlimitedLookupCache.java deleted file mode 100644 index c117a7f29c..0000000000 --- a/src/test/java/tools/jackson/databind/testutil/UnlimitedLookupCache.java +++ /dev/null @@ -1,66 +0,0 @@ -package tools.jackson.databind.testutil; - -import java.util.concurrent.ConcurrentHashMap; - -import tools.jackson.databind.util.LookupCache; - -/** - * A LookupCache implementation that has no synchronization (like SimpleLookupCache does) - * but that has the downside of not limiting the size of the cache. - */ -public class UnlimitedLookupCache implements LookupCache { - - private final int _initialEntries; - private final transient ConcurrentHashMap _map; - - public UnlimitedLookupCache(int initialEntries) - { - _initialEntries = initialEntries; - // We'll use concurrency level of 4, seems reasonable - _map = new ConcurrentHashMap(initialEntries, 0.8f, 4); - } - - @Override - public LookupCache snapshot() { - return new UnlimitedLookupCache(_initialEntries); - } - - @Override - public LookupCache emptyCopy() { - return snapshot(); - } - - /* - @Override - public void contents(BiConsumer consumer) { - for (Map.Entry entry : _map.entrySet()) { - consumer.accept(entry.getKey(), entry.getValue()); - } - } - */ - - @Override - public int size() { - return _map.size(); - } - - @Override - public V get(Object key) { - return _map.get(key); - } - - @Override - public V put(K key, V value) { - return _map.put(key, value); - } - - @Override - public V putIfAbsent(K key, V value) { - return _map.putIfAbsent(key, value); - } - - @Override - public void clear() { - _map.clear(); - } -} diff --git a/src/test/java/tools/jackson/databind/util/UnlimitedLookupCacheTest.java b/src/test/java/tools/jackson/databind/util/UnlimitedLookupCacheTest.java deleted file mode 100644 index 9b2f150e29..0000000000 --- a/src/test/java/tools/jackson/databind/util/UnlimitedLookupCacheTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package tools.jackson.databind.util; - -import org.junit.jupiter.api.Test; - -import tools.jackson.databind.JavaType; -import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.UnlimitedLookupCache; -import tools.jackson.databind.type.TypeFactory; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - -public class UnlimitedLookupCacheTest - extends DatabindTestUtil -{ - @Test - public void testCache() { - UnlimitedLookupCache cache = new UnlimitedLookupCache<>(4); - assertNull(cache.get(1000L)); - assertNull(cache.put(1000L, "Thousand")); - assertEquals("Thousand", cache.get(1000L)); - assertEquals("Thousand", cache.putIfAbsent(1000L, "Míle")); - assertEquals("Thousand", cache.get(1000L)); - assertEquals("Thousand", cache.put(1000L, "Míle")); - assertEquals("Míle", cache.get(1000L)); - cache.clear(); - assertNull(cache.put(1000L, "Thousand")); - } - - @Test - public void testCompatibility() - { - UnlimitedLookupCache cache = new UnlimitedLookupCache<>(4); - TypeFactory tf = defaultTypeFactory().withCache(cache); - assertNotNull(tf); // just to get rid of warning - - //TODO find way to inject the `tf` instance into an ObjectMapper (via MapperBuilder?) - - //ObjectMapper mapper = new ObjectMapper(); - //mapper.setTypeFactory(tf); - //assertEquals("1000", mapper.writeValueAsString(1000)); - } -} From b7ce302e2c2daec98183a3af67d19cf7926775ca Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 15 Jan 2025 18:44:20 -0800 Subject: [PATCH 3/3] Test refactoring: use "@JacksonTestFailureExpected" from jackson-core test artifact (#4910) --- src/test/java/module-info.java | 1 - ...PropertyDeserializationRecord4690Test.java | 4 +- .../tofix/RecordUpdate3079FailingTest.java | 2 +- ...rdsWithJsonIncludeAndIgnorals4629Test.java | 3 +- .../databind/testutil/DatabindTestUtil.java | 1 - .../failure/JacksonTestFailureExpected.java | 37 --------------- ...JacksonTestFailureExpectedInterceptor.java | 45 ------------------- .../JacksonTestShouldFailException.java | 16 ------- .../tofix/AnyGetterSorting518Test.java | 2 +- .../AnySetterAsCreatorFallback1401Test.java | 2 +- .../AsEmptyPOJONoDefaultCtor2572Test.java | 2 +- .../databind/tofix/BackReference1516Test.java | 2 +- .../tofix/BuilderAdvanced2580Test.java | 2 +- .../tofix/BuilderCreatorSubtype4742Test.java | 2 +- .../tofix/BuilderWithBackRef2686Test.java | 2 +- .../tofix/CreatorFallback2438Test.java | 2 +- .../CreatorWithIgnoreProperties3355Test.java | 2 +- .../tofix/DefaultTypingOverride1391Test.java | 2 +- .../ExternalTypeCustomResolver1288Test.java | 2 +- .../tofix/ExternalTypeIdDup1410Test.java | 2 +- .../ExternalTypeIdWithUnwrapped2039Test.java | 2 +- .../databind/tofix/JacksonInject2678Test.java | 2 +- .../databind/tofix/JacksonInject4218Test.java | 2 +- ...IdentityInfoAndBackReferences3964Test.java | 2 +- .../tofix/JsonTypeIdConflict3681Test.java | 2 +- .../tofix/MapEntryFormat1419Test.java | 2 +- .../tofix/MapFormatShape1419Test.java | 2 +- .../databind/tofix/MapInclusion1649Test.java | 2 +- .../tofix/MergeWithCreator1921Test.java | 2 +- .../databind/tofix/NoTypeInfo1654Test.java | 2 +- .../databind/tofix/NodeContext2049Test.java | 2 +- .../ObjectIdDeserializationFailTest.java | 2 +- .../tofix/ObjectIdWithBuilder1496Test.java | 2 +- .../tofix/ObjectIdWithInjectable639Test.java | 2 +- .../tofix/ObjectIdWithUnwrapping1298Test.java | 2 +- .../ParsingContextExtTypeId2747Test.java | 2 +- .../tofix/PolymorphicArrays3194Test.java | 2 +- ...morphicDeserWithJsonUnwrapped4792Test.java | 2 +- .../RecursiveIgnoreProperties1755Test.java | 2 +- .../tofix/RecursiveWildcard4118Test.java | 2 +- .../tofix/SetterlessList2692Test.java | 2 +- .../tofix/SetterlessProperties501Test.java | 7 +-- .../databind/tofix/StaticTyping1515Test.java | 2 +- .../tofix/UnwrappedWithUnknown650Test.java | 2 +- 44 files changed, 42 insertions(+), 144 deletions(-) delete mode 100644 src/test/java/tools/jackson/databind/testutil/failure/JacksonTestFailureExpected.java delete mode 100644 src/test/java/tools/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java delete mode 100644 src/test/java/tools/jackson/databind/testutil/failure/JacksonTestShouldFailException.java diff --git a/src/test/java/module-info.java b/src/test/java/module-info.java index d0b9a54b06..3a095aacb8 100644 --- a/src/test/java/module-info.java +++ b/src/test/java/module-info.java @@ -95,7 +95,6 @@ opens tools.jackson.databind.ser.filter; opens tools.jackson.databind.seq; opens tools.jackson.databind.struct; - opens tools.jackson.databind.testutil.failure; opens tools.jackson.databind.tofix; opens tools.jackson.databind.util.internal; opens tools.jackson.databind.views; diff --git a/src/test/java/tools/jackson/databind/records/tofix/DuplicatePropertyDeserializationRecord4690Test.java b/src/test/java/tools/jackson/databind/records/tofix/DuplicatePropertyDeserializationRecord4690Test.java index 2c87257069..468a2c424e 100644 --- a/src/test/java/tools/jackson/databind/records/tofix/DuplicatePropertyDeserializationRecord4690Test.java +++ b/src/test/java/tools/jackson/databind/records/tofix/DuplicatePropertyDeserializationRecord4690Test.java @@ -2,9 +2,10 @@ import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; + import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -14,7 +15,6 @@ public class DuplicatePropertyDeserializationRecord4690Test extends DatabindTestUtil { - record MyRecord(String first) { } private final ObjectMapper mapper = newJsonMapper(); diff --git a/src/test/java/tools/jackson/databind/records/tofix/RecordUpdate3079FailingTest.java b/src/test/java/tools/jackson/databind/records/tofix/RecordUpdate3079FailingTest.java index 876b426b91..18dee35e7c 100644 --- a/src/test/java/tools/jackson/databind/records/tofix/RecordUpdate3079FailingTest.java +++ b/src/test/java/tools/jackson/databind/records/tofix/RecordUpdate3079FailingTest.java @@ -3,10 +3,10 @@ import java.util.Collections; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/tools/jackson/databind/records/tofix/RecordsWithJsonIncludeAndIgnorals4629Test.java b/src/test/java/tools/jackson/databind/records/tofix/RecordsWithJsonIncludeAndIgnorals4629Test.java index af698b5ab0..4f45ca5f63 100644 --- a/src/test/java/tools/jackson/databind/records/tofix/RecordsWithJsonIncludeAndIgnorals4629Test.java +++ b/src/test/java/tools/jackson/databind/records/tofix/RecordsWithJsonIncludeAndIgnorals4629Test.java @@ -2,12 +2,13 @@ import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIncludeProperties; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/testutil/DatabindTestUtil.java b/src/test/java/tools/jackson/databind/testutil/DatabindTestUtil.java index b38b840083..604d627485 100644 --- a/src/test/java/tools/jackson/databind/testutil/DatabindTestUtil.java +++ b/src/test/java/tools/jackson/databind/testutil/DatabindTestUtil.java @@ -2,7 +2,6 @@ import java.io.*; import java.lang.annotation.*; -import java.nio.charset.StandardCharsets; import java.util.*; import tools.jackson.core.*; diff --git a/src/test/java/tools/jackson/databind/testutil/failure/JacksonTestFailureExpected.java b/src/test/java/tools/jackson/databind/testutil/failure/JacksonTestFailureExpected.java deleted file mode 100644 index c52539d76b..0000000000 --- a/src/test/java/tools/jackson/databind/testutil/failure/JacksonTestFailureExpected.java +++ /dev/null @@ -1,37 +0,0 @@ -package tools.jackson.databind.testutil.failure; - -import java.lang.annotation.*; - -import org.junit.jupiter.api.extension.ExtendWith; - -/** - *

- * 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) -public @interface JacksonTestFailureExpected { } diff --git a/src/test/java/tools/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java b/src/test/java/tools/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java deleted file mode 100644 index 67dc6876a3..0000000000 --- a/src/test/java/tools/jackson/databind/testutil/failure/JacksonTestFailureExpectedInterceptor.java +++ /dev/null @@ -1,45 +0,0 @@ -package tools.jackson.databind.testutil.failure; - -import java.lang.reflect.Method; - -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.InvocationInterceptor; -import org.junit.jupiter.api.extension.ReflectiveInvocationContext; - -/** - * 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/tools/jackson/databind/testutil/failure/JacksonTestShouldFailException.java b/src/test/java/tools/jackson/databind/testutil/failure/JacksonTestShouldFailException.java deleted file mode 100644 index a17c0c1848..0000000000 --- a/src/test/java/tools/jackson/databind/testutil/failure/JacksonTestShouldFailException.java +++ /dev/null @@ -1,16 +0,0 @@ -package tools.jackson.databind.testutil.failure; - -/** - * 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. - */ -public class JacksonTestShouldFailException - extends RuntimeException -{ - private static final long serialVersionUID = 1L; - - public JacksonTestShouldFailException(String msg) { - super(msg); - } -} diff --git a/src/test/java/tools/jackson/databind/tofix/AnyGetterSorting518Test.java b/src/test/java/tools/jackson/databind/tofix/AnyGetterSorting518Test.java index 6148e3adb5..5e73e91029 100644 --- a/src/test/java/tools/jackson/databind/tofix/AnyGetterSorting518Test.java +++ b/src/test/java/tools/jackson/databind/tofix/AnyGetterSorting518Test.java @@ -5,13 +5,13 @@ import java.util.Map; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java b/src/test/java/tools/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java index 7ea477f274..bc8ddb4b61 100644 --- a/src/test/java/tools/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java +++ b/src/test/java/tools/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java @@ -1,6 +1,7 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonCreator; @@ -8,7 +9,6 @@ import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java b/src/test/java/tools/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java index 5a5dbddf19..e1dc11880d 100644 --- a/src/test/java/tools/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java +++ b/src/test/java/tools/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java @@ -3,12 +3,12 @@ import java.util.Objects; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/tools/jackson/databind/tofix/BackReference1516Test.java b/src/test/java/tools/jackson/databind/tofix/BackReference1516Test.java index b3add35c8d..c32a2c4ac7 100644 --- a/src/test/java/tools/jackson/databind/tofix/BackReference1516Test.java +++ b/src/test/java/tools/jackson/databind/tofix/BackReference1516Test.java @@ -3,13 +3,13 @@ import java.beans.ConstructorProperties; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonManagedReference; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/src/test/java/tools/jackson/databind/tofix/BuilderAdvanced2580Test.java b/src/test/java/tools/jackson/databind/tofix/BuilderAdvanced2580Test.java index c410f218c4..3534e92be3 100644 --- a/src/test/java/tools/jackson/databind/tofix/BuilderAdvanced2580Test.java +++ b/src/test/java/tools/jackson/databind/tofix/BuilderAdvanced2580Test.java @@ -1,6 +1,7 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.annotation.JsonTypeInfo.As; @@ -8,7 +9,6 @@ import tools.jackson.databind.*; import tools.jackson.databind.annotation.JsonDeserialize; -import tools.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/tools/jackson/databind/tofix/BuilderCreatorSubtype4742Test.java b/src/test/java/tools/jackson/databind/tofix/BuilderCreatorSubtype4742Test.java index 3218e0890d..c45e55a262 100644 --- a/src/test/java/tools/jackson/databind/tofix/BuilderCreatorSubtype4742Test.java +++ b/src/test/java/tools/jackson/databind/tofix/BuilderCreatorSubtype4742Test.java @@ -3,13 +3,13 @@ import java.util.List; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.annotation.JsonDeserialize; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/src/test/java/tools/jackson/databind/tofix/BuilderWithBackRef2686Test.java b/src/test/java/tools/jackson/databind/tofix/BuilderWithBackRef2686Test.java index 0748258bf3..d03eaff958 100644 --- a/src/test/java/tools/jackson/databind/tofix/BuilderWithBackRef2686Test.java +++ b/src/test/java/tools/jackson/databind/tofix/BuilderWithBackRef2686Test.java @@ -3,6 +3,7 @@ import java.beans.ConstructorProperties; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonManagedReference; @@ -11,7 +12,6 @@ import tools.jackson.databind.annotation.JsonDeserialize; import tools.jackson.databind.annotation.JsonPOJOBuilder; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/tools/jackson/databind/tofix/CreatorFallback2438Test.java b/src/test/java/tools/jackson/databind/tofix/CreatorFallback2438Test.java index 07c09a6103..7d773581d7 100644 --- a/src/test/java/tools/jackson/databind/tofix/CreatorFallback2438Test.java +++ b/src/test/java/tools/jackson/databind/tofix/CreatorFallback2438Test.java @@ -1,13 +1,13 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/CreatorWithIgnoreProperties3355Test.java b/src/test/java/tools/jackson/databind/tofix/CreatorWithIgnoreProperties3355Test.java index 4f7b20d3d7..d983d9ca56 100644 --- a/src/test/java/tools/jackson/databind/tofix/CreatorWithIgnoreProperties3355Test.java +++ b/src/test/java/tools/jackson/databind/tofix/CreatorWithIgnoreProperties3355Test.java @@ -1,6 +1,7 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -8,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/tools/jackson/databind/tofix/DefaultTypingOverride1391Test.java b/src/test/java/tools/jackson/databind/tofix/DefaultTypingOverride1391Test.java index c118671389..7555ab8856 100644 --- a/src/test/java/tools/jackson/databind/tofix/DefaultTypingOverride1391Test.java +++ b/src/test/java/tools/jackson/databind/tofix/DefaultTypingOverride1391Test.java @@ -4,13 +4,13 @@ import java.util.Collections; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonTypeInfo; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; import tools.jackson.databind.testutil.NoCheckSubTypeValidator; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/ExternalTypeCustomResolver1288Test.java b/src/test/java/tools/jackson/databind/tofix/ExternalTypeCustomResolver1288Test.java index 1009e710ed..deeedaa78b 100644 --- a/src/test/java/tools/jackson/databind/tofix/ExternalTypeCustomResolver1288Test.java +++ b/src/test/java/tools/jackson/databind/tofix/ExternalTypeCustomResolver1288Test.java @@ -3,6 +3,7 @@ import java.util.UUID; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -14,7 +15,6 @@ import tools.jackson.databind.annotation.JsonTypeIdResolver; import tools.jackson.databind.jsontype.impl.TypeIdResolverBase; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/tools/jackson/databind/tofix/ExternalTypeIdDup1410Test.java b/src/test/java/tools/jackson/databind/tofix/ExternalTypeIdDup1410Test.java index 80868f2416..c4079a3d88 100644 --- a/src/test/java/tools/jackson/databind/tofix/ExternalTypeIdDup1410Test.java +++ b/src/test/java/tools/jackson/databind/tofix/ExternalTypeIdDup1410Test.java @@ -1,13 +1,13 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/tools/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java b/src/test/java/tools/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java index 29c58cbf7f..803b038938 100644 --- a/src/test/java/tools/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java +++ b/src/test/java/tools/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java @@ -1,12 +1,12 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/tools/jackson/databind/tofix/JacksonInject2678Test.java b/src/test/java/tools/jackson/databind/tofix/JacksonInject2678Test.java index bd1df45d26..6fcb88f732 100644 --- a/src/test/java/tools/jackson/databind/tofix/JacksonInject2678Test.java +++ b/src/test/java/tools/jackson/databind/tofix/JacksonInject2678Test.java @@ -3,13 +3,13 @@ import java.util.Objects; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; import tools.jackson.databind.*; import tools.jackson.databind.json.JsonMapper; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/JacksonInject4218Test.java b/src/test/java/tools/jackson/databind/tofix/JacksonInject4218Test.java index f3a60ec382..0d02e14b70 100644 --- a/src/test/java/tools/jackson/databind/tofix/JacksonInject4218Test.java +++ b/src/test/java/tools/jackson/databind/tofix/JacksonInject4218Test.java @@ -1,6 +1,7 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; @@ -8,7 +9,6 @@ import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java b/src/test/java/tools/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java index 6708c6f2f1..992703e95c 100644 --- a/src/test/java/tools/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java +++ b/src/test/java/tools/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java @@ -3,6 +3,7 @@ import java.util.List; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; @@ -10,7 +11,6 @@ import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.exc.MismatchedInputException; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.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/tools/jackson/databind/tofix/JsonTypeIdConflict3681Test.java b/src/test/java/tools/jackson/databind/tofix/JsonTypeIdConflict3681Test.java index 01de34743b..5b73abb364 100644 --- a/src/test/java/tools/jackson/databind/tofix/JsonTypeIdConflict3681Test.java +++ b/src/test/java/tools/jackson/databind/tofix/JsonTypeIdConflict3681Test.java @@ -1,6 +1,7 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -8,7 +9,6 @@ import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/tools/jackson/databind/tofix/MapEntryFormat1419Test.java b/src/test/java/tools/jackson/databind/tofix/MapEntryFormat1419Test.java index d1efd80860..540550e751 100644 --- a/src/test/java/tools/jackson/databind/tofix/MapEntryFormat1419Test.java +++ b/src/test/java/tools/jackson/databind/tofix/MapEntryFormat1419Test.java @@ -4,12 +4,12 @@ import java.util.Map; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonFormat; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/MapFormatShape1419Test.java b/src/test/java/tools/jackson/databind/tofix/MapFormatShape1419Test.java index 41855b754c..3a4dae82da 100644 --- a/src/test/java/tools/jackson/databind/tofix/MapFormatShape1419Test.java +++ b/src/test/java/tools/jackson/databind/tofix/MapFormatShape1419Test.java @@ -3,6 +3,7 @@ import java.util.*; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; @@ -10,7 +11,6 @@ import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/MapInclusion1649Test.java b/src/test/java/tools/jackson/databind/tofix/MapInclusion1649Test.java index 41d61d857a..606db84340 100644 --- a/src/test/java/tools/jackson/databind/tofix/MapInclusion1649Test.java +++ b/src/test/java/tools/jackson/databind/tofix/MapInclusion1649Test.java @@ -5,12 +5,12 @@ import java.util.Map; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonInclude; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/MergeWithCreator1921Test.java b/src/test/java/tools/jackson/databind/tofix/MergeWithCreator1921Test.java index 6e2f50b30a..69a850865b 100644 --- a/src/test/java/tools/jackson/databind/tofix/MergeWithCreator1921Test.java +++ b/src/test/java/tools/jackson/databind/tofix/MergeWithCreator1921Test.java @@ -3,13 +3,13 @@ import java.util.Objects; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; import tools.jackson.databind.*; import tools.jackson.databind.exc.ValueInstantiationException; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.fail; diff --git a/src/test/java/tools/jackson/databind/tofix/NoTypeInfo1654Test.java b/src/test/java/tools/jackson/databind/tofix/NoTypeInfo1654Test.java index 5f64f9c1c8..8f6681bd36 100644 --- a/src/test/java/tools/jackson/databind/tofix/NoTypeInfo1654Test.java +++ b/src/test/java/tools/jackson/databind/tofix/NoTypeInfo1654Test.java @@ -3,6 +3,7 @@ import java.util.*; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -10,7 +11,6 @@ import tools.jackson.databind.*; import tools.jackson.databind.annotation.JsonDeserialize; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/NodeContext2049Test.java b/src/test/java/tools/jackson/databind/tofix/NodeContext2049Test.java index 1b09124674..cb854b0c2d 100644 --- a/src/test/java/tools/jackson/databind/tofix/NodeContext2049Test.java +++ b/src/test/java/tools/jackson/databind/tofix/NodeContext2049Test.java @@ -5,6 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import tools.jackson.core.*; import tools.jackson.databind.*; @@ -13,7 +14,6 @@ import tools.jackson.databind.deser.std.DelegatingDeserializer; import tools.jackson.databind.json.JsonMapper; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import tools.jackson.databind.type.CollectionLikeType; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/src/test/java/tools/jackson/databind/tofix/ObjectIdDeserializationFailTest.java b/src/test/java/tools/jackson/databind/tofix/ObjectIdDeserializationFailTest.java index 6411dddd9f..60c750ca8e 100644 --- a/src/test/java/tools/jackson/databind/tofix/ObjectIdDeserializationFailTest.java +++ b/src/test/java/tools/jackson/databind/tofix/ObjectIdDeserializationFailTest.java @@ -6,11 +6,11 @@ import java.util.concurrent.ArrayBlockingQueue; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.objectid.Employee; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/src/test/java/tools/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java b/src/test/java/tools/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java index 5d75d06387..8f5f558c65 100644 --- a/src/test/java/tools/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java +++ b/src/test/java/tools/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java @@ -3,6 +3,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; @@ -11,7 +12,6 @@ import tools.jackson.databind.annotation.JsonDeserialize; import tools.jackson.databind.annotation.JsonPOJOBuilder; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/tools/jackson/databind/tofix/ObjectIdWithInjectable639Test.java b/src/test/java/tools/jackson/databind/tofix/ObjectIdWithInjectable639Test.java index cf7cd1d010..86d250437c 100644 --- a/src/test/java/tools/jackson/databind/tofix/ObjectIdWithInjectable639Test.java +++ b/src/test/java/tools/jackson/databind/tofix/ObjectIdWithInjectable639Test.java @@ -1,12 +1,12 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/tools/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java b/src/test/java/tools/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java index a8e6bf6992..07f6c84d08 100644 --- a/src/test/java/tools/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java +++ b/src/test/java/tools/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java @@ -5,6 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; @@ -12,7 +13,6 @@ import tools.jackson.core.json.JsonFactory; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.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/tools/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java b/src/test/java/tools/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java index a716417481..7f036a78ff 100644 --- a/src/test/java/tools/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java +++ b/src/test/java/tools/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java @@ -1,6 +1,7 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; @@ -8,7 +9,6 @@ import tools.jackson.databind.*; import tools.jackson.databind.annotation.JsonDeserialize; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/PolymorphicArrays3194Test.java b/src/test/java/tools/jackson/databind/tofix/PolymorphicArrays3194Test.java index c5e6bd92c7..750ce727aa 100644 --- a/src/test/java/tools/jackson/databind/tofix/PolymorphicArrays3194Test.java +++ b/src/test/java/tools/jackson/databind/tofix/PolymorphicArrays3194Test.java @@ -1,6 +1,7 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import tools.jackson.databind.DefaultTyping; import tools.jackson.databind.ObjectMapper; @@ -8,7 +9,6 @@ import tools.jackson.databind.jsontype.BasicPolymorphicTypeValidator; import tools.jackson.databind.jsontype.PolymorphicTypeValidator; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/PolymorphicDeserWithJsonUnwrapped4792Test.java b/src/test/java/tools/jackson/databind/tofix/PolymorphicDeserWithJsonUnwrapped4792Test.java index 412db2378d..531b1ccffb 100644 --- a/src/test/java/tools/jackson/databind/tofix/PolymorphicDeserWithJsonUnwrapped4792Test.java +++ b/src/test/java/tools/jackson/databind/tofix/PolymorphicDeserWithJsonUnwrapped4792Test.java @@ -1,11 +1,11 @@ package tools.jackson.databind.tofix; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.*; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/src/test/java/tools/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java b/src/test/java/tools/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java index 757745eba3..eb7a5b2300 100644 --- a/src/test/java/tools/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java +++ b/src/test/java/tools/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java @@ -4,12 +4,12 @@ import java.util.List; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.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/tools/jackson/databind/tofix/RecursiveWildcard4118Test.java b/src/test/java/tools/jackson/databind/tofix/RecursiveWildcard4118Test.java index b2335ce83e..4a3945a6e3 100644 --- a/src/test/java/tools/jackson/databind/tofix/RecursiveWildcard4118Test.java +++ b/src/test/java/tools/jackson/databind/tofix/RecursiveWildcard4118Test.java @@ -5,13 +5,13 @@ import java.util.List; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonCreator; import tools.jackson.core.type.TypeReference; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/SetterlessList2692Test.java b/src/test/java/tools/jackson/databind/tofix/SetterlessList2692Test.java index 419a636b68..978d0b1d8e 100644 --- a/src/test/java/tools/jackson/databind/tofix/SetterlessList2692Test.java +++ b/src/test/java/tools/jackson/databind/tofix/SetterlessList2692Test.java @@ -4,6 +4,7 @@ import java.util.List; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -11,7 +12,6 @@ import tools.jackson.databind.MapperFeature; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/src/test/java/tools/jackson/databind/tofix/SetterlessProperties501Test.java b/src/test/java/tools/jackson/databind/tofix/SetterlessProperties501Test.java index 5b5ef74c2b..16b815e7ff 100644 --- a/src/test/java/tools/jackson/databind/tofix/SetterlessProperties501Test.java +++ b/src/test/java/tools/jackson/databind/tofix/SetterlessProperties501Test.java @@ -1,18 +1,15 @@ package tools.jackson.databind.tofix; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonTypeInfo; import tools.jackson.databind.*; import tools.jackson.databind.testutil.DatabindTestUtil; import tools.jackson.databind.testutil.NoCheckSubTypeValidator; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/tools/jackson/databind/tofix/StaticTyping1515Test.java b/src/test/java/tools/jackson/databind/tofix/StaticTyping1515Test.java index 507a5f9c07..fe339e235c 100644 --- a/src/test/java/tools/jackson/databind/tofix/StaticTyping1515Test.java +++ b/src/test/java/tools/jackson/databind/tofix/StaticTyping1515Test.java @@ -4,13 +4,13 @@ import java.util.List; import org.junit.jupiter.api.Test; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import tools.jackson.databind.*; import tools.jackson.databind.annotation.JsonSerialize; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/tools/jackson/databind/tofix/UnwrappedWithUnknown650Test.java b/src/test/java/tools/jackson/databind/tofix/UnwrappedWithUnknown650Test.java index 33cd573039..e38ae635ed 100644 --- a/src/test/java/tools/jackson/databind/tofix/UnwrappedWithUnknown650Test.java +++ b/src/test/java/tools/jackson/databind/tofix/UnwrappedWithUnknown650Test.java @@ -3,12 +3,12 @@ import org.junit.jupiter.api.Test; import com.fasterxml.jackson.annotation.JsonUnwrapped; +import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import tools.jackson.databind.*; import tools.jackson.databind.exc.UnrecognizedPropertyException; import tools.jackson.databind.json.JsonMapper; import tools.jackson.databind.testutil.DatabindTestUtil; -import tools.jackson.databind.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.fail;