Add labels for getFaceByNode tests

Makes it easier to know which test failed

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

diff --git a/topology/test/regress/getfacebypoint.sql b/topology/test/regress/getfacebypoint.sql
index 04af5d958321abdcc690568daf8d054d37900423..8c5bf6ca76c1003993d0040b6eef2e3a8541f217 100644 (file)
--- a/topology/test/regress/getfacebypoint.sql
+++ b/topology/test/regress/getfacebypoint.sql
@@ -30,25 +30,25 @@ select topology.addFace('schema_topo', 'POLYGON((1 5, 1 12, 7 12, 8 12, 10 12, 1
 
 
 -- ask for a Point with tolerance zero
-select topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(7 7)'), 0::float8)::int;
-select topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(6 7)'), 0::float8)::int;
-select topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(5 7)'), 0::float8)::int;
+select 't1', topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(7 7)'), 0::float8)::int;
+select 't2', topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(6 7)'), 0::float8)::int;
+select 't3', topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(5 7)'), 0::float8)::int;
 
 -- ask for a Point where there isn't a Face
-select topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(9 13)'), 0::float8)::int;
-select topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(5 8)'), 0::float8)::int;
+select 't4', topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(9 13)'), 0::float8)::int;
+select 't5', topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(5 8)'), 0::float8)::int;
 
 -- Ask for a point outside from an face but with a tolerance sufficient to include one face
-select topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(8.5 13)'), 0.5::float8)::int;
-select topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(5 8)'), 1::float8)::int;
+select 't6', topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(8.5 13)'), 0.5::float8)::int;
+select 't7', topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(5 8)'), 1::float8)::int;
 
 -- Failing cases (should all raise exceptions) -------
 
 -- Ask for Point in a Node (2 or more faces)
-select topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(1 5)'), 0::float8)::int;
+select 'e1', topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(1 5)'), 0::float8)::int;
 
 -- Ask for a Point with a tollerance too high (2 or more faces)
-select topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(9 13)'), 1::float8)::int;
+select 'e2', topology.GetFaceByPoint('schema_topo',ST_GeomFromText('POINT(9 13)'), 1::float8)::int;
 
 
 SELECT topology.DropTopology('schema_topo');

diff --git a/topology/test/regress/getfacebypoint_expected b/topology/test/regress/getfacebypoint_expected
index 98029487902c504346698905ca542193144e806d..4c63cd7e9592acc8d6a60c691db53b0dda601bfe 100644 (file)
--- a/topology/test/regress/getfacebypoint_expected
+++ b/topology/test/regress/getfacebypoint_expected
@@ -23,13 +23,13 @@ t
 2
 3
 4
-4
-4
-4
-0
-0
-3
-4
+t1|4
+t2|4
+t3|4
+t4|0
+t5|0
+t6|3
+t7|4
 ERROR:  Two or more faces found
 ERROR:  Two or more faces found
 Topology 'schema_topo' dropped