Minor test fixes (backport from master)

Author: cowtowncoder

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

@@ -230,15 +230,18 @@ protected static XmlMapper.Builder mapperBuilder() {
         return XmlMapper.builder();
     }
 
+    protected static XmlMapper.Builder mapperBuilder(boolean useListWrapping) {
+        return XmlMapper.builder()
+                .defaultUseWrapper(useListWrapping);
+    }
+
     protected static XmlMapper.Builder mapperBuilder(XmlFactory f) {
         return XmlMapper.builder(f);
     }
 
     protected XmlMapper xmlMapper(boolean useListWrapping)
     {
-        JacksonXmlModule module = new JacksonXmlModule();
-        module.setDefaultUseWrapper(useListWrapping);
-        return new XmlMapper(module);
+        return mapperBuilder(useListWrapping).build();
     }
 
     protected AnnotationIntrospector jakartaXMLBindAnnotationIntrospector() {

src/test/java/com/fasterxml/jackson/dataformat/xml/deser/builder/BuilderSimpleTest.java

@@ -349,15 +349,15 @@ public void testBuilderMethodReturnMoreGeneral() throws Exception
     @Test
     public void testBuilderMethodReturnMoreSpecific() throws Exception
     {
-        final String json = "<ValueInterface2><x>1</x></ValueInterface2>}";
+        final String json = "<ValueInterface2><x>1</x></ValueInterface2>";
         ValueInterface2 value = MAPPER.readValue(json, ValueInterface2.class);
         assertEquals(2, value.getX());
     }
 
     @Test
     public void testSelfBuilder777() throws Exception
     {
-        SelfBuilder777 result = MAPPER.readValue("<SelfBuilder777><x>3</x></SelfBuilder777>'",
+        SelfBuilder777 result = MAPPER.readValue("<SelfBuilder777><x>3</x></SelfBuilder777>",
                 SelfBuilder777.class);
         assertNotNull(result);
         assertEquals(3, result.x);

src/test/java/com/fasterxml/jackson/dataformat/xml/incr/PartialReadTest.java

@@ -28,9 +28,8 @@ public void testSimpleRead() throws Exception
         assertEquals(sr.next(), XMLStreamConstants.START_ELEMENT);
         assertEquals("root", sr.getLocalName());
 
-        /* 30-May-2014, tatu: This is bit tricky... need to ensure that currently
-         *    pointed to START_ELEMENT is sort of re-read.
-         */
+        // 30-May-2014, tatu: This is bit tricky... need to ensure that currently
+        //    pointed to START_ELEMENT is sort of re-read.
         assertEquals(sr.next(), XMLStreamConstants.START_ELEMENT);
         assertEquals("NameBean", sr.getLocalName());