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

svn at osgeo.org svn at osgeo.org
Fri Mar 23 05:34:21 EDT 2012 

Author: schpidi
Date: 2012-03-23 02:34:21 -0700 (Fri, 23 Mar 2012)
New Revision: 13297

Modified:
   trunk/msautotest/wxs/expected/wms_inspire_cap.xml
   trunk/msautotest/wxs/expected/wms_inspire_cap_eng.xml
   trunk/msautotest/wxs/expected/wms_inspire_cap_ger.xml
   trunk/msautotest/wxs/expected/wms_inspire_describe_all.xml
   trunk/msautotest/wxs/expected/wms_inspire_describe_commontransportelements.xml
   trunk/msautotest/wxs/expected/wms_inspire_describe_railtransportnetwork.xml
   trunk/msautotest/wxs/expected/wms_inspire_describe_roadtransportnetwork.xml
   trunk/msautotest/wxs/expected/wms_inspire_describe_transportnode.xml
   trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all.xml
   trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_plain.txt
   trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_xml.txt
   trunk/msautotest/wxs/expected/wms_inspire_featureinfo_commontransportelements.xml
   trunk/msautotest/wxs/expected/wms_inspire_featureinfo_railtransportnetwork.xml
   trunk/msautotest/wxs/expected/wms_inspire_featureinfo_roadtransportnetwork.xml
   trunk/msautotest/wxs/wms_inspire.map
Log:
Changing INSPIRE tests to UTF-8.
Adding tests for WMS 1.1.1 although not implemented yet.


Modified: trunk/msautotest/wxs/expected/wms_inspire_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_cap.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_cap.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
+<?xml version='1.0' encoding="UTF-8" standalone="no" ?>
 <WMS_Capabilities version="1.3.0"  xmlns="http://www.opengis.net/wms"   xmlns:sld="http://www.opengis.net/sld"   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   xmlns:ms="http://mapserver.gis.umn.edu/mapserver"   xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0"   xmlns:inspire_vs="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0"   xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd  http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd  http://inspire.ec.europa.eu/schemas/inspire_vs/1.0  http://inspire.ec.europa.eu/schemas/inspire_vs/1.0/inspire_vs.xsd http://mapserver.gis.umn.edu/mapserver http://www.geodaten-mv.de/dienste/inspirevs_test?language=ger&amp;service=WMS&amp;version=1.3.0&amp;request=GetSchemaExtension">
 
 <Service>

Modified: trunk/msautotest/wxs/expected/wms_inspire_cap_eng.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_cap_eng.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_cap_eng.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
+<?xml version='1.0' encoding="UTF-8" standalone="no" ?>
 <WMS_Capabilities version="1.3.0"  xmlns="http://www.opengis.net/wms"   xmlns:sld="http://www.opengis.net/sld"   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   xmlns:ms="http://mapserver.gis.umn.edu/mapserver"   xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0"   xmlns:inspire_vs="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0"   xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd  http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd  http://inspire.ec.europa.eu/schemas/inspire_vs/1.0  http://inspire.ec.europa.eu/schemas/inspire_vs/1.0/inspire_vs.xsd http://mapserver.gis.umn.edu/mapserver http://www.geodaten-mv.de/dienste/inspirevs_test?language=eng&amp;service=WMS&amp;version=1.3.0&amp;request=GetSchemaExtension">
 
 <Service>

Modified: trunk/msautotest/wxs/expected/wms_inspire_cap_ger.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_cap_ger.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_cap_ger.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
+<?xml version='1.0' encoding="UTF-8" standalone="no" ?>
 <WMS_Capabilities version="1.3.0"  xmlns="http://www.opengis.net/wms"   xmlns:sld="http://www.opengis.net/sld"   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   xmlns:ms="http://mapserver.gis.umn.edu/mapserver"   xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0"   xmlns:inspire_vs="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0"   xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd  http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd  http://inspire.ec.europa.eu/schemas/inspire_vs/1.0  http://inspire.ec.europa.eu/schemas/inspire_vs/1.0/inspire_vs.xsd http://mapserver.gis.umn.edu/mapserver http://www.geodaten-mv.de/dienste/inspirevs_test?language=ger&amp;service=WMS&amp;version=1.3.0&amp;request=GetSchemaExtension">
 
 <Service>

Modified: trunk/msautotest/wxs/expected/wms_inspire_describe_all.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_describe_all.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_describe_all.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding="UTF-8"?>
 <DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
 <Version>1.1.0</Version>
   <LayerDescription>

Modified: trunk/msautotest/wxs/expected/wms_inspire_describe_commontransportelements.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_describe_commontransportelements.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_describe_commontransportelements.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding="UTF-8"?>
 <DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
 <Version>1.1.0</Version>
   <LayerDescription>

Modified: trunk/msautotest/wxs/expected/wms_inspire_describe_railtransportnetwork.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_describe_railtransportnetwork.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_describe_railtransportnetwork.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding="UTF-8"?>
 <DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
 <Version>1.1.0</Version>
   <LayerDescription>

Modified: trunk/msautotest/wxs/expected/wms_inspire_describe_roadtransportnetwork.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_describe_roadtransportnetwork.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_describe_roadtransportnetwork.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding="UTF-8"?>
 <DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
 <Version>1.1.0</Version>
   <LayerDescription>

Modified: trunk/msautotest/wxs/expected/wms_inspire_describe_transportnode.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_describe_transportnode.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_describe_transportnode.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding="UTF-8"?>
 <DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
 <Version>1.1.0</Version>
   <LayerDescription>

Modified: trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <msGMLOutput 
 	 xmlns:gml="http://www.opengis.net/gml"

Modified: trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_plain.txt
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_plain.txt	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_plain.txt	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-Content-type: text/plain
+Content-type: text/plain; charset=UTF-8
 
 GetFeatureInfo results:
 

Modified: trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_xml.txt
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_xml.txt	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_featureinfo_all_mime_xml.txt	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,6 +1,6 @@
-Content-type: application/vnd.ogc.gml
+Content-type: application/vnd.ogc.gml; charset=UTF-8
 
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <msGMLOutput 
 	 xmlns:gml="http://www.opengis.net/gml"

Modified: trunk/msautotest/wxs/expected/wms_inspire_featureinfo_commontransportelements.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_featureinfo_commontransportelements.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_featureinfo_commontransportelements.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <msGMLOutput 
 	 xmlns:gml="http://www.opengis.net/gml"

Modified: trunk/msautotest/wxs/expected/wms_inspire_featureinfo_railtransportnetwork.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_featureinfo_railtransportnetwork.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_featureinfo_railtransportnetwork.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <msGMLOutput 
 	 xmlns:gml="http://www.opengis.net/gml"

Modified: trunk/msautotest/wxs/expected/wms_inspire_featureinfo_roadtransportnetwork.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_inspire_featureinfo_roadtransportnetwork.xml	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/expected/wms_inspire_featureinfo_roadtransportnetwork.xml	2012-03-23 09:34:21 UTC (rev 13297)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <msGMLOutput 
 	 xmlns:gml="http://www.opengis.net/gml"

Modified: trunk/msautotest/wxs/wms_inspire.map
===================================================================
--- trunk/msautotest/wxs/wms_inspire.map	2012-03-23 08:50:42 UTC (rev 13296)
+++ trunk/msautotest/wxs/wms_inspire.map	2012-03-23 09:34:21 UTC (rev 13297)
@@ -5,17 +5,24 @@
 #
 # REQUIRES: INPUT=GDAL OUTPUT=PNG SUPPORTS=WMS
 #
-# Tests for INSPIRE View Service using WMS 1.3.0
+# Tests for INSPIRE View Service using WMS 1.1.1 & 1.3.0
 # scenario 1 - reference to external inspire service metadata
 #
-# Capabilities Default
+# Capabilities 1.3.0 Default
 # RUN_PARMS: wms_inspire_cap.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities" > [RESULT_DEVERSION] [RESULT_DEMIME]
-# Capabilities German
+# Capabilities 1.3.0 German
 # RUN_PARMS: wms_inspire_cap_ger.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities&LANGUAGE=ger" > [RESULT_DEVERSION] [RESULT_DEMIME]
-# Capabilities English
+# Capabilities 1.3.0 English
 # RUN_PARMS: wms_inspire_cap_eng.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities&LANGUAGE=eng" > [RESULT_DEVERSION] [RESULT_DEMIME]
 #
+# Capabilities 1.1.1 Default
+# RUN_PARMS: wms_inspire_cap_111.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities" > [RESULT_DEVERSION] [RESULT_DEMIME]
+# Capabilities 1.1.1 German
+# RUN_PARMS: wms_inspire_cap_111_ger.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities&LANGUAGE=ger" > [RESULT_DEVERSION] [RESULT_DEMIME]
+# Capabilities 1.1.1 English
+# RUN_PARMS: wms_inspire_cap_111_eng.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities&LANGUAGE=eng" > [RESULT_DEVERSION] [RESULT_DEMIME]
 #
+#
 # GetMap all
 # RUN_PARMS: wms_inspire_map_all.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG:4326&BBOX=53.4177,12.6101,53.4404,12.7593&WIDTH=500&HEIGHT=76&LAYERS=TN&STYLES=&FORMAT=image/png" > [RESULT_DEMIME]
 #
@@ -207,6 +214,8 @@
 
             "wms_enable_request" "*"
             "wms_sld_enabled" "false"
+            
+            "wms_encoding" "UTF-8"
         END
     END

More information about the mapserver-commits mailing list