From f883f95f5eb14fab1c9c7936ea45de38afd1b111 Mon Sep 17 00:00:00 2001
From: Martin Davis <mtnclimb@gmail.com>
Date: Thu, 9 Nov 2023 13:16:59 -0800
Subject: [PATCH] Consolidate some relate XML unit tests

---
 .../xmltester/tests/general/TestRelateAA.xml  | 16 +++++++-
 .../xmltester/tests/general/TestRelateAC.xml  | 27 ------------
 .../xmltester/tests/general/TestRelateLC.xml  | 41 -------------------
 .../xmltester/tests/general/TestRelateLL.xml  | 26 ++++++++++++
 4 files changed, 41 insertions(+), 69 deletions(-)
 delete mode 100644 tests/xmltester/tests/general/TestRelateAC.xml
 delete mode 100644 tests/xmltester/tests/general/TestRelateLC.xml

diff --git a/tests/xmltester/tests/general/TestRelateAA.xml b/tests/xmltester/tests/general/TestRelateAA.xml
index d8694b908e..bbee510c89 100644
--- a/tests/xmltester/tests/general/TestRelateAA.xml
+++ b/tests/xmltester/tests/general/TestRelateAA.xml
@@ -99,7 +99,7 @@
       (120 140, 260 140, 260 260, 120 260, 120 140))
   </b>
 <test>
-  <op name="relate" arg3="212101212" arg1="A" arg2="B">true</op>
+  <op name="relate" arg3="212101212" arg1="A" arg2="B"> true  </op>
 </test>
 <test>  <op name="intersects" arg1="A" arg2="B">   true   </op></test>
 <test>  <op name="contains" arg1="A" arg2="B">   false   </op></test>
@@ -232,4 +232,18 @@
 <test>  <op name="contains" arg1="A" arg2="B">   false   </op></test>
 </case>
 
+<case>
+  <desc>A/mA A-shells overlapping B-shell at A-vertex</desc>
+  <a>
+    POLYGON ((100 60, 140 100, 100 140, 60 100, 100 60))
+  </a>
+  <b>
+    MULTIPOLYGON (((80 40, 120 40, 120 80, 80 80, 80 40)), ((120 80, 160 80, 160 120, 120 120, 120 80)), ((80 120, 120 120, 120 160, 80 160, 80 120)), ((40 80, 80 80, 80 120, 40 120, 40 80)))
+  </b>
+<test>
+  <op name="relate" arg3="21210F212" arg1="A" arg2="B">    true  </op>
+</test>
+<test>  <op name="intersects" arg1="A" arg2="B">   true   </op></test>
+</case>
+
 </run>
diff --git a/tests/xmltester/tests/general/TestRelateAC.xml b/tests/xmltester/tests/general/TestRelateAC.xml
deleted file mode 100644
index 99d593f9c0..0000000000
--- a/tests/xmltester/tests/general/TestRelateAC.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<run>
-  <precisionModel scale="1.0" offsetx="0.0" offsety="0.0"/>
-
-<case>
-  <desc>AC A-shells overlapping B-shell at A-vertex</desc>
-  <a>
-    POLYGON(
-      (100 60, 140 100, 100 140, 60 100, 100 60))
-  </a>
-  <b>
-    MULTIPOLYGON(
-      (
-        (80 40, 120 40, 120 80, 80 80, 80 40)), 
-      (
-        (120 80, 160 80, 160 120, 120 120, 120 80)), 
-      (
-        (80 120, 120 120, 120 160, 80 160, 80 120)), 
-      (
-        (40 80, 80 80, 80 120, 40 120, 40 80)))
-  </b>
-<test>
-  <op name="relate" arg3="21210F212" arg1="A" arg2="B">    true  </op>
-</test>
-<test>  <op name="intersects" arg1="A" arg2="B">   true   </op></test>
-</case>
-
-</run>
diff --git a/tests/xmltester/tests/general/TestRelateLC.xml b/tests/xmltester/tests/general/TestRelateLC.xml
deleted file mode 100644
index 864ce95589..0000000000
--- a/tests/xmltester/tests/general/TestRelateLC.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<run>
-  <precisionModel scale="1.0" offsetx="0.0" offsety="0.0"/>
-
-<case>
-  <desc>LC - topographically equal with no boundary</desc>
-  <a>
-    LINESTRING(0 0, 0 50, 50 50, 50 0, 0 0)
-  </a>
-  <b>
-    MULTILINESTRING(
-      (0 0, 0 50), 
-      (0 50, 50 50), 
-      (50 50, 50 0), 
-      (50 0, 0 0))
-  </b>
-<test>
-  <op name="relate" arg3="1FFFFFFF2" arg1="A" arg2="B">
-    true
-  </op>
-</test>
-</case>
-
-<case>
-  <desc>LC - equal with boundary intersection</desc>
-  <a>
-    LINESTRING(0 0, 60 0, 60 60, 60 0, 120 0)
-  </a>
-  <b>
-    MULTILINESTRING(
-      (0 0, 60 0), 
-      (60 0, 120 0), 
-      (60 0, 60 60))
-  </b>
-<test>
-  <op name="relate" arg3="10FF0FFF2" arg1="A" arg2="B">
-    true
-  </op>
-</test>
-</case>
-
-</run>
diff --git a/tests/xmltester/tests/general/TestRelateLL.xml b/tests/xmltester/tests/general/TestRelateLL.xml
index 4a4fb4289d..592443d1f9 100644
--- a/tests/xmltester/tests/general/TestRelateLL.xml
+++ b/tests/xmltester/tests/general/TestRelateLL.xml
@@ -365,4 +365,30 @@
   <test><op name="within"     arg1="A" arg2="B"> false </op></test>
 </case>
 
+<case>
+  <desc>LmL - topographically equal with no boundary</desc>
+  <a>
+    LINESTRING(0 0, 0 50, 50 50, 50 0, 0 0)
+  </a>
+  <b>
+    MULTILINESTRING((0 0, 0 50), (0 50, 50 50), (50 50, 50 0), (50 0, 0 0))
+  </b>
+<test>
+  <op name="relate" arg3="1FFFFFFF2" arg1="A" arg2="B"> true </op>
+</test>
+</case>
+
+<case>
+  <desc>LmL - equal with boundary intersection</desc>
+  <a>
+    LINESTRING(0 0, 60 0, 60 60, 60 0, 120 0)
+  </a>
+  <b>
+    MULTILINESTRING((0 0, 60 0), (60 0, 120 0), (60 0, 60 60))
+  </b>
+<test>
+  <op name="relate" arg3="10FF0FFF2" arg1="A" arg2="B"> true </op>
+</test>
+</case>
+
 </run>