Test refactoring; JsonNode test wrt #402

Author: cowtowncoder

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

@@ -298,8 +298,8 @@ protected void verifyException(Throwable e, String... matches)
     /**********************************************************
      */
 
-    protected static String aposToQuotes(String json) {
-        return json.replace("'", "\"");
+    protected static String a2q(String content) {
+        return content.replace("'", "\"");
     }
 
     protected byte[] utf8Bytes(String str) {

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/JsonNodeDeser403Test.java renamed to src/test/java/com/fasterxml/jackson/dataformat/xml/deser/JsonNodeBasicDeserTest.java

@@ -3,15 +3,16 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
+
 import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
 
-public class JsonNodeDeser403Test extends XmlTestBase
+public class JsonNodeBasicDeserTest extends XmlTestBase
 {
-    final private ObjectMapper MAPPER = newMapper();
+    final private ObjectMapper XML_MAPPER = newMapper();
 
     public void testSimpleNode() throws Exception
     {
-        JsonNode root = MAPPER.readTree("<root attr='123' />");
+        JsonNode root = XML_MAPPER.readTree("<root attr='123' />");
         assertTrue(root.isObject());
         assertEquals(1, root.size());
         assertEquals("123", root.get("attr").textValue());
@@ -20,7 +21,7 @@ public void testSimpleNode() throws Exception
     // [dataformat-xml#403]: Allow sequences
     public void testRepeated() throws Exception
     {
-        JsonNode root = MAPPER.readTree("<root><value>a</value><value>b</value></root>");
+        JsonNode root = XML_MAPPER.readTree("<root><value>a</value><value>b</value></root>");
         assertTrue(root.isObject());
         JsonNode arr = root.get("value");
         assertEquals(JsonNodeType.ARRAY, arr.getNodeType());

src/test/java/com/fasterxml/jackson/dataformat/xml/failing/JsonNodeMixedContentTest.java

@@ -0,0 +1,40 @@
+package com.fasterxml.jackson.dataformat.xml.failing;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
+
+public class JsonNodeMixedContentTest extends XmlTestBase
+{
+    final private ObjectMapper XML_MAPPER = newMapper();
+
+    final private ObjectMapper JSON_MAPPER = new JsonMapper();
+
+    public void testMixedContentBefore() throws Exception
+    {
+        // First, before elements:
+        assertEquals(JSON_MAPPER.readTree(a2q("{'':'before','a':1,'b':'2'}")),
+                XML_MAPPER.readTree("<root>before<a>1</a><b>2</b></root>"));
+    }
+
+    public void testMixedContentBetween() throws Exception
+    {
+        // Second, between
+        assertEquals(JSON_MAPPER.readTree(a2q("{'a':1,'':'between','b':'2'}")),
+                XML_MAPPER.readTree("<root><a>1</a>between<b>2</b></root>"));
+    }
+
+    public void testMixedContentAfter() throws Exception
+    {
+        // and then after
+        assertEquals(JSON_MAPPER.readTree(a2q("{'a':1,'b':'2','':'after'}")),
+                XML_MAPPER.readTree("<root><a>1</a><b>2</b>after</root>"));
+    }
+
+    public void testMultipleMixedContent() throws Exception
+    {
+        // and then after
+        assertEquals(JSON_MAPPER.readTree(a2q("{'':['first','second','third'],'a':1,'b':'2','':'after'}")),
+                XML_MAPPER.readTree("<root>first<a>1</a>second<b>2</b>this</root>"));
+    }
+}

src/test/java/com/fasterxml/jackson/dataformat/xml/ser/TestIndentation.java

@@ -173,7 +173,7 @@ public void testMultiLevel172() throws Exception
                 .with(ToXmlGenerator.Feature.WRITE_XML_DECLARATION)
                 .writeValueAsString(root);
         // unify possible apostrophes to quotes
-        xml = aposToQuotes(xml);
+        xml = a2q(xml);
         // with indentation, should get linefeeds in prolog/epilog too
         assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                 +"<Company>\n"