Merge branch '2.19'

Author: cowtowncoder

pom.xml

@@ -181,21 +181,6 @@ alternative support for serializing POJOs as XML and deserializing XML as pojos.
         <groupId>com.google.code.maven-replacer-plugin</groupId>
         <artifactId>replacer</artifactId>
       </plugin>
-      <!--  Need to skip known-failing tests for build... -->
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${version.plugin.surefire}</version>
-          <configuration>
-            <excludes>
-              <exclude>**/failing/**/*.java</exclude>
-            </excludes>
-            <includes>
-              <include>**/Test*.java</include>
-              <include>**/*Test.java</include>
-            </includes>
-          </configuration>
-        </plugin>
       <!-- 05-Jul-2020, tatu: Add gradle module metadata -->
       <plugin>
         <groupId>de.jjohannes</groupId>

src/test/java/module-info.java

@@ -45,8 +45,6 @@
     opens tools.jackson.dataformat.xml.deser.convert;
     opens tools.jackson.dataformat.xml.deser.creator;
     opens tools.jackson.dataformat.xml.dos;
-    opens tools.jackson.dataformat.xml.failing;
-    opens tools.jackson.dataformat.xml.failing.records;
     opens tools.jackson.dataformat.xml.fuzz;
     opens tools.jackson.dataformat.xml.jaxb;
     opens tools.jackson.dataformat.xml.incr;
@@ -55,6 +53,9 @@
     opens tools.jackson.dataformat.xml.misc;
     opens tools.jackson.dataformat.xml.node;
     opens tools.jackson.dataformat.xml.stream;
+    opens tools.jackson.dataformat.xml.tofix;
+    opens tools.jackson.dataformat.xml.tofix.records;
+    opens tools.jackson.dataformat.xml.testutil.failure;
     opens tools.jackson.dataformat.xml.vld;
     opens tools.jackson.dataformat.xml.woodstox;
 }

src/test/java/tools/jackson/dataformat/xml/failing/XmlWrapperClass517Test.java

@@ -1,4 +1,4 @@
-package tools.jackson.dataformat.xml.failing;
+package tools.jackson.dataformat.xml.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -8,6 +8,7 @@
 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.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -54,6 +55,7 @@ public BeanInfo() { }
      */
 
     // [dataformat-xml#27]
+    @JacksonTestFailureExpected
     @Test
     public void testIssue27() throws Exception
     {

src/test/java/tools/jackson/dataformat/xml/failing/ConflictingGetters27Test.java renamed to src/test/java/tools/jackson/dataformat/xml/tofix/ConflictingGetters27Test.java

@@ -1,4 +1,4 @@
-package tools.jackson.dataformat.xml.failing;
+package tools.jackson.dataformat.xml.tofix;
 
 import java.util.Arrays;
 import java.util.List;
@@ -13,6 +13,7 @@
 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.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -50,6 +51,7 @@ public Body149(@JacksonXmlProperty(localName="type")
     private final ObjectMapper MAPPER = newMapper();
 
     // [dataformat-xml#149]
+    @JacksonTestFailureExpected
     @Test
     public void testElementWrapper149() throws Exception
     {

src/test/java/tools/jackson/dataformat/xml/failing/ElementWrapperViaCreator149Test.java renamed to src/test/java/tools/jackson/dataformat/xml/tofix/ElementWrapperViaCreator149Test.java

@@ -1,11 +1,12 @@
-package tools.jackson.dataformat.xml.failing;
+package tools.jackson.dataformat.xml.tofix;
 
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import tools.jackson.dataformat.xml.XmlMapper;
 import tools.jackson.dataformat.xml.XmlTestUtil;
+import tools.jackson.dataformat.xml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -33,6 +34,7 @@ public UntypedEnumBean() { }
 
     private final XmlMapper MAPPER = newMapper();
 
+    @JacksonTestFailureExpected
     @Test
     public void testUntypedEnum() throws Exception
     {

src/test/java/tools/jackson/dataformat/xml/failing/EnumIssue9Test.java renamed to src/test/java/tools/jackson/dataformat/xml/tofix/EnumIssue9Test.java

@@ -1,4 +1,4 @@
-package tools.jackson.dataformat.xml.failing;
+package tools.jackson.dataformat.xml.tofix;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -15,6 +15,7 @@
 import tools.jackson.databind.*;
 import tools.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import tools.jackson.dataformat.xml.*;
+import tools.jackson.dataformat.xml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -127,6 +128,7 @@ public void setUp() throws Exception
     /**********************************************************************
      */
 
+    @JacksonTestFailureExpected
     @Test
     public void testSimpleKeyMap() throws Exception
     {
@@ -137,6 +139,7 @@ public void testSimpleKeyMap() throws Exception
             _jaxbMapper.writeValueAsString(bean));
     }
 
+    @JacksonTestFailureExpected
     @Test
     public void testNeedEncodingKeyMap() throws Exception
     {
@@ -149,6 +152,7 @@ public void testNeedEncodingKeyMap() throws Exception
                 xml);
     }
 
+    @JacksonTestFailureExpected
     @Test
     public void testSimpleKeyMapSimpleAnnotation() throws Exception
     {
@@ -160,6 +164,7 @@ public void testSimpleKeyMapSimpleAnnotation() throws Exception
             _jaxbMapper.writeValueAsString(bean));
     }
 
+    @JacksonTestFailureExpected
     @Test
     public void testNeedEncodingKeyMapSimpleAnnotation() throws Exception
     {
@@ -171,6 +176,7 @@ public void testNeedEncodingKeyMapSimpleAnnotation() throws Exception
             _jaxbMapper.writeValueAsString(bean));
     }
 
+    @JacksonTestFailureExpected
     @Test
     public void testNeedEncodingKeyMap_nonJaxb() throws Exception
     {
@@ -182,6 +188,7 @@ public void testNeedEncodingKeyMap_nonJaxb() throws Exception
             _nonJaxbMapper.writeValueAsString(bean));
     }
 
+    @JacksonTestFailureExpected
     @Test
     public void testNeedEncodingKeyMapSimpleAnnotation_nonJaxb() throws Exception
     {

src/test/java/tools/jackson/dataformat/xml/failing/Issue37AdapterTest.java renamed to src/test/java/tools/jackson/dataformat/xml/tofix/Issue37AdapterTest.java

@@ -1,4 +1,4 @@
-package tools.jackson.dataformat.xml.failing;
+package tools.jackson.dataformat.xml.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -8,6 +8,7 @@
 import tools.jackson.dataformat.xml.XmlMapper;
 import tools.jackson.dataformat.xml.XmlTestUtil;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import tools.jackson.dataformat.xml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -39,6 +40,7 @@ static class Container {
 
     private final XmlMapper MAPPER = newMapper();
 
+    @JacksonTestFailureExpected
     @Test
     public void testAttributeDeser128() throws Exception
     {

src/test/java/tools/jackson/dataformat/xml/failing/PojoAsAttributeSer128Test.java renamed to src/test/java/tools/jackson/dataformat/xml/tofix/PojoAsAttributeSer128Test.java

@@ -1,11 +1,12 @@
-package tools.jackson.dataformat.xml.failing;
+package tools.jackson.dataformat.xml.tofix;
 
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import tools.jackson.dataformat.xml.XmlMapper;
 import tools.jackson.dataformat.xml.XmlTestUtil;
+import tools.jackson.dataformat.xml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -77,6 +78,7 @@ public ClassArrayWrapper() { }
      */
     // Does not work since array wrapping is not explicitly forced (unlike with collection
     // property of a bean
+    @JacksonTestFailureExpected
     @Test
     public void testAsClassArray() throws Exception
     {
@@ -89,6 +91,7 @@ public void testAsClassArray() throws Exception
 
     // Hmmh. Does not yet quite work either, since we do not properly force
     // array context when writing...
+    @JacksonTestFailureExpected
     @Test
     public void testAsWrappedClassArray() throws Exception
     {

src/test/java/tools/jackson/dataformat/xml/failing/PolymorphicIssue4Test.java renamed to src/test/java/tools/jackson/dataformat/xml/tofix/PolymorphicIssue4Test.java

@@ -1,4 +1,4 @@
-package tools.jackson.dataformat.xml.failing;
+package tools.jackson.dataformat.xml.tofix;
 
 import java.util.List;
 
@@ -9,9 +9,11 @@
 import tools.jackson.databind.*;
 import tools.jackson.databind.annotation.JsonTypeIdResolver;
 import tools.jackson.databind.jsontype.impl.TypeIdResolverBase;
+
 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.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -89,6 +91,7 @@ public JsonTypeInfo.Id getMechanism() {
     private final ObjectMapper MAPPER = newMapper();
 
     // [dataformat-xml#426]
+    @JacksonTestFailureExpected
     @Test
     public void testPolymorphicList426() throws Exception
     {