Merge branch '2.19'

Author: cowtowncoder

src/test/java/tools/jackson/dataformat/xml/FeatureDefaultsTest.java

@@ -1,18 +1,24 @@
 package tools.jackson.dataformat.xml;
 
+import org.junit.jupiter.api.Test;
+
 import tools.jackson.databind.ObjectReader;
 import tools.jackson.databind.ObjectWriter;
 
-public class FeatureDefaultsTest extends XmlTestBase
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
+public class FeatureDefaultsTest extends XmlTestUtil
 {
     private final XmlMapper MAPPER = newMapper();
 
+    @Test
     public void testDeserDefaults() throws Exception
     {
         ObjectReader r = MAPPER.reader();
         assertNotSame(r, r.with(XmlReadFeature.EMPTY_ELEMENT_AS_NULL));
     }
 
+    @Test
     public void testSerDefaults() throws Exception
     {
         ObjectWriter w = MAPPER.writer();

src/test/java/tools/jackson/dataformat/xml/JDKSerializationForXMLMapperTest.java

@@ -1,12 +1,14 @@
 package tools.jackson.dataformat.xml;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import java.io.*;
 
-public class JDKSerializationForXMLMapperTest extends XmlTestBase
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class JDKSerializationForXMLMapperTest extends XmlTestUtil
 {
+    @Test
     public void testMapperSerialization() throws Exception
     {
         XmlMapper mapper1 = new XmlMapper(XmlFactory.builder()

src/test/java/tools/jackson/dataformat/xml/MapperCopyTest.java

@@ -2,18 +2,23 @@
 
 import java.io.*;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonRootName;
 
 import tools.jackson.databind.*;
 
-public class MapperCopyTest extends XmlTestBase
+import static org.junit.jupiter.api.Assertions.*;
+
+public class MapperCopyTest extends XmlTestUtil
 {
     @JsonRootName("AnnotatedName")
     static class Pojo282
     {
         public int a = 3;
     }
 
+    @Test
     public void testMapperCopy()
     {
         XmlMapper mapper1 = mapperBuilder()
@@ -41,12 +46,13 @@ public void testMapperCopy()
         SerializationConfig sc2 = mapper2.serializationConfig();
         assertNotSame(sc1, sc2);
         assertEquals(
-            "serialization features did not get copied",
             sc1.getSerializationFeatures(),
-            sc2.getSerializationFeatures()
+            sc2.getSerializationFeatures(),
+            "serialization features did not get copied"
         );
     }
 
+    @Test
     public void testMapperSerialization() throws Exception
     {
         XmlMapper mapper1 = mapperBuilder()
@@ -67,6 +73,7 @@ public void testMapperSerialization() throws Exception
     }
 
     // [dataformat-xml#282]
+    @Test
     public void testCopyWith() throws Exception
     {
         XmlMapper xmlMapper = newMapper();

src/test/java/tools/jackson/dataformat/xml/MediaItem.java

@@ -1,11 +1,12 @@
 package tools.jackson.dataformat.xml;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 @JsonPropertyOrder({"content", "images"})
-class MediaItem
+public class MediaItem
 {
     public enum Player { JAVA, FLASH;  }
     public enum Size { SMALL, LARGE; }

src/test/java/tools/jackson/dataformat/xml/RoundtripContentTest.java

@@ -1,13 +1,19 @@
 package tools.jackson.dataformat.xml;
 
+import org.junit.jupiter.api.Test;
+
 import tools.jackson.databind.ObjectReader;
 import tools.jackson.databind.ObjectWriter;
 
-public class RoundtripContentTest extends XmlTestBase
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class RoundtripContentTest extends XmlTestUtil
 {
     // Let's use globally shared instance for funsies
     private final XmlMapper MAPPER = XmlMapper.shared();
 
+    @Test
     public void testRoundtrip() throws Exception
     {
         MediaItem.Content content = new MediaItem.Content();

src/test/java/tools/jackson/dataformat/xml/VersionInfoTest.java

@@ -1,10 +1,16 @@
 package tools.jackson.dataformat.xml;
 
+import org.junit.jupiter.api.Test;
+
 import tools.jackson.core.Version;
 import tools.jackson.core.Versioned;
 
-public class VersionInfoTest extends XmlTestBase
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+public class VersionInfoTest extends XmlTestUtil
 {
+    @Test
     public void testMapperVersions()
     {
         assertVersion(new XmlMapper());
@@ -20,7 +26,7 @@ public void testMapperVersions()
     private void assertVersion(Versioned vers)
     {
         final Version v = vers.version();
-        assertFalse("Should find version information (got "+v+")", v.isUnknownVersion());
+        assertFalse(v.isUnknownVersion(), "Should find version information (got "+v+")");
         Version exp = PackageVersion.VERSION;
         assertEquals(exp.toFullString(), v.toFullString());
         assertEquals(exp, v);

src/test/java/tools/jackson/dataformat/xml/XmlTestBase.java

@@ -18,7 +18,6 @@
 public abstract class XmlTestBase
     extends TestCase
 {
-
     protected static final String DEFAULT_NEW_LINE;
 
     static {

src/test/java/tools/jackson/dataformat/xml/XmlTestUtil.java

@@ -7,11 +7,11 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import tools.jackson.core.*;
 import tools.jackson.databind.AnnotationIntrospector;
-import tools.jackson.databind.type.TypeFactory;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import tools.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class XmlTestUtil
 {
@@ -278,7 +278,7 @@ protected String getAndVerifyText(JsonParser jp)
         if (str.length() !=  actLen) {
             fail("Internal problem (jp.token == "+jp.currentToken()+"): jp.getText().length() ['"+str+"'] == "+str.length()+"; jp.getTextLength() == "+actLen);
         }
-        assertEquals("String access via getText(), getTextXxx() must be the same", str, str2);
+        assertEquals(str, str2, "String access via getText(), getTextXxx() must be the same");
 
         return str;
     }

src/test/java/tools/jackson/dataformat/xml/adapters/TestIssue47Attribute.java

@@ -4,10 +4,11 @@
 
 import org.junit.jupiter.api.Test;
 
-import tools.jackson.dataformat.xml.*;
+import tools.jackson.dataformat.xml.XmlMapper;
+import tools.jackson.dataformat.xml.XmlTestUtil;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class TestIssue47Attribute extends XmlTestUtil
 {

src/test/java/tools/jackson/dataformat/xml/deser/CaseInsensitiveDeserTest.java

@@ -10,13 +10,15 @@
 
 import tools.jackson.databind.*;
 import tools.jackson.databind.exc.UnrecognizedPropertyException;
-import tools.jackson.dataformat.xml.XmlTestBase;
+import tools.jackson.dataformat.xml.XmlTestUtil;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlText;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 // note: Copied from `jackson-databind`; related to [dataformat-xml#273]
-public class CaseInsensitiveDeserTest extends XmlTestBase
+public class CaseInsensitiveDeserTest extends XmlTestUtil
 {
     static class BaseResponse {
         public int errorCode;
@@ -105,6 +107,7 @@ public void testCaseInsensitiveBasic() throws Exception
         }
     }
 
+    @Test
     public void testCreatorWithInsensitive() throws Exception
     {
         final String DOC = "<root><VALUE>3</VALUE></root>";