Enhance test for ST_MoveIsoNode

Test edge crossing and valid move

git-svn-id: http://svn.osgeo.org/postgis/trunk@13898 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/topology/test/regress/sqlmm.sql b/topology/test/regress/sqlmm.sql
index bb749f67eb74fe7d059f9267705c91199779b106..6b8199fd24db5d4c8d55c38028241e87ae524877 100644 (file)
--- a/topology/test/regress/sqlmm.sql
+++ b/topology/test/regress/sqlmm.sql
@@ -116,8 +116,9 @@ SELECT topology.ST_RemoveIsoNode('sqlmm_topology', 4);
 SELECT '-- ST_MoveIsoNode  ------------------------';
 
 -- Isolated node to invalid location (coincident)
-SELECT topology.ST_MoveIsoNode('sqlmm_topology', 2, 'POINT(5 10)');
-SELECT topology.ST_MoveIsoNode('sqlmm_topology', 2, 'POINT(4 4)');
+SELECT topology.ST_MoveIsoNode('sqlmm_topology', 8, 'POINT(5 10)');
+-- Isolated node to invalid location (edge-crossing)
+SELECT topology.ST_MoveIsoNode('sqlmm_topology', 8, 'POINT(5 9)');
 
 -- Non isolated node (is used by an edge);
 SELECT topology.ST_MoveIsoNode('sqlmm_topology', 4, 'POINT(5 4)');
@@ -125,6 +126,10 @@ SELECT topology.ST_MoveIsoNode('sqlmm_topology', 4, 'POINT(5 4)');
 -- Invalid point
 SELECT topology.ST_MoveIsoNode('sqlmm_topology', 2, 'MULTIPOINT(5 4)');
 
+-- Valid move
+SELECT topology.ST_MoveIsoNode('sqlmm_topology', 8, 'POINT(7 11)');
+SELECT topology.ST_MoveIsoNode('sqlmm_topology', 8, 'POINT(7 10)');
+
 -------------------------------------------------------------
 -- ST_RemoveIsoEdge
 -------------------------------------------------------------

diff --git a/topology/test/regress/sqlmm_expected b/topology/test/regress/sqlmm_expected
index 11a60863404fdcfa9710448cdc21887743b09afc..24df34bf2ce8b29a3f0d5c682ad72b9c65495382 100644 (file)
--- a/topology/test/regress/sqlmm_expected
+++ b/topology/test/regress/sqlmm_expected
@@ -40,10 +40,12 @@ ERROR:  SQL/MM Spatial exception - edge crosses node.
 Isolated node 3 removed
 ERROR:  SQL/MM Spatial exception - not isolated node
 -- ST_MoveIsoNode  ------------------------
-ERROR:  SQL/MM Spatial exception - not isolated node
-ERROR:  SQL/MM Spatial exception - not isolated node
+ERROR:  SQL/MM Spatial exception - coincident node
+ERROR:  SQL/MM Spatial exception - edge crosses node.
 ERROR:  SQL/MM Spatial exception - not isolated node
 ERROR:  SQL/MM Spatial exception - invalid point
+Isolated Node 8 moved to location 7,11
+Isolated Node 8 moved to location 7,10
 -- ST_RemoveIsoEdge ---------------------
 Isolated edge 1 removed
 -- ST_NewEdgesSplit  ---------------------