Complete #737

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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index c697367feb87c00fcde387c5b4ba756a51b2c237..04ad8af3d2715425512546130dfc501391b2b462 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -99,7 +99,7 @@ TESTS = \
        regress_management \
        dump \
        dumppoints \
-       wmsservers_new \
+       wmsservers \
        wkt \
        wkb \
        tickets \
@@ -110,8 +110,6 @@ TESTS = \
        bestsrid \
        concave_hull
 
-# TESTS += wmsservers_old
-
 ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 32),1)
        # GEOS-3.3 adds:
        # ST_HausdorffDistance, ST_Buffer(params)

diff --git a/regress/wmsservers_new.sql b/regress/wmsservers.sql
similarity index 100%
rename from regress/wmsservers_new.sql
rename to regress/wmsservers.sql

diff --git a/regress/wmsservers_new_expected b/regress/wmsservers_expected
similarity index 100%
rename from regress/wmsservers_new_expected
rename to regress/wmsservers_expected

diff --git a/regress/wmsservers_old.sql b/regress/wmsservers_old.sql
deleted file mode 100644 (file)
index eef6d2a..0000000
--- a/regress/wmsservers_old.sql
+++ /dev/null
@@ -1,36 +0,0 @@
-SELECT 'Starting up MapServer/Geoserver tests...';
--- Set up the data table
-SELECT 'Setting up the data table...';
-CREATE TABLE wmstest ( id INTEGER, pt GEOMETRY );
-INSERT INTO wmstest SELECT lon * 100 + lat AS id, st_setsrid(st_buffer(st_makepoint(lon, lat),1.0),4326) AS pt
-FROM (select lon, generate_series(-80,80, 5) AS lat FROM (SELECT generate_series(-175, 175, 5) AS lon) AS sq1) AS sq2;
-INSERT INTO geometry_columns (f_table_catalog, f_table_schema, f_table_name, f_geometry_column, coord_dimension, srid, type) VALUES ('', 'public','wmstest','pt',2,4326,'POLYGON');
-ALTER TABLE wmstest add PRIMARY KEY ( id );
-CREATE INDEX wmstest_geomidx ON wmstest using gist ( pt );
-
--- Geoserver 2.0 NG tests
-SELECT 'Running Geoserver 2.0 NG tests...';
--- Run a Geoserver 2.0 NG metadata query
-SELECT 'Geoserver1', TYPE FROM GEOMETRY_COLUMNS WHERE F_TABLE_SCHEMA = 'public' AND F_TABLE_NAME = 'wmstest' AND F_GEOMETRY_COLUMN = 'pt';
-SELECT 'Geoserver2', SRID FROM GEOMETRY_COLUMNS WHERE F_TABLE_SCHEMA = 'public' AND F_TABLE_NAME = 'wmstest' AND F_GEOMETRY_COLUMN = 'pt';
--- Run a Geoserver 2.0 NG WMS query
-SELECT 'Geoserver3', "id",substr(encode(asBinary(force_2d("pt"),'XDR'),'base64'),0,16) as "pt" FROM "public"."wmstest" WHERE "pt" && GeomFromText('POLYGON ((-6.58216065979069 -0.7685569763184591, -6.58216065979069 0.911225433349509, -3.050569931030911 0.911225433349509, -3.050569931030911 -0.7685569763184591, -6.58216065979069 -0.7685569763184591))', 4326);
--- Run a Geoserver 2.0 NG KML query
-SELECT 'Geoserver4', count(*) FROM "public"."wmstest" WHERE "pt" && GeomFromText('POLYGON ((-1.504017942347938 24.0332272532341, -1.504017942347938 25.99364254836741, 1.736833353559741 25.99364254836741, 1.736833353559741 24.0332272532341, -1.504017942347938 24.0332272532341))', 4326);
-SELECT 'Geoserver5', "id",substr(encode(asBinary(force_2d("pt"),'XDR'),'base64'),0,16) as "pt" FROM "public"."wmstest" WHERE "pt" && GeomFromText('POLYGON ((-1.504017942347938 24.0332272532341, -1.504017942347938 25.99364254836741, 1.736833353559741 25.99364254836741, 1.736833353559741 24.0332272532341, -1.504017942347938 24.0332272532341))', 4326);
-SELECT 'Geoserver6', "id",substr(encode(asBinary(force_2d("pt"),'XDR'),'base64'),0,16) as "pt" FROM "public"."wmstest" WHERE "pt" && GeomFromText('POLYGON ((-1.507182836191598 24.031312785172446, -1.507182836191598 25.995557016429064, 1.7399982474034008 25.995557016429064, 1.7399982474034008 24.031312785172446, -1.507182836191598 24.031312785172446))', 4326);
-
--- MapServer 5.4 tests
-select 'MapServer1', attname from pg_attribute, pg_constraint, pg_class where pg_constraint.conrelid = pg_class.oid and pg_class.oid = pg_attribute.attrelid and pg_constraint.contype = 'p' and pg_constraint.conkey[1] = pg_attribute.attnum and pg_class.relname = 'wmstest' and pg_table_is_visible(pg_class.oid) and pg_constraint.conkey[2] is null;
-select 'MapServer2', "id",substr(encode(AsBinary(force_collection(force_2d("pt")),'NDR'),'base64'),0,16) as geom,"id" from wmstest where pt && GeomFromText('POLYGON((-98.5 32,-98.5 39,-91.5 39,-91.5 32,-98.5 32))',find_srid('','wmstest','pt'));
-
--- MapServer 5.6 tests
-select * from wmstest where false limit 0;
-select 'MapServer3', attname from pg_attribute, pg_constraint, pg_class where pg_constraint.conrelid = pg_class.oid and pg_class.oid = pg_attribute.attrelid and pg_constraint.contype = 'p' and pg_constraint.conkey[1] = pg_attribute.attnum and pg_class.relname = 'wmstest' and pg_table_is_visible(pg_class.oid) and pg_constraint.conkey[2] is null;
-select 'MapServer4', "id",substr(encode(AsBinary(force_collection(force_2d("pt")),'NDR'),'hex'),0,16) as geom,"id" from wmstest where pt && GeomFromText('POLYGON((-98.5 32,-98.5 39,-91.5 39,-91.5 32,-98.5 32))',find_srid('','wmstest','pt'));
-
--- Drop the data table
-SELECT 'Removing the data table...';
-DROP TABLE wmstest;
-DELETE FROM geometry_columns WHERE f_table_name = 'wmstest' AND f_table_schema = 'public';
-SELECT 'Done.';
\ No newline at end of file

diff --git a/regress/wmsservers_old_expected b/regress/wmsservers_old_expected
deleted file mode 100644 (file)
index 9deee7e..0000000
--- a/regress/wmsservers_old_expected
+++ /dev/null
@@ -1,19 +0,0 @@
-Starting up MapServer/Geoserver tests...
-Setting up the data table...
-NOTICE:  ALTER TABLE / ADD PRIMARY KEY will create implicit index "wmstest_pkey" for table "wmstest"
-ALTER TABLE
-Running Geoserver 2.0 NG tests...
-Geoserver1|POLYGON
-Geoserver2|4326
-Geoserver3|-500|AAAAAAMAAAABAAA
-Geoserver4|1
-Geoserver5|25|AAAAAAMAAAABAAA
-Geoserver6|25|AAAAAAMAAAABAAA
-MapServer1|id
-MapServer2|-9465|AQcAAAABAAAAAQM|-9465
-MapServer2|-9460|AQcAAAABAAAAAQM|-9460
-MapServer3|id
-MapServer4|-9465|010700000001000|-9465
-MapServer4|-9460|010700000001000|-9460
-Removing the data table...
-Done.