diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/BaseJaxbTest.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/ModuleTestBase.java similarity index 98% rename from jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/BaseJaxbTest.java rename to jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/ModuleTestBase.java index ccbdf249..9d595ee5 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/BaseJaxbTest.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/ModuleTestBase.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator; -public abstract class BaseJaxbTest +public abstract class ModuleTestBase extends junit.framework.TestCase { public static class NoCheckSubTypeValidator @@ -25,7 +25,7 @@ public Validity validateBaseType(MapperConfig config, JavaType baseType) { } } - protected BaseJaxbTest() { } + protected ModuleTestBase() { } /* /********************************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/TestVersions.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/TestVersions.java index ddb654fd..9f55043f 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/TestVersions.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/TestVersions.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector; -public class TestVersions extends BaseJaxbTest +public class TestVersions extends ModuleTestBase { public void testVersions() { diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdaptedMapType.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdaptedMapType.java index 130de3b8..9a27c31a 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdaptedMapType.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdaptedMapType.java @@ -8,13 +8,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Tests for verifying JAXB adapter handling for {@link java.util.Map} * types. */ -public class TestAdaptedMapType extends BaseJaxbTest +public class TestAdaptedMapType extends ModuleTestBase { static class ObjectContainingAMap { diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdapters.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdapters.java index fbf65aaa..fa9fe7b7 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdapters.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdapters.java @@ -9,13 +9,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Unit tests for checking that JAXB type adapters work (to some * degree, anyway). */ -public class TestAdapters extends BaseJaxbTest +public class TestAdapters extends ModuleTestBase { public static class SillyAdapter extends XmlAdapter { diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdaptersForContainers.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdaptersForContainers.java index 5d083b0b..c4c0793c 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdaptersForContainers.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestAdaptersForContainers.java @@ -9,14 +9,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; import com.fasterxml.jackson.module.jakarta.xmlbind.introspect.TestJaxbAnnotationIntrospector.KeyValuePair; /** * Unit tests to check that {@link XmlAdapter}s also work with * container types (Lists, Maps) */ -public class TestAdaptersForContainers extends BaseJaxbTest +public class TestAdaptersForContainers extends ModuleTestBase { // Support for Maps diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestIdentityAdapters.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestIdentityAdapters.java index e96d7c8f..2f900576 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestIdentityAdapters.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/adapters/TestIdentityAdapters.java @@ -5,12 +5,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Failing unit tests related to Adapter handling. */ -public class TestIdentityAdapters extends BaseJaxbTest +public class TestIdentityAdapters extends ModuleTestBase { // [Issue-10]: Infinite recursion in "self" adapters public static class IdentityAdapter extends XmlAdapter { diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/failing/TestUnwrapping.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/failing/TestUnwrapping.java index 9c1b48a0..e60fb07f 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/failing/TestUnwrapping.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/failing/TestUnwrapping.java @@ -9,9 +9,9 @@ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; -public class TestUnwrapping extends BaseJaxbTest +public class TestUnwrapping extends ModuleTestBase { @XmlRootElement static class Bean diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/failing/TestXmlID3.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/failing/TestXmlID3.java index 6e57e83c..601ff0d3 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/failing/TestXmlID3.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/failing/TestXmlID3.java @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; // for [modules-base#46]: XmlId semantics can not be supported by Jackson/JAXB-annotation-mapper -public class TestXmlID3 extends BaseJaxbTest +public class TestXmlID3 extends ModuleTestBase { static class HasID { diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/id/TestXmlID.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/id/TestXmlID.java index 56b962da..34913d0f 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/id/TestXmlID.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/id/TestXmlID.java @@ -6,13 +6,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Simple testing to verify that XmlID and XMLIDREF handling works * to degree we can make it work. */ -public class TestXmlID extends BaseJaxbTest +public class TestXmlID extends ModuleTestBase { // From sample used in [http://blog.bdoughan.com/2010/10/jaxb-and-shared-references-xmlid-and.html] @XmlRootElement diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/id/TestXmlID2.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/id/TestXmlID2.java index aa928c97..8fe4ab70 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/id/TestXmlID2.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/id/TestXmlID2.java @@ -10,9 +10,9 @@ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; -public class TestXmlID2 extends BaseJaxbTest +public class TestXmlID2 extends ModuleTestBase { @XmlRootElement(name = "department") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestAccessType.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestAccessType.java index 21ca058c..993417e6 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestAccessType.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestAccessType.java @@ -8,13 +8,13 @@ import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Unit test(s) written for [JACKSON-303]; we should be able to detect setter * even though it is not annotated, because there is matching annotated getter. */ -public class TestAccessType extends BaseJaxbTest +public class TestAccessType extends ModuleTestBase { @XmlRootElement(name = "model") @XmlAccessorType(XmlAccessType.NONE) diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestAnnotationPriority.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestAnnotationPriority.java index 2ebd0380..70ef8e4f 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestAnnotationPriority.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestAnnotationPriority.java @@ -4,13 +4,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Unit test(s) to verify that annotations from super classes and * interfaces are properly used (for example, wrt [JACKSON-450]) */ -public class TestAnnotationPriority extends BaseJaxbTest +public class TestAnnotationPriority extends ModuleTestBase { /* /********************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestIntrospectorPair.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestIntrospectorPair.java index 5832d1c8..4699ece9 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestIntrospectorPair.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestIntrospectorPair.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Simple testing that AnnotationIntrospector.Pair works as @@ -26,7 +26,7 @@ * @author Tatu Saloranta */ public class TestIntrospectorPair - extends BaseJaxbTest + extends ModuleTestBase { final static AnnotationIntrospector _jacksonAI = new JacksonAnnotationIntrospector(); final static AnnotationIntrospector _jaxbAI = new JakartaXmlBindAnnotationIntrospector(TypeFactory.defaultInstance()); diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbAnnotationIntrospector.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbAnnotationIntrospector.java index 1704f151..ec1d3075 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbAnnotationIntrospector.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbAnnotationIntrospector.java @@ -16,14 +16,14 @@ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Tests for verifying that JAXB annotation based introspector * implementation works as expected */ public class TestJaxbAnnotationIntrospector - extends BaseJaxbTest + extends ModuleTestBase { /* /**************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbAutoDetect.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbAutoDetect.java index ad318983..fac2f340 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbAutoDetect.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbAutoDetect.java @@ -13,14 +13,14 @@ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Tests for verifying auto-detection settings with JAXB annotations. * * @author Tatu Saloranta */ -public class TestJaxbAutoDetect extends BaseJaxbTest +public class TestJaxbAutoDetect extends ModuleTestBase { /* /********************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbFieldAccess.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbFieldAccess.java index 0db62089..8b97424d 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbFieldAccess.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestJaxbFieldAccess.java @@ -6,9 +6,9 @@ import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; -public class TestJaxbFieldAccess extends BaseJaxbTest +public class TestJaxbFieldAccess extends ModuleTestBase { /* /********************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestPropertyOrdering.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestPropertyOrdering.java index 70e74a46..7be58ec8 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestPropertyOrdering.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestPropertyOrdering.java @@ -4,10 +4,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; public class TestPropertyOrdering - extends BaseJaxbTest + extends ModuleTestBase { @XmlType(propOrder = {"cparty", "contacts"}) @XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL) diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestPropertyVisibility.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestPropertyVisibility.java index 8fe889c3..6dc701d9 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestPropertyVisibility.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestPropertyVisibility.java @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; public class TestPropertyVisibility - extends BaseJaxbTest + extends ModuleTestBase { @XmlAccessorType(XmlAccessType.NONE) protected static class Bean354 diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestXmlValue.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestXmlValue.java index e55e593d..66d667de 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestXmlValue.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/introspect/TestXmlValue.java @@ -8,9 +8,9 @@ import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; -public class TestXmlValue extends BaseJaxbTest +public class TestXmlValue extends ModuleTestBase { static class WithXmlValueNoOverride { diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestDeserializerCaching.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestDeserializerCaching.java index 3c2514c4..184282a7 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestDeserializerCaching.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestDeserializerCaching.java @@ -5,9 +5,9 @@ import com.fasterxml.jackson.databind.deser.BeanDeserializer; import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; -public class TestDeserializerCaching extends BaseJaxbTest +public class TestDeserializerCaching extends ModuleTestBase { /* /********************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestElementWrapper.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestElementWrapper.java index 4870e1d8..9510089f 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestElementWrapper.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestElementWrapper.java @@ -8,12 +8,12 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Unit tests to verify handling of @XmlElementWrapper annotation. */ -public class TestElementWrapper extends BaseJaxbTest +public class TestElementWrapper extends ModuleTestBase { /* /********************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestEnums.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestEnums.java index a48caaf8..5fa153c1 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestEnums.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestEnums.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; -public class TestEnums extends BaseJaxbTest +public class TestEnums extends ModuleTestBase { enum Plain { A, B; } diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestJaxbNullProperties.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestJaxbNullProperties.java index 96190cc6..97c63231 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestJaxbNullProperties.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestJaxbNullProperties.java @@ -10,14 +10,14 @@ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector; import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Unit tests to ensure that handling of writing of null properties (or not) * works when using JAXB annotation introspector. */ public class TestJaxbNullProperties - extends BaseJaxbTest + extends ModuleTestBase { /* /********************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestRootName.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestRootName.java index d4739890..5426d4fe 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestRootName.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestRootName.java @@ -5,9 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; -public class TestRootName extends BaseJaxbTest +public class TestRootName extends ModuleTestBase { /* /********************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestSchemaGeneration.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestSchemaGeneration.java index b13cbbd6..bbb85521 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestSchemaGeneration.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestSchemaGeneration.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.jsonschema.JsonSchema; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Test(s) to see that JAXB annotations-based information is properly @@ -16,7 +16,7 @@ * @author tatu */ @SuppressWarnings("deprecation") -public class TestSchemaGeneration extends BaseJaxbTest +public class TestSchemaGeneration extends ModuleTestBase { @XmlAccessorType(XmlAccessType.FIELD) protected static class Person { diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestSerializationInclusion.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestSerializationInclusion.java index af2d8bc7..ccf66c4c 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestSerializationInclusion.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestSerializationInclusion.java @@ -9,9 +9,9 @@ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; -public class TestSerializationInclusion extends BaseJaxbTest +public class TestSerializationInclusion extends ModuleTestBase { static class Data { private final List stuff = new java.util.ArrayList(); diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestXmlAnyElementWithElementRef.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestXmlAnyElementWithElementRef.java index db4c3cd2..f11df7d1 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestXmlAnyElementWithElementRef.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/misc/TestXmlAnyElementWithElementRef.java @@ -6,10 +6,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; public class TestXmlAnyElementWithElementRef - extends BaseJaxbTest + extends ModuleTestBase { static class Bean { @XmlAnyElement(lax=true) diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/TestVirtualProperties.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/TestVirtualProperties.java index 1ac5a1d8..f9e070f5 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/TestVirtualProperties.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/TestVirtualProperties.java @@ -14,13 +14,13 @@ import com.fasterxml.jackson.databind.ser.VirtualBeanPropertyWriter; import com.fasterxml.jackson.databind.util.Annotations; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; //Copied from [com.fasterxml.jackson.databind.ser] /** * Tests for verifying that one can append virtual properties after regular ones. */ -public class TestVirtualProperties extends BaseJaxbTest +public class TestVirtualProperties extends ModuleTestBase { @JsonAppend(attrs={ @JsonAppend.Attr("id"), @JsonAppend.Attr(value="internal", propName="extra", required=true) diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/OptionalTypeRefinementTest.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/OptionalTypeRefinementTest.java index 7941d8dd..1888771c 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/OptionalTypeRefinementTest.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/OptionalTypeRefinementTest.java @@ -4,10 +4,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; // [jaxb-annotations#63] -public class OptionalTypeRefinementTest extends BaseJaxbTest +public class OptionalTypeRefinementTest extends ModuleTestBase { static class Stuff63 { public AtomicReference value = new AtomicReference("abc"); diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/PolymorpicTestBase.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/PolymorpicTestBase.java index 9b70407c..e26ca94e 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/PolymorpicTestBase.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/PolymorpicTestBase.java @@ -2,9 +2,9 @@ import jakarta.xml.bind.annotation.XmlRootElement; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; -abstract class PolymorpicTestBase extends BaseJaxbTest +abstract class PolymorpicTestBase extends ModuleTestBase { static abstract class Animal { public String nickname; diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestCyclicTypes.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestCyclicTypes.java index 36aa5384..1ec7c78d 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestCyclicTypes.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestCyclicTypes.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Simple unit tests to verify that it is possible to handle @@ -15,7 +15,7 @@ * trees and DAGs. */ public class TestCyclicTypes - extends BaseJaxbTest + extends ModuleTestBase { /* /********************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestJaxbTypeCoercion1023.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestJaxbTypeCoercion1023.java index bed88d1d..dc5dbf31 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestJaxbTypeCoercion1023.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestJaxbTypeCoercion1023.java @@ -3,10 +3,10 @@ import jakarta.xml.bind.annotation.XmlElement; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; // Failing temporarily due to [databind#1023] -public class TestJaxbTypeCoercion1023 extends BaseJaxbTest +public class TestJaxbTypeCoercion1023 extends ModuleTestBase { /* /********************************************************** diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestJaxbTypes.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestJaxbTypes.java index 20e48b05..873e34ba 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestJaxbTypes.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/types/TestJaxbTypes.java @@ -10,13 +10,13 @@ import com.fasterxml.jackson.databind.*; -import com.fasterxml.jackson.module.jakarta.xmlbind.BaseJaxbTest; +import com.fasterxml.jackson.module.jakarta.xmlbind.ModuleTestBase; /** * Tests for handling of type-related JAXB annotations */ public class TestJaxbTypes - extends BaseJaxbTest + extends ModuleTestBase { static class AbstractWrapper { @XmlElement(type=BeanImpl.class) diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/BaseJaxbTest.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/BaseJaxbTest.java index 2ea93302..8c016a40 100644 --- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/BaseJaxbTest.java +++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/BaseJaxbTest.java @@ -114,7 +114,7 @@ public String quote(String str) { return '"'+str+'"'; } - protected static String aposToQuotes(String json) { + protected static String a2q(String json) { return json.replace("'", "\""); } } diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java index d8d1346b..71d9492c 100644 --- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java +++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/failing/TestXmlID3.java @@ -60,7 +60,7 @@ public void testIssue46() throws Exception //System.err.println("->\n"+mapper.writeValueAsString(idList)); - assertEquals(aposToQuotes( + assertEquals(a2q( "{'elements':[{'id':'1','name':'name1'},{'id':'1','name':'name1'}],'parent':{'id':'1','name':'name1'}}"), mapper.writeValueAsString(idList)); } diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java index b6a0a2a2..f73ff664 100644 --- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java +++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestPropertyVisibility.java @@ -113,7 +113,14 @@ public void testJacksonSerialization() public void testNoneAccessWithXmlElements() throws Exception { NoneAccessBean input = new NoneAccessBean(new Foo44()); - assertEquals(aposToQuotes("{'object':{'foo':{'foo':'bar'}},'other':null}"), + + /* Earlier + assertEquals(a2q("{'object':{'foo':{'foo':'bar'}},'other':null}"), MAPPER.writeValueAsString(input)); + */ + + assertTrue( + a2q("{'object':{'foo':{'foo':'bar'}},'other':null}").equals(MAPPER.writeValueAsString(input)) + || a2q("{'other':null,'object':{'foo':{'foo':'bar'}}}").equals(MAPPER.writeValueAsString(input))); } } diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/ser/TestVirtualProperties.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/ser/TestVirtualProperties.java index 9941a02a..2beed483 100644 --- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/ser/TestVirtualProperties.java +++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/ser/TestVirtualProperties.java @@ -101,12 +101,12 @@ public void testAttributeProperties() throws Exception String json = WRITER.withAttribute("id", "abc123") .withAttribute("internal", stuff) .writeValueAsString(new SimpleBean()); - assertEquals(aposToQuotes("{'value':13,'id':'abc123','extra':{'x':3,'y':'B'}}"), json); + assertEquals(a2q("{'value':13,'id':'abc123','extra':{'x':3,'y':'B'}}"), json); json = WRITER.withAttribute("id", "abc123") .withAttribute("internal", stuff) .writeValueAsString(new SimpleBeanPrepend()); - assertEquals(aposToQuotes("{'id':'abc123','extra':{'x':3,'y':'B'},'value':13}"), json); + assertEquals(a2q("{'id':'abc123','extra':{'x':3,'y':'B'},'value':13}"), json); } public void testAttributePropInclusion() throws Exception @@ -114,22 +114,22 @@ public void testAttributePropInclusion() throws Exception // first, with desc String json = WRITER.withAttribute("desc", "nice") .writeValueAsString(new OptionalsBean()); - assertEquals(aposToQuotes("{'value':28,'desc':'nice'}"), json); + assertEquals(a2q("{'value':28,'desc':'nice'}"), json); // then with null (not defined) json = WRITER.writeValueAsString(new OptionalsBean()); - assertEquals(aposToQuotes("{'value':28}"), json); + assertEquals(a2q("{'value':28}"), json); // and finally "empty" json = WRITER.withAttribute("desc", "") .writeValueAsString(new OptionalsBean()); - assertEquals(aposToQuotes("{'value':28}"), json); + assertEquals(a2q("{'value':28}"), json); } public void testCustomProperties() throws Exception { String json = WRITER.withAttribute("desc", "nice") .writeValueAsString(new CustomVBean()); - assertEquals(aposToQuotes("{'id':'abc123','extra':[42],'value':72}"), json); + assertEquals(a2q("{'id':'abc123','extra':[42],'value':72}"), json); } }