[mapserver-commits] r11179 - in trunk/msautotest/wxs: . expected

[svn at osgeo.org]

Author: schpidi
Date: 2011-03-16 12:35:13 -0700 (Wed, 16 Mar 2011)
New Revision: 11179

Added:
   trunk/msautotest/wxs/expected/wcs_20_exception_exceed_maxsize.xml
   trunk/msautotest/wxs/expected/wcs_getcov_exception_maxsize.xml
Modified:
   trunk/msautotest/wxs/wcs_simple.map
Log:
Added tests for maxsize limits on WCS responses (#3204).


Added: trunk/msautotest/wxs/expected/wcs_20_exception_exceed_maxsize.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_exception_exceed_maxsize.xml	                        (rev 0)
+++ trunk/msautotest/wxs/expected/wcs_20_exception_exceed_maxsize.xml	2011-03-16 19:35:13 UTC (rev 11179)
@@ -0,0 +1,6 @@
+<?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="2.0.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="size">
+    <ows:ExceptionText>msWCSGetCoverage20(): WCS server error. Raster size out of range, width and height of resulting coverage must be no more than MAXSIZE=5000.</ows:ExceptionText>
+  </ows:Exception>
+</ows:ExceptionReport>

Added: trunk/msautotest/wxs/expected/wcs_getcov_exception_maxsize.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_exception_maxsize.xml	                        (rev 0)
+++ trunk/msautotest/wxs/expected/wcs_getcov_exception_maxsize.xml	2011-03-16 19:35:13 UTC (rev 11179)
@@ -0,0 +1,8 @@
+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">
+  <ServiceException code="InvalidParameterValue" locator="width/height">msWCSGetCoverage(): WCS server error. Raster size out of range, width and height of resulting coverage must be no more than MAXSIZE=5000.
+  </ServiceException>
+</ServiceExceptionReport>

Modified: trunk/msautotest/wxs/wcs_simple.map
===================================================================
--- trunk/msautotest/wxs/wcs_simple.map	2011-03-16 19:34:26 UTC (rev 11178)
+++ trunk/msautotest/wxs/wcs_simple.map	2011-03-16 19:35:13 UTC (rev 11179)
@@ -59,6 +59,9 @@
 # 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=GDPNG&BBOX=500,500,1000,1000&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
 #
+# 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=GDPNG&BBOX=500,500,1000,1000&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
+#
 # 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=GDPNG&BBOX=0.1,0.1,399.9,299.9&COVERAGE=grey&CRS=EPSG:32611&INTERPOLATION=BILINEAR" > [RESULT_DEMIME]
 #
@@ -205,11 +208,15 @@
 # ScalingError 
 # RUN_PARMS: wcs_20_exception_scaling.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=grey&FORMAT=image/tiff&RESOLUTION=x(5)&SIZE=x(10)" > [RESULT_DEMIME]
 #
+# Generate error if requested coverage exceeds maxsize
+# RUN_PARMS: wcs_20_exception_exceed_maxsize.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&size=x(5001)&size=y(5001)&FORMAT=image/tiff&COVERAGEID=grey" > [RESULT_DEMIME]
+#
 MAP
 
 NAME TEST
 SIZE 400 300
 EXTENT 0 0 400 300
+MAXSIZE 5000
 
 IMAGETYPE PNG
 TRANSPARENT OFF