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

[svn at osgeo.org]

Author: schpidi
Date: 2011-09-17 12:56:33 -0700 (Sat, 17 Sep 2011)
New Revision: 12548

Modified:
   trunk/msautotest/wxs/expected/wms_exception130.xml
   trunk/msautotest/wxs/expected/wms_time_cap.xml
   trunk/msautotest/wxs/expected/wms_time_cap130.xml
   trunk/msautotest/wxs/wms_time1.map
Log:
Cleaning some wms tests.


Modified: trunk/msautotest/wxs/expected/wms_exception130.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_exception130.xml	2011-09-17 19:54:32 UTC (rev 12547)
+++ trunk/msautotest/wxs/expected/wms_exception130.xml	2011-09-17 19:56:33 UTC (rev 12548)
@@ -2,7 +2,7 @@
 
 <?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
 <ServiceExceptionReport version="1.3.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/wms/1.3.0/exceptions_1_3_0.xsd">
-<ServiceException code="LayerNotDefined">
-msWMSLoadGetMapParams(): WMS server error. Invalid layer(s) given in the LAYERS parameter.
+<ServiceException code="MissingParameterValue">
+msWMSLoadGetMapParams(): WMS server error. Missing required parameter LAYERS
 </ServiceException>
 </ServiceExceptionReport>

Modified: trunk/msautotest/wxs/expected/wms_time_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_time_cap.xml	2011-09-17 19:54:32 UTC (rev 12547)
+++ trunk/msautotest/wxs/expected/wms_time_cap.xml	2011-09-17 19:56:33 UTC (rev 12548)
@@ -33,7 +33,6 @@
       <Format>image/gif</Format>
       <Format>image/png; mode=24bit</Format>
       <Format>image/jpeg</Format>
-      <Format>image/vnd.wap.wbmp</Format>
       <Format>image/tiff</Format>
       <Format>image/svg+xml</Format>
       <DCPType>

Modified: trunk/msautotest/wxs/expected/wms_time_cap130.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_time_cap130.xml	2011-09-17 19:54:32 UTC (rev 12547)
+++ trunk/msautotest/wxs/expected/wms_time_cap130.xml	2011-09-17 19:56:33 UTC (rev 12548)
@@ -30,7 +30,6 @@
       <Format>image/gif</Format>
       <Format>image/png; mode=24bit</Format>
       <Format>image/jpeg</Format>
-      <Format>image/vnd.wap.wbmp</Format>
       <Format>image/tiff</Format>
       <Format>image/svg+xml</Format>
       <DCPType>
@@ -61,10 +60,9 @@
     </sld:DescribeLayer>
     <sld:GetLegendGraphic>
       <Format>image/png</Format>
-      <Format>image/gif</Format>
-      <Format>image/png; mode=24bit</Format>
       <Format>image/jpeg</Format>
-      <Format>image/vnd.wap.wbmp</Format>
+      <Format>image/gif</Format>
+      <Format>image/png; mode=8bit</Format>
       <DCPType>
         <HTTP>
           <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms_time?"/></Get>

Modified: trunk/msautotest/wxs/wms_time1.map
===================================================================
--- trunk/msautotest/wxs/wms_time1.map	2011-09-17 19:54:32 UTC (rev 12547)
+++ trunk/msautotest/wxs/wms_time1.map	2011-09-17 19:56:33 UTC (rev 12548)
@@ -80,6 +80,7 @@
       "WMS_ACCESSCONTRAINTS" "none"
       "WMS_FEES"             "none"      
       "wms_timeformat"       "YYYY-MM-DD HH,YYYY-MM-DD HH:MM:"
+      "wms_getmap_formatlist" "image/png,image/gif,image/png; mode=24bit,image/jpeg,image/vnd.wap.wbmp,image/tiff,image/svg+xml"
       "ows_enable_request" "*" 
    END