[mapserver-commits] r12862 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Wed Dec 7 05:57:44 EST 2011
Author: schpidi
Date: 2011-12-07 02:57:44 -0800 (Wed, 07 Dec 2011)
New Revision: 12862
Modified:
trunk/msautotest/wxs/expected/wcs_describe.xml
trunk/msautotest/wxs/expected/wcs_get_caps.xml
trunk/msautotest/wxs/expected/wcs_getcov_exception_bands.xml
trunk/msautotest/wxs/expected/wcs_getcov_exception_bbox.xml
trunk/msautotest/wxs/expected/wcs_getcov_exception_maxsize.xml
trunk/msautotest/wxs/expected/wcs_post_exception1.xml
trunk/msautotest/wxs/expected/wcs_post_exception2.xml
trunk/msautotest/wxs/tomk_workshop.map
trunk/msautotest/wxs/wcs_post.map
trunk/msautotest/wxs/wcs_simple.map
Log:
Adding [RESULT_DEMIME] to WCS XML tests in order to validate results against schemas.
Modified: trunk/msautotest/wxs/expected/wcs_describe.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_describe.xml 2011-12-07 10:51:37 UTC (rev 12861)
+++ trunk/msautotest/wxs/expected/wcs_describe.xml 2011-12-07 10:57:44 UTC (rev 12862)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<?xml version='1.0' encoding="ISO-8859-1" ?>
<CoverageDescription
version="1.0.0"
Modified: trunk/msautotest/wxs/expected/wcs_get_caps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_get_caps.xml 2011-12-07 10:51:37 UTC (rev 12861)
+++ trunk/msautotest/wxs/expected/wcs_get_caps.xml 2011-12-07 10:57:44 UTC (rev 12862)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
<WCS_Capabilities
version="1.0.0"
Modified: trunk/msautotest/wxs/expected/wcs_getcov_exception_bands.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_exception_bands.xml 2011-12-07 10:51:37 UTC (rev 12861)
+++ trunk/msautotest/wxs/expected/wcs_getcov_exception_bands.xml 2011-12-07 10:57:44 UTC (rev 12862)
@@ -1,5 +1,3 @@
-Content-type: application/vnd.ogc.se_xml
-
<?xml version='1.0' encoding="ISO-8859-1" ?>
<ServiceExceptionReport version="1.2.0"
xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wcs/1.0.0/OGC-exception.xsd">
Modified: trunk/msautotest/wxs/expected/wcs_getcov_exception_bbox.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_exception_bbox.xml 2011-12-07 10:51:37 UTC (rev 12861)
+++ trunk/msautotest/wxs/expected/wcs_getcov_exception_bbox.xml 2011-12-07 10:57:44 UTC (rev 12862)
@@ -1,5 +1,3 @@
-Content-type: application/vnd.ogc.se_xml
-
<?xml version='1.0' encoding="ISO-8859-1" ?>
<ServiceExceptionReport version="1.2.0"
xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wcs/1.0.0/OGC-exception.xsd">
Modified: trunk/msautotest/wxs/expected/wcs_getcov_exception_maxsize.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_exception_maxsize.xml 2011-12-07 10:51:37 UTC (rev 12861)
+++ trunk/msautotest/wxs/expected/wcs_getcov_exception_maxsize.xml 2011-12-07 10:57:44 UTC (rev 12862)
@@ -1,5 +1,3 @@
-Content-type: application/vnd.ogc.se_xml
-
<?xml version='1.0' encoding="ISO-8859-1" ?>
<ServiceExceptionReport version="1.2.0"
xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wcs/1.0.0/OGC-exception.xsd">
Modified: trunk/msautotest/wxs/expected/wcs_post_exception1.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_post_exception1.xml 2011-12-07 10:51:37 UTC (rev 12861)
+++ trunk/msautotest/wxs/expected/wcs_post_exception1.xml 2011-12-07 10:57:44 UTC (rev 12862)
@@ -1,5 +1,3 @@
-Content-type: application/vnd.ogc.se_xml
-
<?xml version='1.0' encoding="ISO-8859-1" ?>
<ServiceExceptionReport version="1.2.0"
xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wcs/1.0.0/OGC-exception.xsd">
Modified: trunk/msautotest/wxs/expected/wcs_post_exception2.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_post_exception2.xml 2011-12-07 10:51:37 UTC (rev 12861)
+++ trunk/msautotest/wxs/expected/wcs_post_exception2.xml 2011-12-07 10:57:44 UTC (rev 12862)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<?xml version="1.0" encoding="ISO-8859-1"?>
<ows:ExceptionReport xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="99.0" xml:lang="en-US" xsi:schemaLocation="http://www.opengis.net/ows/2.0 http://schemas.opengis.net/ows/2.0/owsExceptionReport.xsd">
<ows:Exception exceptionCode="InvalidParameterValue" locator="version">
Modified: trunk/msautotest/wxs/tomk_workshop.map
===================================================================
--- trunk/msautotest/wxs/tomk_workshop.map 2011-12-07 10:51:37 UTC (rev 12861)
+++ trunk/msautotest/wxs/tomk_workshop.map 2011-12-07 10:57:44 UTC (rev 12862)
@@ -62,7 +62,7 @@
# Generate WCS Capabilities
-# RUN_PARMS: wcs_get_caps.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=WCS&version=1.0.0&request=GetCapabilities" > [RESULT_DEVERSION]
+# RUN_PARMS: wcs_get_caps.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=WCS&version=1.0.0&request=GetCapabilities" > [RESULT_DEVERSION] [RESULT_DEMIME]
MAP
Modified: trunk/msautotest/wxs/wcs_post.map
===================================================================
--- trunk/msautotest/wxs/wcs_post.map 2011-12-07 10:51:37 UTC (rev 12861)
+++ trunk/msautotest/wxs/wcs_post.map 2011-12-07 10:57:44 UTC (rev 12862)
@@ -1,3 +1,4 @@
+
#
# Test WCS.
#
@@ -7,8 +8,8 @@
# General tests
#
# Exception
-# RUN_PARMS: wcs_post_exception1.xml [MAPSERV] -nv [POST]<?xml version="1.0" encoding="UTF-8"?><wcs:GetCoverage xmlns:wcs="http://www.opengis.net/wcs/2.0" service="WCS" version="99"/>[/POST] > [RESULT_DEVERSION]
-# RUN_PARMS: wcs_post_exception2.xml [MAPSERV] -nv [POST]<?xml version="1.0" encoding="UTF-8"?><wcs:GetCoverage xmlns:wcs="http://www.opengis.net/wcs/2.0" service="WCS" version="99.0"/>[/POST] > [RESULT_DEVERSION]
+# RUN_PARMS: wcs_post_exception1.xml [MAPSERV] -nv [POST]<?xml version="1.0" encoding="UTF-8"?><wcs:GetCoverage xmlns:wcs="http://www.opengis.net/wcs/2.0" service="WCS" version="99"/>[/POST] > [RESULT_DEVERSION] [RESULT_DEMIME]
+# RUN_PARMS: wcs_post_exception2.xml [MAPSERV] -nv [POST]<?xml version="1.0" encoding="UTF-8"?><wcs:GetCoverage xmlns:wcs="http://www.opengis.net/wcs/2.0" service="WCS" version="99.0"/>[/POST] > [RESULT_DEVERSION] [RESULT_DEMIME]
#
# WCS 1.1 POST tests
#
Modified: trunk/msautotest/wxs/wcs_simple.map
===================================================================
--- trunk/msautotest/wxs/wcs_simple.map 2011-12-07 10:51:37 UTC (rev 12861)
+++ trunk/msautotest/wxs/wcs_simple.map 2011-12-07 10:57:44 UTC (rev 12862)
@@ -48,7 +48,7 @@
#
#
# Coverage description
-# RUN_PARMS: wcs_describe.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=DescribeCoverage&COVERAGE=grey" > [RESULT]
+# RUN_PARMS: wcs_describe.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=DescribeCoverage&COVERAGE=grey" > [RESULT_DEMIME]
#
# Generate 16bit.
# RUN_PARMS: wcs_16.grd [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=AAIGRID&BBOX=0,0,400,300&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
@@ -57,10 +57,10 @@
# RUN_PARMS: wcs_simple.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=PNG&BBOX=0,0,400,300&COVERAGE=grey&CRS=EPSG:32611" > [RESULT_DEMIME]
#
# Generate error if bbox does not overlap coverage extent
-# RUN_PARMS: wcs_getcov_exception_bbox.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=PNG&BBOX=500,500,1000,1000&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
+# RUN_PARMS: wcs_getcov_exception_bbox.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=PNG&BBOX=500,500,1000,1000&COVERAGE=grey&CRS=EPSG:32611" > [RESULT_DEMIME]
#
# Generate error if requested coverage exceeds maxsize
-# RUN_PARMS: wcs_getcov_exception_maxsize.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=5001&HEIGHT=5001&FORMAT=PNG&BBOX=500,500,1000,1000&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
+# RUN_PARMS: wcs_getcov_exception_maxsize.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=5001&HEIGHT=5001&FORMAT=PNG&BBOX=500,500,1000,1000&COVERAGE=grey&CRS=EPSG:32611" > [RESULT_DEMIME]
#
# Use bilinear resampling.
# RUN_PARMS: wcs_bilinear.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=PNG&BBOX=0.1,0.1,399.9,299.9&COVERAGE=grey&CRS=EPSG:32611&INTERPOLATION=BILINEAR" > [RESULT_DEMIME]
@@ -82,7 +82,7 @@
# RUN_PARMS: wcs_getcov_grd_10.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&RESX=30&RESY=30&FORMAT=AAIGRID&BBOX=0,0,400,300&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
#
# GetCoverage exception (invalid bands value)
-# RUN_PARMS: wcs_getcov_exception_bands.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&RESX=30&RESY=30&FORMAT=AAIGRID&BBOX=0,0,400,300&COVERAGE=grey&CRS=EPSG:32611&bands=FOO" > [RESULT]
+# RUN_PARMS: wcs_getcov_exception_bands.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&RESX=30&RESY=30&FORMAT=AAIGRID&BBOX=0,0,400,300&COVERAGE=grey&CRS=EPSG:32611&bands=FOO" > [RESULT_DEMIME]
#
# GetCoverage to AAIGRID 1.1 (normal CRS)
# RUN_PARMS: wcs_getcov_grd_11.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.0&REQUEST=GetCoverage&FORMAT=AAIGRID&BOUNDINGBOX=0,0,400,300,urn:ogc:def:crs:EPSG::32611&IDENTIFIER=grey&GridCS=urn:ogc:def:crs:OGC::imageCRS&GridType=urn:ogc:def:method:WCS:1.1:2dGridIn2dCrs&GridOrigin=0,295&GridOffsets=30,-30" > [RESULT]
More information about the mapserver-commits
mailing list