Merge branch '2.11' into 2.12

Author: cowtowncoder

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

@@ -2,8 +2,10 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
@@ -44,13 +46,35 @@ public StringListBean(String... texts)
         }
     }
 
+    // [dataformat-xml#148]
+    static class Bean148 {
+        @JsonProperty("item")
+        @JacksonXmlElementWrapper(localName = "list")
+        public Iterator<String> items() {
+          return new Iterator<String>() {
+            int item = 3;
+
+            @Override
+            public boolean hasNext() {
+              return item > 0;
+            }
+
+            @Override
+            public String next() {
+              item--;
+              return Integer.toString(item);
+            }
+          };
+        }
+    }
+
     /*
     /**********************************************************
     /* Unit tests
     /**********************************************************
      */
 
-    private final XmlMapper MAPPER = new XmlMapper();
+    private final XmlMapper MAPPER = newMapper();
 
     public void testSimpleWrappedList() throws IOException
     {
@@ -70,4 +94,11 @@ public void testStringList() throws IOException
                 +"<strings><text>c</text></strings>"
                 +"</stringList></StringListBean>", xml);
     }
+
+    // [dataformat-xml#148]
+    public void testIteratorSerialization() throws Exception
+    {
+        assertEquals("<Bean148><item>2</item><item>1</item><item>0</item></Bean148>",
+                MAPPER.writeValueAsString(new Bean148()).trim());
+    }
 }