Merge SRID-retainment tests with some of the other tests

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

diff --git a/regress/clean.sql b/regress/clean.sql
index 218e023756061e4cfd4a5a3fac9bacc86fac1fcd..bdb973463e0df9d98d74e8e09beec737a9b80c06 100644 (file)
--- a/regress/clean.sql
+++ b/regress/clean.sql
@@ -24,11 +24,11 @@ RT  16.1    010600000002000000010300000001000000050000000000000000003640000000000000
 RT     16.2    0106000000020000000103000000010000000500000000000000008043400000000000003640000000000080484000000000000036400000000000804840000000000000404000000000008043400000000000004040000000000080434000000000000036400103000000010000000500000000000000008047400000000000003A4000000000008049400000000000003A4000000000008049400000000000003E4000000000008047400000000000003E4000000000008047400000000000003A40  0106000000020000000103000000010000000900000000000000008048400000000000003A400000000000804840000000000000364000000000008043400000000000003640000000000080434000000000000040400000000000804840000000000000404000000000008048400000000000003E4000000000008047400000000000003E4000000000008047400000000000003A4000000000008048400000000000003A400103000000010000000500000000000000008048400000000000003E4000000000008049400000000000003E4000000000008049400000000000003A4000000000008048400000000000003A4000000000008048400000000000003E40
 RT     16.3    010600000002000000010300000001000000050000000000000000804A4000000000000036400000000000804F4000000000000036400000000000804F4000000000000040400000000000804A4000000000000040400000000000804A400000000000003640010300000001000000050000000000000000804E400000000000003A400000000000804F400000000000003A400000000000804F400000000000003E400000000000804E400000000000003E400000000000804E400000000000003A40  010700000002000000010300000001000000070000000000000000804F400000000000003A400000000000804F4000000000000036400000000000804A4000000000000036400000000000804A4000000000000040400000000000804F4000000000000040400000000000804F400000000000003E400000000000804F400000000000003A400105000000020000000102000000020000000000000000804E400000000000003A400000000000804F400000000000003A400102000000030000000000000000804F400000000000003E400000000000804E400000000000003E400000000000804E400000000000003A40
 RT     16.4    010600000002000000010300000001000000080000000000000000C0504000000000000036400000000000405340000000000000364000000000004053400000000000003A400000000000C053400000000000003C4000000000004053400000000000003E40000000000040534000000000000040400000000000C0504000000000000040400000000000C050400000000000003640010300000001000000060000000000000000C052400000000000003A4000000000004053400000000000003A400000000000C053400000000000003C4000000000004053400000000000003E400000000000C052400000000000003E400000000000C052400000000000003A40  0107000000020000000103000000010000000800000000000000004053400000000000003A40000000000040534000000000000036400000000000C0504000000000000036400000000000C0504000000000000040400000000000405340000000000000404000000000004053400000000000003E400000000000C053400000000000003C4000000000004053400000000000003A400105000000020000000102000000020000000000000000C052400000000000003A4000000000004053400000000000003A4001020000000300000000000000004053400000000000003E400000000000C052400000000000003E400000000000C052400000000000003A40
-RT     17.1    010300000003000000050000000000000000004E4000000000000014C0000000000000544000000000000014C0000000000000544000000000000034400000000000004E4000000000000034400000000000004E4000000000000014C0050000000000000000804B4000000000000000000000000000805140000000000000000000000000008051400000000000002E400000000000804B400000000000002E400000000000804B40000000000000000005000000000000000040504000000000000014400000000000C0524000000000000014400000000000C0524000000000000024400000000000405040000000000000244000000000004050400000000000001440      0106000000030000000103000000010000000D0000000000000000004E400000000000002E400000000000004E40000000000000344000000000000054400000000000003440000000000000544000000000000014C00000000000004E4000000000000014C00000000000004E40000000000000000000000000008051400000000000000000000000000080514000000000000014400000000000C0524000000000000014400000000000C0524000000000000024400000000000805140000000000000244000000000008051400000000000002E400000000000004E400000000000002E40010300000001000000050000000000000000004E4000000000000000000000000000804B4000000000000000000000000000804B400000000000002E400000000000004E400000000000002E400000000000004E400000000000000000010300000001000000050000000000000000805140000000000000244000000000008051400000000000001440000000000040504000000000000014400000000000405040000000000000244000000000008051400000000000002440
-PG     1       0103000000010000000100000000000000000000000000000000000000      POINT(0 0)
-PG     2       LINESTRING(0 0, 0 0)    POINT(0 0)
-PG     3       MULTILINESTRING((0 0, 10 0),(20 20, 20 20))     GEOMETRYCOLLECTION(LINESTRING(0 0, 10 0),POINT(20 20))
-PG     4       MULTIPOLYGON(((5 3, 7 4, 9 5, 11 6, 13 7, 5 3)),((14 14, 14 14, 14 14, 14 14))) GEOMETRYCOLLECTION(MULTILINESTRING((5 3,7 4),(7 4,9 5),(9 5,11 6),(11 6,13 7)),POINT(14 14))
+RT     17.1    SRID=12;010300000003000000050000000000000000004E4000000000000014C0000000000000544000000000000014C0000000000000544000000000000034400000000000004E4000000000000034400000000000004E4000000000000014C0050000000000000000804B4000000000000000000000000000805140000000000000000000000000008051400000000000002E400000000000804B400000000000002E400000000000804B40000000000000000005000000000000000040504000000000000014400000000000C0524000000000000014400000000000C0524000000000000024400000000000405040000000000000244000000000004050400000000000001440      SRID=12;0106000000030000000103000000010000000D0000000000000000004E400000000000002E400000000000004E40000000000000344000000000000054400000000000003440000000000000544000000000000014C00000000000004E4000000000000014C00000000000004E40000000000000000000000000008051400000000000000000000000000080514000000000000014400000000000C0524000000000000014400000000000C0524000000000000024400000000000805140000000000000244000000000008051400000000000002E400000000000004E400000000000002E40010300000001000000050000000000000000004E4000000000000000000000000000804B4000000000000000000000000000804B400000000000002E400000000000004E400000000000002E400000000000004E400000000000000000010300000001000000050000000000000000805140000000000000244000000000008051400000000000001440000000000040504000000000000014400000000000405040000000000000244000000000008051400000000000002440
+PG     1       SRID=1;0103000000010000000100000000000000000000000000000000000000       SRID=1;POINT(0 0)
+PG     2       SRID=3;LINESTRING(0 0, 0 0)     SRID=3;POINT(0 0)
+PG     3       SRID=43;MULTILINESTRING((0 0, 10 0),(20 20, 20 20))     SRID=43;GEOMETRYCOLLECTION(LINESTRING(0 0, 10 0),POINT(20 20))
+PG     4       SRID=2;MULTIPOLYGON(((5 3, 7 4, 9 5, 11 6, 13 7, 5 3)),((14 14, 14 14, 14 14, 14 14)))  SRID=2;GEOMETRYCOLLECTION(MULTILINESTRING((5 3,7 4),(7 4,9 5),(9 5,11 6),(11 6,13 7)),POINT(14 14))
 \.
 
 -- PG.1 : polygon with single ring with single point in it
@@ -36,12 +36,8 @@ PG   4       MULTIPOLYGON(((5 3, 7 4, 9 5, 11 6, 13 7, 5 3)),((14 14, 14 14, 14 14, 14 1
 --
 
 SELECT origin,caseno,
-       st_astext(st_makevalid(orig)) = st_astext(valid),
+       st_asewkt(st_makevalid(orig)) = st_asewkt(valid),
        st_isvalid(st_makevalid(orig)), -- paranoia
        (st_isvaliddetail(orig)).valid
 FROM clean_cases;
 
--- Check SRID is retained
-SELECT 'SRID1', ST_SRID(ST_MakeValid('SRID=3;POINT(0 0)'));
-SELECT 'SRID2', ST_SRID(ST_MakeValid('SRID=3;LINESTRING(0 0, 0 0)'));
-SELECT 'SRID3', ST_SRID(ST_MakeValid('SRID=3;POLYGON((0 0, 10 0, 10 10, 5 -5, 0 0))'));

diff --git a/regress/clean_expected b/regress/clean_expected
index 5f6663b4998c689e67d36fabd4d363cc62e1fb40..ad1b869d2099502e6115e78ead46cc170f0b6d35 100644 (file)
--- a/regress/clean_expected
+++ b/regress/clean_expected
@@ -25,6 +25,3 @@ PG|1|t|t|f
 PG|2|t|t|f
 PG|3|t|t|f
 PG|4|t|t|f
-SRID1|3
-SRID2|3
-SRID3|3