Index: /trunk/testing/requests/igml_o.xml =================================================================== --- /trunk/testing/requests/igml_o.xml (revision 542) +++ /trunk/testing/requests/igml_o.xml (revision 543) @@ -3,5 +3,5 @@ -InputPolygon +InputName Playground area Index: /trunk/testing/run.sh =================================================================== --- /trunk/testing/run.sh (revision 542) +++ /trunk/testing/run.sh (revision 543) @@ -4,13 +4,15 @@ 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. + ./run.sh + +where should be the url to a WPS Server, should +be the service name you want to run tests with (you can use multiple service +names, use quote and seperate them using space), should contain the +requests you want to use (you can use more than one at a time). 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 + ./run.sh http://localhost/cgi-bin/zoo_loader.cgi Buffer "GetCapabilities DescribeProcess Execute" EOF @@ -26,10 +28,42 @@ NBRequests=1000 NBConcurrents=50 +pstat=0 + +iter=0 + +function testPostRequests { +# +# Tests for Execute using POST requests +# + for i in $1; + do + cat requests/${i}.xml | sed "s:ServiceName:${ServiceName}:g;s:InputName:$(cat tmp/inputName.txt):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 + +} + +function plotStat { + echo " **" + echo " * Plot statistics ..." + echo " **" + cp run.tsv tmp/run$1.tsv + sed "s:\[image\]:$2:g;s:\[file\]:$3:g" -i tmp/run$1.tsv + gnuplot tmp/run$1.tsv + cp run1.tsv tmp/run1$1.tsv + sed "s:\[image\]:$(echo $2 | sed "s:.jpg:1.jpg:g"):g;s:\[file\]:$3:g" -i tmp/run1$1.tsv + gnuplot tmp/run1$1.tsv +} + function kvpRequest { echo " **" - echo " * Simple KVP request start on $(date)" - echo " * [$1] " - echo " **" + echo "

Simple KVP request start on $(date)

" + echo " $1" RESP=$(curl -v -o "$2" "$1" 2> tmp/temp.log; grep "< HTTP" tmp/temp.log | cut -d' ' -f3) @@ -45,5 +79,5 @@ echo " * Schema: [http://schemas.opengis.net/ows/1.1.0/${3}.xsd]" echo " *********************************" - xmllint --noout --schema http://schemas.opengis.net/ows/1.1.0/${3}.xsd "$2" + xmllint --noout --schema http://schemas.opengis.net/ows/1.1.0/${3}.xsd "$2" 2> tmp/res${iter}.txt echo " *********************************" echo "Verifying that the missing / wrong argument was referenced in locator and the exceptionCode take the corresponding value ..." @@ -59,10 +93,16 @@ echo " * Checking for ${3} response XML validity..." echo " * Schema: [http://schemas.opengis.net/wps/1.0.0/wps${3}_response.xsd]" - xmllint --noout --schema http://schemas.opengis.net/wps/1.0.0/wps${3}_response.xsd "$2" - fi - echo " **" - echo " * Sending 10000 ${3} requests starting on $(date) ..." - echo " **" - ab -n "$NBRequests" -c "$NBConcurrents" "$1" + xmllint --noout --schema http://schemas.opengis.net/wps/1.0.0/wps${3}_response.xsd "$2" 2> tmp/res${iter}.txt + v="$(cat tmp/res${iter}.txt | grep validates)" + echo "" + fi + echo " **" + echo " * Sending $NBRequests ${3} requests starting on $(date) ..." + echo " **" + ab -g tmp/stat${3}${iter}.plot -e tmp/stat${3}${iter}.txt -n "$NBRequests" -c "$NBConcurrents" "$1" + if [ "$pstat" -eq 1 ]; then + plotStat ${iter} tmp/stat${3}${iter}.jpg tmp/stat${3}${iter}.plot + fi + iter=$(expr $iter + 1) echo " ** Ending on $(date)" } @@ -91,6 +131,10 @@ echo " *********************************" fi - echo " * Sending 10000 ${3} XML requests on $(date) ..." - ab -T "text/xml" -p "$4" -n "$NBRequests" -c "$NBConcurrents" "$1" + echo " * Sending $NBRequests ${3} XML requests on $(date) ..." + ab -g tmp/stat${3}${iter}.plot -e tmp/stat${3}${iter}.txt -T "text/xml" -p "$4" -n "$NBRequests" -c "$NBConcurrents" "$1" + if [ "$pstat" -eq 1 ]; then + plotStat ${iter} tmp/stat${3}${iter}.jpg tmp/stat${3}${iter}.plot + fi + iter=$(expr $iter + 1) echo " ** Ending on $(date)" } @@ -140,75 +184,72 @@ } - +for i in $3; do + if [ "$i" == "GetCapabilities" ]; then # # Tests for GetCapabilities using KVP (including wrong requests) and POST requests # -kvpRequest "${WPSInstance}?REQUEST=GetCapabilities&SERVICE=WPS" "tmp/outputGC1.xml" "GetCapabilities" - -params='"request=GetCapabilities" "service=WPS"' - -suffix=$(kvpRequestWrite -1 "$params") -kvpRequest "${WPSInstance}?$suffix" "tmp/outputGC2.xml" "GetCapabilities" - -for j in 0 1; do - suffix=$(kvpRequestWrite $j "$params") - kvpRequest "${WPSInstance}?$suffix" "tmp/outputGC$(expr $j + 3).xml" "owsExceptionReport" + kvpRequest "${WPSInstance}?REQUEST=GetCapabilities&SERVICE=WPS" "tmp/outputGC1.xml" "GetCapabilities" + + params='"request=GetCapabilities" "service=WPS"' + + suffix=$(kvpRequestWrite -1 "$params") + kvpRequest "${WPSInstance}?$suffix" "tmp/outputGC2.xml" "GetCapabilities" + + for j in 0 1; do + suffix=$(kvpRequestWrite $j "$params") + kvpRequest "${WPSInstance}?$suffix" "tmp/outputGC$(expr $j + 3).xml" "owsExceptionReport" + done + + paramsw='"request=GetCapabilitie" "service=WXS"' + for j in 0 1; do + suffix=$(kvpWrongRequestWrite $j "$params" "$paramsw") + kvpRequest "${WPSInstance}?$suffix" "tmp/outputGC$(expr $j + 5).xml" "owsExceptionReport" + done + + 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 "" + fi + if [ "$i" == "DescribeProcess" ]; then +# +# Tests for DescribeProcess using KVP and POST requests +# + kvpRequest "${WPSInstance}?request=DescribeProcess&service=WPS&version=1.0.0&Identifier=ALL" "tmp/outputDPall.xml" "DescribeProcess" + + params='"request=DescribeProcess" "service=WPS" "version=1.0.0" "Identifier='${ServiceName}'"' + + suffix=$(kvpRequestWrite -1 "$params") + kvpRequest "${WPSInstance}?$suffix" "tmp/outputDPb1.xml" "DescribeProcess" + + for j in 0 1 2 3; do + suffix=$(kvpRequestWrite $j "$params") + kvpRequest "${WPSInstance}?$suffix" "tmp/outputDPb$(expr $j + 2).xml" "owsExceptionReport" + done + + paramsw='"request=DescribeProces" "service=WXS" "version=1.2.0" "Identifier=Undefined"' + + for j in 0 1 2 3; do + suffix=$(kvpWrongRequestWrite $j "$params") + kvpRequest "${WPSInstance}?$suffix" "tmp/outputDPb$(expr $j + 6).xml" "owsExceptionReport" + done + + + cat requests/dp.xml | sed "s:ServiceName:${ServiceName}:g" > tmp/dp1.xml + postRequest "${WPSInstance}" "tmp/outputDPp.xml" "DescribeProcess" "tmp/dp1.xml" + xsltproc extractInputs.xsl tmp/outputDPp.xml > tmp/inputName.txt + echo "" + fi + if [ "$i" == "ExecuteSync" ]; then + testPostRequests "ijson_o igml_o ir_o ir_or irb_o irb_or" + echo "" + fi + if [ "$i" == "ExecuteAsync" ]; then + testPostRequests "ir_o_async ir_or_async irb_o_async irb_or_async" + echo "" + fi done - -paramsw='"request=GetCapabilitie" "service=WXS"' -for j in 0 1; do - suffix=$(kvpWrongRequestWrite $j "$params" "$paramsw") - kvpRequest "${WPSInstance}?$suffix" "tmp/outputGC$(expr $j + 5).xml" "owsExceptionReport" -done - -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" - -params='"request=DescribeProcess" "service=WPS" "version=1.0.0" "Identifier='${ServiceName}'"' - -suffix=$(kvpRequestWrite -1 "$params") -kvpRequest "${WPSInstance}?$suffix" "tmp/outputDPb1.xml" "DescribeProcess" - -for j in 0 1 2 3; do - suffix=$(kvpRequestWrite $j "$params") - kvpRequest "${WPSInstance}?$suffix" "tmp/outputDPb$(expr $j + 2).xml" "owsExceptionReport" -done - -paramsw='"request=DescribeProces" "service=WXS" "version=1.2.0" "Identifier=Undefined"' - -for j in 0 1 2 3; do - suffix=$(kvpWrongRequestWrite $j "$params") - kvpRequest "${WPSInstance}?$suffix" "tmp/outputDPb$(expr $j + 6).xml" "owsExceptionReport" -done - - -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 ijson_o igml_o 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-project/HISTORY.txt =================================================================== --- /trunk/zoo-project/HISTORY.txt (revision 542) +++ /trunk/zoo-project/HISTORY.txt (revision 543) @@ -1,3 +1,9 @@ Version 1.4.0-dev + * Binary support for PHP language + * ZOO-API for the Java language + * ZOO-Client Javascript API + * FastCGI fixes + * JavaScript ZOO-API enhancements (COOKIE use and Output in generated XML) + * Add debian files * Inputs passed by reference downloaded in parallel * Conform behavior for DescribeProcess when the Identifier was not found Index: /trunk/zoo-project/zoo-services/cgal/Makefile =================================================================== --- /trunk/zoo-project/zoo-services/cgal/Makefile (revision 542) +++ /trunk/zoo-project/zoo-services/cgal/Makefile (revision 543) @@ -1,5 +1,5 @@ ZRPATH=../.. include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts -CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} ${CGAL_CFLAGS} -fPIC -DLINUX_FREE_ISSUE #-DDEBUG +CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} ${CGAL_CFLAGS} -frounding-math -fPIC -DLINUX_FREE_ISSUE #-DDEBUG CC=gcc @@ -7,5 +7,5 @@ g++ ${CFLAGS} -c ./delaunay.c g++ ${CFLAGS} -c ./voronoi.c - g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o ./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${MACOS_LD_FLAGS} ${CGAL_LDFLAGS} -lCGAL -lgmp + g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o ./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${MACOS_LD_FLAGS} ${CGAL_LDFLAGS} -lCGAL -lgmp -lgdal cgal_service.o: cgal_service.c cgal_service.h