Index: /trunk/testing/README =================================================================== --- /trunk/testing/README (revision 261) +++ /trunk/testing/README (revision 261) @@ -0,0 +1,30 @@ +Please use the following syntaxe: + + ./run.sh + +where should be the url to a WPS Server and should +be the service name you want to run tests with. + +For instance to test the Buffer service on a localhost WPS server, use the +following command: + + ./run.sh http://localhost/cgi-bin/zoo_loader.cgi Buffer + + +Important note: sometimes XML validation failed because xmllint is unable to download +a file required to validate. In such case, you can use the file /etc/xml/catalog on your +local machine to use a local copy of the missing file. + +For instance, in case xml.xsd can't be downloaded, then you can download a copy using +this url http://www.w3.org/2001/xml.xsd, store it in /etc/schemas directory and then +use the following /etc/xml/catalog file: + + + + + + + +Obviously, you can do similar manipulation for the OGC schemas to use local files +rather than downloading them for each tests. Index: /trunk/testing/extractStatusLocation.xsl =================================================================== --- /trunk/testing/extractStatusLocation.xsl (revision 261) +++ /trunk/testing/extractStatusLocation.xsl (revision 261) @@ -0,0 +1,15 @@ + + + + + + + + + + + Index: /trunk/testing/requests/dp.xml =================================================================== --- /trunk/testing/requests/dp.xml (revision 261) +++ /trunk/testing/requests/dp.xml (revision 261) @@ -0,0 +1,4 @@ + + + ServiceName + Index: /trunk/testing/requests/ir_o.xml =================================================================== --- /trunk/testing/requests/ir_o.xml (revision 261) +++ /trunk/testing/requests/ir_o.xml (revision 261) @@ -0,0 +1,17 @@ + +ServiceName + + +InputPolygon +Playground area + + + + + + +Result + + + + Index: /trunk/testing/requests/ir_o_async.xml =================================================================== --- /trunk/testing/requests/ir_o_async.xml (revision 261) +++ /trunk/testing/requests/ir_o_async.xml (revision 261) @@ -0,0 +1,17 @@ + +ServiceName + + +InputPolygon +Playground area + + + + + + +Result + + + + Index: /trunk/testing/requests/ir_or.xml =================================================================== --- /trunk/testing/requests/ir_or.xml (revision 261) +++ /trunk/testing/requests/ir_or.xml (revision 261) @@ -0,0 +1,17 @@ + +ServiceName + + +InputPolygon +Playground area + + + + + + +Result + + + + Index: /trunk/testing/requests/ir_or_async.xml =================================================================== --- /trunk/testing/requests/ir_or_async.xml (revision 261) +++ /trunk/testing/requests/ir_or_async.xml (revision 261) @@ -0,0 +1,17 @@ + +ServiceName + + +InputPolygon +Playground area + + + + + + +Result + + + + Index: /trunk/testing/requests/irb_o.xml =================================================================== --- /trunk/testing/requests/irb_o.xml (revision 261) +++ /trunk/testing/requests/irb_o.xml (revision 261) @@ -0,0 +1,22 @@ + +ServiceName + + +InputPolygon +Playground area + + + +the_geom-98.417969 29.498046625-97.53906275 30.376952875 + + + + + + + +Result + + + + Index: /trunk/testing/requests/irb_o_async.xml =================================================================== --- /trunk/testing/requests/irb_o_async.xml (revision 261) +++ /trunk/testing/requests/irb_o_async.xml (revision 261) @@ -0,0 +1,22 @@ + +ServiceName + + +InputPolygon +Playground area + + + +the_geom-98.417969 29.498046625-97.53906275 30.376952875 + + + + + + + +Result + + + + Index: /trunk/testing/requests/irb_or.xml =================================================================== --- /trunk/testing/requests/irb_or.xml (revision 261) +++ /trunk/testing/requests/irb_or.xml (revision 261) @@ -0,0 +1,22 @@ + +ServiceName + + +InputPolygon +Playground area + + + +the_geom-98.417969 29.498046625-97.53906275 30.376952875 + + + + + + + +Result + + + + Index: /trunk/testing/requests/irb_or_async.xml =================================================================== --- /trunk/testing/requests/irb_or_async.xml (revision 261) +++ /trunk/testing/requests/irb_or_async.xml (revision 261) @@ -0,0 +1,22 @@ + +ServiceName + + +InputPolygon +Playground area + + + +the_geom-98.417969 29.498046625-97.53906275 30.376952875 + + + + + + + +Result + + + + Index: /trunk/testing/run.sh =================================================================== --- /trunk/testing/run.sh (revision 261) +++ /trunk/testing/run.sh (revision 261) @@ -0,0 +1,93 @@ +#!/bin/bash + +Usage=$(cat < + +where should be the url to a WPS Server and should +be the service name you want to run tests with. + +For instance to test the Buffer service on a localhost WPS server, use the +following command: + + ./run.sh http://localhost/cgi-bin/zoo_loader.cgi Buffer + +EOF +) + +if [ -z "$1" ] || [ -z "$2" ]; then + echo "$Usage" + exit +fi + +WPSInstance=$1 +ServiceName=$2 + +function kvpRequest { + echo "Simple KVP request " + echo "$1" + curl -o "$2" "$1" + echo "Checking for ${3} response XML validity..." + xmllint --noout --schema http://schemas.opengis.net/wps/1.0.0/wps${3}_response.xsd "$2" +} + +function postRequest { + echo "Simple POST request " + echo "Checking for ${3} request XML validity..." + xmllint --noout --schema http://schemas.opengis.net/wps/1.0.0/wps${3}_request.xsd "$4" + curl -H "Content-type: text/xml" -d@"$4" -o "$2" "$1" + echo "Checking for ${3} response XML validity..." + xmllint --noout --schema http://schemas.opengis.net/wps/1.0.0/wps${3}_response.xsd "$2" + if [ -z "$5" ]; then + echo "" + else + xmllint --noout --schema http://schemas.opengis.net/wps/1.0.0/wps${3}_response.xsd "$(xsltproc ./extractStatusLocation.xsl $2)" + fi +} + + +# +# Tests for GetCapabilities using KVP and POST requests +# +kvpRequest "${WPSInstance}?request=GetCapabilities&service=WPS" "tmp/outputGC1.xml" "GetCapabilities" + +kvpRequest "${WPSInstance}?REQUEST=GetCapabilities&SERVICE=WPS" "tmp/outputGC2.xml" "GetCapabilities" + +echo "Check if differences between upper case and lower case parameter names" +diff -ru tmp/outputGC1.xml tmp/outputGC2.xml + +echo "" + +curl -o tmp/10_wpsGetCapabilities_request.xml http://schemas.opengis.net/wps/1.0.0/examples/10_wpsGetCapabilities_request.xml +postRequest "${WPSInstance}" "tmp/outputGCp.xml" "GetCapabilities" "tmp/10_wpsGetCapabilities_request.xml" +echo "" + +# +# Tests for DescribeProcess using KVP and POST requests +# +kvpRequest "${WPSInstance}?request=DescribeProcess&service=WPS&version=1.0.0&Identifier=ALL" "tmp/outputDPall.xml" "DescribeProcess" + +kvpRequest "${WPSInstance}?request=DescribeProcess&service=WPS&version=1.0.0&Identifier=${ServiceName}" "tmp/outputDPb1.xml" "DescribeProcess" + +echo "" + +cat requests/dp.xml | sed "s:ServiceName:${ServiceName}:g" > tmp/dp1.xml +postRequest "${WPSInstance}" "tmp/outputDPp.xml" "DescribeProcess" "tmp/dp1.xml" +echo "" + +# +# Tests for Execute using KVP and POST requests +# +for i in ir_o ir_o_async ir_or ir_or_async irb_o irb_o_async irb_or irb_or_async; +do + cat requests/${i}.xml | sed "s:ServiceName:${ServiceName}:g" > tmp/${i}1.xml + if [ -z "$(echo $i | grep async)" ]; then + postRequest "${WPSInstance}" "tmp/outputE${i}.xml" "Execute" "tmp/${i}1.xml" + else + postRequest "${WPSInstance}" "tmp/outputE${i}.xml" "Execute" "tmp/${i}1.xml" "async" + fi + echo "" +done + +echo "" Index: /trunk/zoo-services/ogr/base-vect-ops-py/cgi-env/SymDifferencePy.zcfg =================================================================== --- /trunk/zoo-services/ogr/base-vect-ops-py/cgi-env/SymDifferencePy.zcfg (revision 260) +++ /trunk/zoo-services/ogr/base-vect-ops-py/cgi-env/SymDifferencePy.zcfg (revision 261) @@ -66,5 +66,5 @@ Abstract = The symmetric difference between the two geometries. - Title = Symmetric Difference + title = Symmetric Difference Index: /trunk/zoo-services/ogr/ogr2ogr/cgi-env/Ogr2Ogr.zcfg =================================================================== --- /trunk/zoo-services/ogr/ogr2ogr/cgi-env/Ogr2Ogr.zcfg (revision 260) +++ /trunk/zoo-services/ogr/ogr2ogr/cgi-env/Ogr2Ogr.zcfg (revision 261) @@ -8,5 +8,5 @@ serviceProvider = ogr2ogr_service.zo - Title = My Demo + title = My Demo