...

Author: cowtowncoder

src/test/java/tools/jackson/dataformat/xml/dos/CyclicXMLDataSerTest.java

@@ -1,7 +1,7 @@
 package tools.jackson.dataformat.xml.dos;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
@@ -17,26 +17,29 @@
 
 /**
  * Simple unit tests to verify that we fail gracefully if you attempt to serialize
- * data that is cyclic (eg a list that contains itself).
+ * data that is cyclic (eg a map that contains itself).
  */
 public class CyclicXMLDataSerTest extends XmlTestUtil
 {
     private final XmlMapper MAPPER = newMapper();
 
     @Test
-    public void testListWithSelfReference() throws Exception {
-        // 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);
+    public void testMapWithSelfReference() throws Exception {
+        // Use Maps (rather than Lists) so the cycle exercises object-nesting
+        // depth without tripping XmlWriteFeature.FAIL_ON_NESTED_ARRAYS.
+        // Two distinct Maps avoid trivial self-loop detection.
+        Map<String, Object> map1 = new HashMap<>();
+        Map<String, Object> map2 = new HashMap<>();
+        map1.put("ref", map2);
+        map2.put("ref", map1);
         try {
-            MAPPER.writeValueAsString(list1);
+            MAPPER.writeValueAsString(map1);
             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(e.getMessage().startsWith(exceptionPrefix));
+            assertTrue(e.getMessage().startsWith(exceptionPrefix),
+                    "Unexpected message: " + e.getMessage());
         }
     }
 }

src/test/java/tools/jackson/dataformat/xml/tofix/MultidimArray556Test.java

@@ -5,7 +5,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import tools.jackson.core.exc.StreamWriteException;
+import tools.jackson.databind.DatabindException;
 import tools.jackson.dataformat.xml.XmlMapper;
 import tools.jackson.dataformat.xml.XmlTestUtil;
 import tools.jackson.dataformat.xml.XmlWriteFeature;
@@ -30,7 +30,7 @@ public void test2DPrimitiveArrayFailsFast() throws Exception
         try {
             MAPPER.writeValueAsString(new boolean[][] { { true }, { false } });
             fail("Should not pass: nested arrays must be rejected");
-        } catch (StreamWriteException e) {
+        } catch (DatabindException e) {
             verifyException(e, "does not support nested arrays");
         }
     }
@@ -44,7 +44,7 @@ public void testNestedListFailsFast() throws Exception
         try {
             MAPPER.writeValueAsString(nested);
             fail("Should not pass: nested Collections must be rejected");
-        } catch (StreamWriteException e) {
+        } catch (DatabindException e) {
             verifyException(e, "does not support nested arrays");
         }
     }