[JSTEP-10] Migrate to JUnit 5 of part 2

src/test/java/com/fasterxml/jackson/dataformat/xml/FeatureDefaultsTest.java

@@ -1,20 +1,26 @@
 package com.fasterxml.jackson.dataformat.xml;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
 
-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(FromXmlParser.Feature.EMPTY_ELEMENT_AS_NULL));
     }
 
+    @Test
     public void testSerDefaults() throws Exception
     {
         ObjectWriter w = MAPPER.writer();

src/test/java/com/fasterxml/jackson/dataformat/xml/MapperCopyTest.java

@@ -2,21 +2,26 @@
 
 import java.io.*;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonRootName;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
 import com.fasterxml.jackson.dataformat.xml.ser.XmlSerializerProvider;
 import com.fasterxml.jackson.dataformat.xml.util.XmlRootNameLookup;
 
-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,18 +46,20 @@ public void testMapperCopy()
         SerializationConfig sc2 = mapper2.getSerializationConfig();
         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 testSerializerProviderCopy() {
         DefaultSerializerProvider provider = new XmlSerializerProvider(new XmlRootNameLookup());
         DefaultSerializerProvider copy = provider.copy();
         assertNotSame(provider, copy);
     }
 
+    @Test
     public void testMapperSerialization() throws Exception
     {
         XmlMapper mapper1 = mapperBuilder()
@@ -74,6 +81,7 @@ public void testMapperSerialization() throws Exception
 
     // [dataformat-xml#282]
     @SuppressWarnings("deprecation")
+    @Test
     public void testCopyWith() throws Exception
     {
         XmlMapper xmlMapper = newMapper();

src/test/java/com/fasterxml/jackson/dataformat/xml/MediaItem.java

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.dataformat.xml;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 

src/test/java/com/fasterxml/jackson/dataformat/xml/RoundtripContentTest.java

@@ -1,12 +1,18 @@
 package com.fasterxml.jackson.dataformat.xml;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.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
 {
     private final XmlMapper MAPPER = new XmlMapper();
 
+    @Test
     public void testRoundtrip() throws Exception
     {
         MediaItem.Content content = new MediaItem.Content();

src/test/java/com/fasterxml/jackson/dataformat/xml/VersionInfoTest.java

@@ -1,10 +1,16 @@
 package com.fasterxml.jackson.dataformat.xml;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.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/com/fasterxml/jackson/dataformat/xml/XmlTestBase.java

@@ -7,15 +7,11 @@
 import junit.framework.TestCase;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.AnnotationIntrospector;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-
-import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
-
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
 
 public abstract class XmlTestBase
     extends TestCase

src/test/java/com/fasterxml/jackson/dataformat/xml/XmlTestUtil.java

@@ -11,7 +11,8 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.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
 {
@@ -279,7 +280,7 @@ protected String getAndVerifyText(JsonParser jp)
         if (str.length() !=  actLen) {
             fail("Internal problem (jp.token == "+jp.getCurrentToken()+"): 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/com/fasterxml/jackson/dataformat/xml/adapters/TestIssue47Attribute.java

@@ -4,10 +4,11 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.fasterxml.jackson.dataformat.xml.*;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 import com.fasterxml.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/com/fasterxml/jackson/dataformat/xml/deser/CaseInsensitiveDeserTest.java

@@ -4,16 +4,13 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
-import com.fasterxml.jackson.dataformat.xml.*;
+
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
 
 import static org.junit.jupiter.api.Assertions.*;
 

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/CoerceFromEmptyStringTest.java

@@ -6,10 +6,11 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 
-import com.fasterxml.jackson.dataformat.xml.*;
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 // Note: copied from coercion tests of `jackson-databind`
 public class CoerceFromEmptyStringTest extends XmlTestUtil

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/DefaultTyping325Test.java

@@ -7,10 +7,11 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import com.fasterxml.jackson.dataformat.xml.*;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 import com.fasterxml.jackson.dataformat.xml.testutil.NoCheckSubTypeValidator;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class DefaultTyping325Test extends XmlTestUtil
 {

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/DelegatingCreator254Test.java

@@ -3,9 +3,12 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.dataformat.xml.*;
 
-import static org.junit.jupiter.api.Assertions.*;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class DelegatingCreator254Test extends XmlTestUtil
 {

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/DeserErrorHandling236Test.java

@@ -3,9 +3,10 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.dataformat.xml.*;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class DeserErrorHandling236Test extends XmlTestUtil
 {

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/ElementWithScalarAndAttr412Test.java

@@ -8,9 +8,9 @@
 
 import com.fasterxml.jackson.annotation.JsonRootName;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.*;
 
 import static org.junit.jupiter.api.Assertions.*;
 

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/EmptyBeanDeser318Test.java

@@ -4,11 +4,11 @@
 
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
 
-import com.fasterxml.jackson.dataformat.xml.*;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 public class EmptyBeanDeser318Test extends XmlTestUtil

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/EmptyStringValueTest.java

@@ -7,7 +7,8 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.dataformat.xml.*;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
 import static org.junit.jupiter.api.Assertions.*;

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/EmptyWithScalarsTest.java

@@ -8,8 +8,8 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
-
-import com.fasterxml.jackson.dataformat.xml.*;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 
 import static org.junit.jupiter.api.Assertions.*;

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/EnumDeserTest.java

@@ -4,10 +4,11 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 
-import com.fasterxml.jackson.dataformat.xml.*;
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class EnumDeserTest extends XmlTestUtil
 {

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/ExceptionDeserializationTest.java

@@ -4,9 +4,11 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.fasterxml.jackson.dataformat.xml.*;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class ExceptionDeserializationTest extends XmlTestUtil
 {

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/Issue274PropertyNameTest.java

@@ -4,11 +4,10 @@
 
 import com.fasterxml.jackson.annotation.JsonRootName;
 import com.fasterxml.jackson.databind.*;
-
-import com.fasterxml.jackson.dataformat.xml.*;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 // [dataformat-xml#274]: Actually passes... can not reproduce failure
 public class Issue274PropertyNameTest extends XmlTestUtil

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/MapDeserializationTest.java

@@ -1,14 +1,14 @@
 package com.fasterxml.jackson.dataformat.xml.deser;
 
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
 
 import org.junit.jupiter.api.Test;
 
-import com.fasterxml.jackson.dataformat.xml.*;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class MapDeserializationTest extends XmlTestUtil
 {

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/MapWithDupsDeser498Test.java

@@ -6,10 +6,10 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestUtil;
 
-import com.fasterxml.jackson.dataformat.xml.*;
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class MapWithDupsDeser498Test extends XmlTestUtil
 {