[mapserver-commits] r7135 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Sat Dec 1 16:59:40 EST 2007
Author: tomkralidis
Date: 2007-12-01 16:59:39 -0500 (Sat, 01 Dec 2007)
New Revision: 7135
Added:
trunk/msautotest/wxs/expected/sos_se0.xml
trunk/msautotest/wxs/expected/sos_se1.xml
trunk/msautotest/wxs/expected/sos_se2.xml
trunk/msautotest/wxs/expected/sos_se3.xml
trunk/msautotest/wxs/expected/sos_se4.xml
trunk/msautotest/wxs/expected/sos_se5.xml
trunk/msautotest/wxs/expected/sos_se6.xml
trunk/msautotest/wxs/expected/sos_se7.xml
Modified:
trunk/msautotest/wxs/sos.map
Log:
Add more tests for exceptions
Added: trunk/msautotest/wxs/expected/sos_se0.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_se0.xml (rev 0)
+++ trunk/msautotest/wxs/expected/sos_se0.xml 2007-12-01 21:59:39 UTC (rev 7135)
@@ -0,0 +1,8 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.0.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
+ <Exception exceptionCode="MissingParameterValue" locator="request">
+ <ExceptionText>msSOSDispatch(): SOS server error. Missing REQUEST Parameter</ExceptionText>
+ </Exception>
+</ows:ExceptionReport>
Added: trunk/msautotest/wxs/expected/sos_se1.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_se1.xml (rev 0)
+++ trunk/msautotest/wxs/expected/sos_se1.xml 2007-12-01 21:59:39 UTC (rev 7135)
@@ -0,0 +1,8 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.0.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
+ <Exception exceptionCode="MissingParameterValue" locator="request">
+ <ExceptionText>msSOSDispatch(): SOS server error. Missing REQUEST Parameter</ExceptionText>
+ </Exception>
+</ows:ExceptionReport>
Added: trunk/msautotest/wxs/expected/sos_se2.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_se2.xml (rev 0)
+++ trunk/msautotest/wxs/expected/sos_se2.xml 2007-12-01 21:59:39 UTC (rev 7135)
@@ -0,0 +1,8 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.0.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
+ <Exception exceptionCode="InvalidParameterValue" locator="request">
+ <ExceptionText>msSOSDispatch(): SOS server error. Invalid REQUEST parameter: FOO</ExceptionText>
+ </Exception>
+</ows:ExceptionReport>
Added: trunk/msautotest/wxs/expected/sos_se3.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_se3.xml (rev 0)
+++ trunk/msautotest/wxs/expected/sos_se3.xml 2007-12-01 21:59:39 UTC (rev 7135)
@@ -0,0 +1,185 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<sos:Capabilities xmlns:gml="http://www.opengis.net/gml" xmlns:om="http://www.opengis.net/om" xmlns:ows="http://www.opengis.net/ows" xmlns:swe="http://www.opengis.net/swe" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sos="http://www.opengis.net/sos/1.0" version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosGetCapabilities.xsd">
+ <ows:ServiceIdentification>
+ <ows:Title>Test SOS Title</ows:Title>
+ <ows:Abstract>Test SOS Abstract</ows:Abstract>
+ <ows:Keywords>
+ <ows:Keyword>ogc</ows:Keyword>
+ <ows:Keyword>sos</ows:Keyword>
+ <ows:Keyword>sensorml</ows:Keyword>
+ <ows:Keyword>om</ows:Keyword>
+ </ows:Keywords>
+ <ows:ServiceType codeSpace="OGC">SOS</ows:ServiceType>
+ <ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>
+ <ows:Fees>none</ows:Fees>
+ <ows:AccessConstraints>none</ows:AccessConstraints>
+ </ows:ServiceIdentification>
+ <ows:ServiceProvider>
+ <ows:ProviderName>MapServer</ows:ProviderName>
+ <ows:ProviderSite xlink:type="simple" xlink:href="http://localhost"/>
+ <ows:ServiceContact>
+ <ows:IndividualName>Tom Kralidis</ows:IndividualName>
+ <ows:PositionName>self</ows:PositionName>
+ <ows:ContactInfo>
+ <ows:Phone>
+ <ows:Voice>+xx-xxx-xxx-xxxx</ows:Voice>
+ <ows:Facsimile>+xx-xxx-xxx-xxxx</ows:Facsimile>
+ </ows:Phone>
+ <ows:Address>
+ <ows:DeliveryPoint>123 SomeRoad Road</ows:DeliveryPoint>
+ <ows:City>Toronto</ows:City>
+ <ows:AdministrativeArea>Ontario</ows:AdministrativeArea>
+ <ows:PostalCode>xxx-xxx</ows:PostalCode>
+ <ows:Country>Canada</ows:Country>
+ <ows:ElectronicMailAddress>tomkralidis at xxxxxxx.xxx</ows:ElectronicMailAddress>
+ </ows:Address>
+ <ows:OnlineResource xlink:type="simple" xlink:href="http://localhost"/>
+ <ows:HoursOfService>0800h - 1600h EST</ows:HoursOfService>
+ <ows:ContactInstructions>during hours of service</ows:ContactInstructions>
+ </ows:ContactInfo>
+ <ows:Role>staff</ows:Role>
+ </ows:ServiceContact>
+ </ows:ServiceProvider>
+ <ows:OperationsMetadata>
+ <ows:Operation name="GetCapabilities">
+ <ows:DCP>
+ <ows:HTTP>
+ <ows:Get xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ </ows:HTTP>
+ </ows:DCP>
+ <ows:Parameter name="service">
+ <ows:Value>SOS</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="version">
+ <ows:Value>1.0.0</ows:Value>
+ </ows:Parameter>
+ </ows:Operation>
+ <ows:Operation name="DescribeSensor">
+ <ows:DCP>
+ <ows:HTTP>
+ <ows:Get xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ </ows:HTTP>
+ </ows:DCP>
+ <ows:Parameter name="service">
+ <ows:Value>SOS</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="version">
+ <ows:Value>1.0.0</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="sensorid">
+ <ows:Value>urn:ogc:object:procedure</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="outputFormat">
+ <ows:Value>text/xml; subtype=sensorML/1.0.0</ows:Value>
+ </ows:Parameter>
+ </ows:Operation>
+ <ows:Operation name="GetObservation">
+ <ows:DCP>
+ <ows:HTTP>
+ <ows:Get xlink:type="simple" xlink:href="http://localhost/cgi-bin/sostest?"/>
+ </ows:HTTP>
+ </ows:DCP>
+ <ows:Parameter name="service">
+ <ows:Value>SOS</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="version">
+ <ows:Value>1.0.0</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="offering">
+ <ows:Value>urn:ogc:object:offering</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="observedproperty">
+ <ows:Value>urn:ogc:object:observedproperty</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="eventtime">
+ <ows:Value>sos:time</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="procedure">
+ <ows:Value>urn:ogc:object:sensor</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="featureofinterest">
+ <ows:Value>gml:location</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="result">
+ <ows:Value>ogc:Filter</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="responseFormat">
+ <ows:Value>text/xml; subtype=om/1.0.0</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="resultModel">
+ <ows:Value>Observation</ows:Value>
+ <ows:Value>Measurement</ows:Value>
+ </ows:Parameter>
+ </ows:Operation>
+ <ows:Constraint name="DefaultMaxFeatures">
+ <ows:Value>90210</ows:Value>
+ </ows:Constraint>
+ </ows:OperationsMetadata>
+ <ogc:Filter_Capabilities>
+ <ogc:Spatial_Capabilities>
+ <ogc:Spatial_Operators>
+ <ogc:Equals/>
+ <ogc:Disjoint/>
+ <ogc:Touches/>
+ <ogc:Within/>
+ <ogc:Overlaps/>
+ <ogc:Crosses/>
+ <ogc:Intersect/>
+ <ogc:Contains/>
+ <ogc:DWithin/>
+ <ogc:BBOX/>
+ </ogc:Spatial_Operators>
+ </ogc:Spatial_Capabilities>
+ <ogc:Scalar_Capabilities>
+ <ogc:Logical_Operators/>
+ <ogc:Comparison_Operators>
+ <ogc:Simple_Comparisons/>
+ <ogc:Like/>
+ <ogc:Between/>
+ </ogc:Comparison_Operators>
+ </ogc:Scalar_Capabilities>
+ </ogc:Filter_Capabilities>
+ <sos:Content>
+ <sos:ObservationOfferingList>
+ <sos:ObservationOffering gml:id="Water">
+ <gml:description>This is for water</gml:description>
+ <gml:name>Water</gml:name>
+ <gml:boundedBy>
+ <gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
+ <gml:lowerCorner>-141 42</gml:lowerCorner>
+ <gml:upperCorner>-52 84</gml:upperCorner>
+ </gml:Envelope>
+ </gml:boundedBy>
+ <sos:intendedApplication>for SOS demos</sos:intendedApplication>
+ <sos:time>
+ <gml:TimePeriod>
+ <gml:beginPosition>1990</gml:beginPosition>
+ <gml:endPosition>2007</gml:endPosition>
+ </gml:TimePeriod>
+ </sos:time>
+ <sos:procedure xlink:href="urn:ogc:def:procedure:35"/>
+ <sos:procedure xlink:href="urn:ogc:def:procedure:2147"/>
+ <sos:procedure xlink:href="urn:ogc:def:procedure:604"/>
+ <sos:observedProperty gml:id="WaterQuality">
+ <sos:CompositePhenomenon>
+ <gml:name>WaterQuality</gml:name>
+ </sos:CompositePhenomenon>
+ </sos:observedProperty>
+ <sos:featureOfInterest>
+ <gml:boundedBy>
+ <gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
+ <gml:lowerCorner>-141 42</gml:lowerCorner>
+ <gml:upperCorner>-52 84</gml:upperCorner>
+ </gml:Envelope>
+ </gml:boundedBy>
+ </sos:featureOfInterest>
+ <sos:responseFormat>text/xml; subtype=om/1.0.0</sos:responseFormat>
+ <sos:resultModel>om:Observation</sos:resultModel>
+ <sos:resultModel>om:Measurement</sos:resultModel>
+ <sos:responseMode>inline</sos:responseMode>
+ </sos:ObservationOffering>
+ </sos:ObservationOfferingList>
+ </sos:Content>
+</sos:Capabilities>
Added: trunk/msautotest/wxs/expected/sos_se4.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_se4.xml (rev 0)
+++ trunk/msautotest/wxs/expected/sos_se4.xml 2007-12-01 21:59:39 UTC (rev 7135)
@@ -0,0 +1,8 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.0.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
+ <Exception exceptionCode="MissingParameterValue" locator="sensorid">
+ <ExceptionText>msSOSDescribeSensor(): SOS server error. Missing mandatory parameter sensorid</ExceptionText>
+ </Exception>
+</ows:ExceptionReport>
Added: trunk/msautotest/wxs/expected/sos_se5.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_se5.xml (rev 0)
+++ trunk/msautotest/wxs/expected/sos_se5.xml 2007-12-01 21:59:39 UTC (rev 7135)
@@ -0,0 +1,8 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.0.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
+ <Exception exceptionCode="MissingParameterValue" locator="outputformat">
+ <ExceptionText>msSOSDescribeSensor(): SOS server error. Missing mandatory parameter outputFormat.</ExceptionText>
+ </Exception>
+</ows:ExceptionReport>
Added: trunk/msautotest/wxs/expected/sos_se6.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_se6.xml (rev 0)
+++ trunk/msautotest/wxs/expected/sos_se6.xml 2007-12-01 21:59:39 UTC (rev 7135)
@@ -0,0 +1,8 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.0.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
+ <Exception exceptionCode="InvalidParameterValue" locator="outputformat">
+ <ExceptionText>msSOSDescribeSensor(): SOS server error. Invalid outputformat parameter XML. Allowable values are: text/xml; subtype=sensorML/1.0.0</ExceptionText>
+ </Exception>
+</ows:ExceptionReport>
Added: trunk/msautotest/wxs/expected/sos_se7.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_se7.xml (rev 0)
+++ trunk/msautotest/wxs/expected/sos_se7.xml 2007-12-01 21:59:39 UTC (rev 7135)
@@ -0,0 +1,8 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<ows:ExceptionReport xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ows="http://www.opengis.net/ows" version="1.0.0" language="en-US" xsi:schemaLocation="http://www.opengis.net/ows http://schemas.opengis.net/ows/1.0.0/owsExceptionReport.xsd">
+ <Exception exceptionCode="InvalidParameterValue" locator="sensorid">
+ <ExceptionText>msSOSDescribeSensor(): SOS server error. sensorid 20147 not found.</ExceptionText>
+ </Exception>
+</ows:ExceptionReport>
Modified: trunk/msautotest/wxs/sos.map
===================================================================
--- trunk/msautotest/wxs/sos.map 2007-12-01 11:12:31 UTC (rev 7134)
+++ trunk/msautotest/wxs/sos.map 2007-12-01 21:59:39 UTC (rev 7135)
@@ -4,9 +4,29 @@
# REQUIRES: INPUT=OGR SUPPORTS=PROJ SUPPORTS=SOS_SERVER
#
# Capabilities
+#
+# Exceptions
+#
+# RUN_PARMS: sos_se0.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS" > [RESULT]
+# RUN_PARMS: sos_se1.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0" > [RESULT]
+# RUN_PARMS: sos_se2.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=FOO" > [RESULT]
+# RUN_PARMS: sos_se3.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.3.0&request=GetCapabilities" > [RESULT]
+#
+# Valid
+#
# RUN_PARMS: sos_cap.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=GetCapabilities" > [RESULT_DEVERSION]
#
# DescribeSensor
+#
+# Exceptions
+#
+# RUN_PARMS: sos_se4.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor" > [RESULT]
+# RUN_PARMS: sos_se5.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor&sensorid=2147" > [RESULT]
+# RUN_PARMS: sos_se6.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor&sensorid=2147&outputFormat=XML" > [RESULT]
+# RUN_PARMS: sos_se7.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor&sensorid=20147&outputFormat=text/xml; subtype=sensorML/1.0.0" > [RESULT]
+#
+# Valid
+#
# RUN_PARMS: sos_describe.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&service=SOS&version=1.0.0&request=DescribeSensor&sensorId=35&outputFormat=text/xml; subtype=sensorML/1.0.0" > [RESULT]
#
# GetObservation (all observations)
More information about the mapserver-commits
mailing list