minor test cleanup

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/dataformat/xml/lists/ListDeser469Test.java

@@ -51,10 +51,11 @@ protected InnerBean2() { }
         public InnerBean2(String s) { str2 = s; }
     }
 
-    private final XmlMapper MAPPER = newMapper();
-
     public void testIssue469() throws Exception
     {
+        // Here we just use default settings (which defaults to wrappers)
+        final XmlMapper mapper = newMapper();
+
         // First: create POJO value to test round-trip:
         {
             OuterBean source = new OuterBean();
@@ -63,10 +64,10 @@ public void testIssue469() throws Exception
             items.add(new InnerBean2("foo"));
             source.middle.inner2 = items;
 
-            String xml = MAPPER.writerWithDefaultPrettyPrinter()
+            String xml = mapper.writerWithDefaultPrettyPrinter()
                     .writeValueAsString(source);
 
-            OuterBean result = MAPPER.readValue(xml, OuterBean.class);
+            OuterBean result = mapper.readValue(xml, OuterBean.class);
 
             MiddleBean mid = result.middle;
             assertNotNull(mid);
@@ -83,7 +84,7 @@ public void testIssue469() throws Exception
             "  </Middle>\n" +
             "</OuterBean>\n";
 
-        OuterBean outer = MAPPER.readValue(xmlInput, OuterBean.class);
+        OuterBean outer = mapper.readValue(xmlInput, OuterBean.class);
 
         MiddleBean mid = outer.middle;
         assertNotNull(mid);

src/test/java/com/fasterxml/jackson/dataformat/xml/lists/ListSerializationTest.java

@@ -6,6 +6,7 @@
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.JacksonXmlAnnotationIntrospector;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
@@ -81,6 +82,17 @@ public void testSimpleWrappedList() throws IOException
         String xml = MAPPER.writeValueAsString(new ListBean(1, 2, 3));
         xml = removeSjsxpNamespace(xml);
         assertEquals("<ListBean><values><values>1</values><values>2</values><values>3</values></values></ListBean>", xml);
+
+        // for [dataformat-xml#469] try forcing wrapping:
+        XmlMapper unwrapMapper = XmlMapper.builder()
+                .annotationIntrospector(new JacksonXmlAnnotationIntrospector(false))
+                .build();
+        xml = unwrapMapper.writeValueAsString(new ListBean(1, 2, 3));
+        xml = removeSjsxpNamespace(xml);
+        assertEquals("<ListBean>"
+                +"<values>1</values><values>2</values><values>3</values>"
+                +"</ListBean>",
+                xml);
     }
 
     public void testStringList() throws IOException