From 8e24b431b56df81996b36151b436d17eb136f9b1 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Wed, 24 Sep 2014 09:13:39 -0400 Subject: [PATCH] update harvesting tests --- .../suites_harvesting_post_Harvest-wms.xml | 40 ++++--------------- ...vest-zzz-post-GetRecords-filter-wms-dc.xml | 30 +++++--------- ...t-zzz-post-GetRecords-filter-wms-layer.xml | 38 ++++++++++-------- ...esting_post_Transaction-000-delete-all.xml | 2 +- tests/suites/harvesting/post/Harvest-wms.xml | 2 +- ...t-zzz-post-GetRecords-filter-wms-layer.xml | 2 +- 6 files changed, 43 insertions(+), 71 deletions(-) diff --git a/tests/expected/suites_harvesting_post_Harvest-wms.xml b/tests/expected/suites_harvesting_post_Harvest-wms.xml index b01832563..51c2b0eee 100644 --- a/tests/expected/suites_harvesting_post_Harvest-wms.xml +++ b/tests/expected/suites_harvesting_post_Harvest-wms.xml @@ -3,50 +3,26 @@ - 10 + 4 0 0 PYCSW_IDENTIFIER - Wisconsin Lake Clarity + IEM WMS Service - PYCSW_IDENTIFIER-Highways - Highways + PYCSW_IDENTIFIER-time_idx + NEXRAD BASE REFLECT - PYCSW_IDENTIFIER-LakesTSI - LakesTSI + PYCSW_IDENTIFIER-nexrad-n0r-wmst + NEXRAD BASE REFLECT - PYCSW_IDENTIFIER-LakeClarity - Wisconsin Lake Clarity - - - PYCSW_IDENTIFIER-LakesTSI_0305 - LakesTSI_0305 - - - PYCSW_IDENTIFIER-Relief - Relief - - - PYCSW_IDENTIFIER-LakeNames_0305 - LakeNames_0305 - - - PYCSW_IDENTIFIER-Roads - Roads - - - PYCSW_IDENTIFIER-LakeNames - LakeNames - - - PYCSW_IDENTIFIER-Counties - Counties + PYCSW_IDENTIFIER-nexrad_base_reflect + IEM WMS Service diff --git a/tests/expected/suites_harvesting_post_Harvest-zzz-post-GetRecords-filter-wms-dc.xml b/tests/expected/suites_harvesting_post_Harvest-zzz-post-GetRecords-filter-wms-dc.xml index fcf9fe513..4e1ada3c7 100644 --- a/tests/expected/suites_harvesting_post_Harvest-zzz-post-GetRecords-filter-wms-dc.xml +++ b/tests/expected/suites_harvesting_post_Harvest-zzz-post-GetRecords-filter-wms-dc.xml @@ -5,28 +5,20 @@ PYCSW_IDENTIFIER - Wisconsin Lake Clarity + IEM WMS Service service - SSEC - PAW - remote sensing - meteorology - atmospheric science - University of Wisconsin - Madison - weather - land + OGC:WMS - http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=/home/wms/data/mapfiles/lakestsi.map - General: This server hosts a set of experimental OGC Web Services of remote sensing data products for use in a broad range of both desktop and mobile device clients. - Dr. Sam Batzli - Space Science and Engineering Center, University of Wisconsin-Madison - Dr. Sam Batzli - http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=/home/wms/data/mapfiles/lakestsi.map - The following attribution is required if published or reproduced: Source: Space Science and Engineering Center, University of Wisconsin-Madison + http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi + IEM generated CONUS composite of NWS WSR-88D level III base reflectivity. + Daryl Herzmann + Iowa State University + Daryl Herzmann + http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi + None - 42.41 -93.03 - 47.13 -86.64 + 24.0 -126.0 + 50.0 -66.0 diff --git a/tests/expected/suites_harvesting_post_Harvest-zzz-post-GetRecords-filter-wms-layer.xml b/tests/expected/suites_harvesting_post_Harvest-zzz-post-GetRecords-filter-wms-layer.xml index b5241f646..478c62123 100644 --- a/tests/expected/suites_harvesting_post_Harvest-zzz-post-GetRecords-filter-wms-layer.xml +++ b/tests/expected/suites_harvesting_post_Harvest-zzz-post-GetRecords-filter-wms-layer.xml @@ -2,27 +2,31 @@ - + PYCSW_IDENTIFIER - Wisconsin Lake Clarity + NEXRAD BASE REFLECT dataset - SSEC - PAW - remote sensing - meteorology - atmospheric science - University of Wisconsin - Madison - weather - land - http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=/home/wms/data/mapfiles/lakestsi.map - http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=%2Fhome%2Fwms%2Fdata%2Fmapfiles%2Flakestsi.map&layers=LakeClarity&width=200&version=1.1.1&bbox=-93.0307%2C42.4104%2C-86.6404%2C47.1335&service=WMS&format=image%2Fpng&styles=&srs=EPSG%3A4326&request=GetMap&height=200 - General: This server hosts a set of experimental OGC Web Services of remote sensing data products for use in a broad range of both desktop and mobile device clients. - http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=/home/wms/data/mapfiles/lakestsi.map + + http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi + http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi?layers=time_idx&width=200&version=1.1.1&bbox=-126.0%2C24.0%2C-66.0%2C50.0&service=WMS&format=image%2Fpng&styles=&srs=EPSG%3A4326&request=GetMap&height=200 + http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi - 42.41 -93.03 - 47.13 -86.64 + 24.0 -126.0 + 50.0 -66.0 + + + + PYCSW_IDENTIFIER + NEXRAD BASE REFLECT + dataset + + http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi + http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi?layers=nexrad-n0r-wmst&width=200&version=1.1.1&bbox=-126.0%2C24.0%2C-66.0%2C50.0&service=WMS&format=image%2Fpng&styles=&srs=EPSG%3A4326&request=GetMap&height=200 + http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi + + 24.0 -126.0 + 50.0 -66.0 diff --git a/tests/expected/suites_harvesting_post_Transaction-000-delete-all.xml b/tests/expected/suites_harvesting_post_Transaction-000-delete-all.xml index 525c408f6..4781e5ac0 100644 --- a/tests/expected/suites_harvesting_post_Transaction-000-delete-all.xml +++ b/tests/expected/suites_harvesting_post_Transaction-000-delete-all.xml @@ -4,6 +4,6 @@ 0 0 - 127 + 121 diff --git a/tests/suites/harvesting/post/Harvest-wms.xml b/tests/suites/harvesting/post/Harvest-wms.xml index cab51a199..a67274f81 100644 --- a/tests/suites/harvesting/post/Harvest-wms.xml +++ b/tests/suites/harvesting/post/Harvest-wms.xml @@ -1,6 +1,6 @@ - http://wmsserv2.ssec.wisc.edu/cgi-bin/mapserv?map=/home/wms/data/mapfiles/lakestsi.map + http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi http://www.opengis.net/wms application/xml diff --git a/tests/suites/harvesting/post/Harvest-zzz-post-GetRecords-filter-wms-layer.xml b/tests/suites/harvesting/post/Harvest-zzz-post-GetRecords-filter-wms-layer.xml index a1a67fb9b..ab70e4b8b 100644 --- a/tests/suites/harvesting/post/Harvest-zzz-post-GetRecords-filter-wms-layer.xml +++ b/tests/suites/harvesting/post/Harvest-zzz-post-GetRecords-filter-wms-layer.xml @@ -11,7 +11,7 @@ csw:AnyText - %Lake Clarity% + %nexrad%