Use curl configured at build time instead of curl found on system path.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@930634 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6fcc4a3379
commit
74684a0739
12 changed files with 72 additions and 48 deletions
|
|
@ -18,6 +18,8 @@
|
|||
# under the License.
|
||||
|
||||
echo "Testing..."
|
||||
here=`readlink -f $0`; here=`dirname $here`
|
||||
curl_prefix=`cat $here/../http/curl.prefix`
|
||||
uri=$1
|
||||
if [ "$uri" = "" ]; then
|
||||
uri="http://localhost:8090"
|
||||
|
|
@ -29,37 +31,37 @@ mkdir -p tmp
|
|||
sleep 2
|
||||
|
||||
# Test HTTP GET
|
||||
curl $uri/index.html 2>/dev/null >tmp/index.html
|
||||
$curl_prefix/bin/curl $uri/index.html 2>/dev/null >tmp/index.html
|
||||
diff tmp/index.html htdocs/index.html
|
||||
rc=$?
|
||||
|
||||
# Test ATOMPub
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl $uri/client/ >tmp/feed.xml 2>/dev/null
|
||||
$curl_prefix/bin/curl $uri/client/ >tmp/feed.xml 2>/dev/null
|
||||
diff tmp/feed.xml htdocs/feed.xml
|
||||
rc=$?
|
||||
fi
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl $uri/client/111 >tmp/entry.xml 2>/dev/null
|
||||
$curl_prefix/bin/curl $uri/client/111 >tmp/entry.xml 2>/dev/null
|
||||
diff tmp/entry.xml htdocs/entry.xml
|
||||
rc=$?
|
||||
fi
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl $uri/client/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
|
||||
$curl_prefix/bin/curl $uri/client/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
|
||||
rc=$?
|
||||
fi
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl $uri/client/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
|
||||
$curl_prefix/bin/curl $uri/client/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
|
||||
rc=$?
|
||||
fi
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl $uri/client/111 -X DELETE 2>/dev/null
|
||||
$curl_prefix/bin/curl $uri/client/111 -X DELETE 2>/dev/null
|
||||
rc=$?
|
||||
fi
|
||||
|
||||
# Test JSON-RPC
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl $uri/client/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
|
||||
$curl_prefix/bin/curl $uri/client/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
|
||||
diff tmp/json-result.txt htdocs/json-result.txt
|
||||
rc=$?
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
# under the License.
|
||||
|
||||
echo "Testing..."
|
||||
here=`readlink -f $0`; here=`dirname $here`
|
||||
curl_prefix=`cat $here/../http/curl.prefix`
|
||||
|
||||
# Setup
|
||||
mkdir -p tmp
|
||||
|
|
@ -25,37 +27,37 @@ mkdir -p tmp
|
|||
sleep 2
|
||||
|
||||
# Test HTTP GET
|
||||
curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
|
||||
$curl_prefix/bin/curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
|
||||
diff tmp/index.html htdocs/index.html
|
||||
rc=$?
|
||||
|
||||
# Test ATOMPub
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl http://localhost:8090/wsgi/ >tmp/feed.xml 2>/dev/null
|
||||
$curl_prefix/bin/curl http://localhost:8090/wsgi/ >tmp/feed.xml 2>/dev/null
|
||||
diff tmp/feed.xml htdocs/feed.xml
|
||||
rc=$?
|
||||
fi
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl http://localhost:8090/wsgi/111 >tmp/entry.xml 2>/dev/null
|
||||
$curl_prefix/bin/curl http://localhost:8090/wsgi/111 >tmp/entry.xml 2>/dev/null
|
||||
diff tmp/entry.xml htdocs/entry.xml
|
||||
rc=$?
|
||||
fi
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
|
||||
$curl_prefix/bin/curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
|
||||
rc=$?
|
||||
fi
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl http://localhost:8090/wsgi/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
|
||||
$curl_prefix/bin/curl http://localhost:8090/wsgi/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/entry.xml 2>/dev/null
|
||||
rc=$?
|
||||
fi
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl http://localhost:8090/wsgi/111 -X DELETE 2>/dev/null
|
||||
$curl_prefix/bin/curl http://localhost:8090/wsgi/111 -X DELETE 2>/dev/null
|
||||
rc=$?
|
||||
fi
|
||||
|
||||
# Test JSON-RPC
|
||||
if [ "$rc" = "0" ]; then
|
||||
curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
|
||||
$curl_prefix/bin/curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
|
||||
diff tmp/json-result.txt htdocs/json-result.txt
|
||||
rc=$?
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue