Minor cleanup for test

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/ToXmlGenerator.java

@@ -141,6 +141,11 @@ private Feature(boolean defaultState) {
 
     protected final IOContext _ioContext;
 
+    /**
+     * @since 2.16
+     */
+    protected final StreamWriteConstraints _streamWriteConstraints;
+
     /**
      * Bit flag composed of bits that indicate which
      * {@link ToXmlGenerator.Feature}s
@@ -225,6 +230,7 @@ public ToXmlGenerator(IOContext ctxt, int stdFeatures, int xmlFeatures,
         super(stdFeatures, codec);
         _formatFeatures = xmlFeatures;
         _ioContext = ctxt;
+        _streamWriteConstraints = ctxt.streamWriteConstraints();
         _originalXmlWriter = sw;
         _xmlWriter = Stax2WriterAdapter.wrapIfNecessary(sw);
         _stax2Emulation = (_xmlWriter != sw);
@@ -323,7 +329,7 @@ public JsonGenerator overrideFormatFeatures(int values, int mask)
 
     @Override
     public StreamWriteConstraints streamWriteConstraints() {
-        return _ioContext.streamWriteConstraints();
+        return _streamWriteConstraints;
     }
 
     public ToXmlGenerator enable(Feature f) {

src/test/java/com/fasterxml/jackson/dataformat/xml/ser/dos/CyclicDataSerTest.java renamed to src/test/java/com/fasterxml/jackson/dataformat/xml/ser/dos/CyclicXMLDataSerTest.java

@@ -1,32 +1,37 @@
 package com.fasterxml.jackson.dataformat.xml.ser.dos;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.fasterxml.jackson.core.StreamWriteConstraints;
-import com.fasterxml.jackson.databind.JsonMappingException;
+
+import com.fasterxml.jackson.databind.DatabindException;
+
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Simple unit tests to verify that we fail gracefully if you attempt to serialize
  * data that is cyclic (eg a list that contains itself).
  */
-public class CyclicDataSerTest extends XmlTestBase
+public class CyclicXMLDataSerTest extends XmlTestBase
 {
     private final XmlMapper MAPPER = newMapper();
 
     public void testListWithSelfReference() throws Exception {
-        List<Object> list = new ArrayList<>();
-        list.add(list);
+        // Avoid direct loop as serializer might be able to catch
+        List<Object> list1 = new ArrayList<>();
+        List<Object> list2 = new ArrayList<>();
+        list1.add(list2);
+        list2.add(list1);
         try {
-            MAPPER.writeValueAsString(list);
-            fail("expected JsonMappingException");
-        } catch (JsonMappingException jmex) {
+            MAPPER.writeValueAsString(list1);
+            fail("expected DatabindException for infinite recursion");
+        } catch (DatabindException e) {
             String exceptionPrefix = String.format("Document nesting depth (%d) exceeds the maximum allowed",
                     StreamWriteConstraints.DEFAULT_MAX_DEPTH + 1);
-            assertTrue("JsonMappingException message is as expected?",
-                    jmex.getMessage().startsWith(exceptionPrefix));
+            assertTrue("Exception message is as expected?",
+                    e.getMessage().startsWith(exceptionPrefix));
         }
     }
 }