pnever 2004/01/09 09:38:30
Modified: testsuite/bin TProcessor.CMD
testsuite/testsuite/junit/xmltestcases/functional/XML
multiplePutGets.xml
testsuite/testsuite/junit/xmltestcases/functional/extra/get/code
get200.xml
testsuite/testsuite/junit/xmltestcases/functional/get/code
get200.xml
Log:
Some changes for compatibility with TC 4.1.29
Revision Changes Path
1.31 +4 -1 jakarta-slide/testsuite/bin/TProcessor.CMD
Index: TProcessor.CMD
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/bin/TProcessor.CMD,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- TProcessor.CMD 4 Dec 2003 20:47:29 -0000 1.30
+++ TProcessor.CMD 9 Jan 2004 17:38:30 -0000 1.31
@@ -33,6 +33,7 @@
set TP_ITERATIONS=1
set TESTCASE_PATH=
set TESTCASE_PATTERN=
+set XML_REFERENCE=
set PAR=
set TP_DEBUG=false
set TP_VERBOSE=false
@@ -204,10 +205,12 @@
if "%DAV_AUTH%" == "urmnone" set DAV_USER=unauthenticated
if "%DAV_AUTH%" == "urmnone" set USER_PATH=%ROOT_USER_PATH%/users/%DAV_USER%
if "%DAV_AUTH%" == "urmnone" set TESTCASE_EXCLUDE=%TESTCASE_EXCLUDE% -exclude
"*groupFunctional*" -exclude "*ACL*"
+if "%DAV_AUTH%" == "urmnone" set XML_REFERENCE=taminoReference/
if "%DAV_AUTH%" == "urm" set
ROOT_USER_PATH=/%DAV_NAME%/administration/security/userdb
if "%DAV_AUTH%" == "urm" set USER_PATH=%ROOT_USER_PATH%/users/%DAV_USER%
if "%DAV_AUTH%" == "urm" set ACTION_PATH=/%DAV_NAME%/administration/security/actions
+if "%DAV_AUTH%" == "urm" set XML_REFERENCE=taminoReference/
rem <<< END *** TEMPORARY *** for Tamino only
@@ -236,7 +239,7 @@
set OPTS=%OPTS% -Dxdav.workdb=%TP_WORKDB%
set OPTS=%OPTS% -Dxdav.workhost=%TP_WORKHOST%
set OPTS=%OPTS% -Dhttpclient.authentication.preemptive=true
-set OPTS=%OPTS% -Dxdav.globalVariableXMLReference=taminoReference/
+set OPTS=%OPTS% -Dxdav.globalVariableXMLReference=%XML_REFERENCE%
if "%TP_VERBOSE%" == "true" set OPTS=%OPTS% -Dxdav.tracingRequest=var
1.5 +82 -80
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/XML/multiplePutGets.xml
Index: multiplePutGets.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/XML/multiplePutGets.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- multiplePutGets.xml 3 Nov 2003 19:22:14 -0000 1.4
+++ multiplePutGets.xml 9 Jan 2004 17:38:30 -0000 1.5
@@ -1,88 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE test SYSTEM "../../../Tprocessor.dtd">
<test>
- <specification>
- <abstract>3 user, update the same resource (PUT on existing
resource).</abstract>
- <pre-Requisite>A collection exists and is defined in
TProcessor.cmd.</pre-Requisite>
- <description>
+ <specification>
+ <abstract>3 user, update the same resource (PUT on existing
resource).</abstract>
+ <pre-Requisite>A collection exists and is defined in
TProcessor.cmd.</pre-Requisite>
+ <description>
1)PUT command followed by a GET command carried out 3 times to the same
file.
2)File is deleated.
</description>
- <expectedResult>Each users may be able to successfully carry
+ <expectedResult>Each users may be able to successfully carry
out a PUT command followed by a GET command.</expectedResult>
- </specification>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/lock.xml HTTP/1.1</command>
- <body fileReference="../../contentDirectory/validXML.xm1" />
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/lock.xml HTTP/1.1
HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <header>Content-Type: text/xml</header>
- <body varUsage="globalVariableXMLReference"
fileReference="../../contentDirectory/%globalVariableXMLReference%validXML.xm1" />
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/lock.xml HTTP/1.1</command>
- <body fileReference="../../contentDirectory/validXML.xm1" />
- </request>
- <response>
- <command>HTTP/1.0 (201,204) Created</command>
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/lock.xml HTTP/1.1
HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <header>Content-Type: text/xml</header>
- <body varUsage="globalVariableXMLReference"
fileReference="../../contentDirectory/%globalVariableXMLReference%validXML.xm1" />
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/help-doc.xml HTTP/1.1</command>
- <body fileReference="../../contentDirectory/validXML.xm1" />
- </request>
- <response>
- <command>HTTP/1.0 (201,204) Created</command>
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/help-doc.xml</command>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <header>Content-Type: text/xml</header>
- <body varUsage="globalVariableXMLReference"
fileReference="../../contentDirectory/%globalVariableXMLReference%validXML.xm1" />
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/help-doc.xml HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/lock.xml HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
+ </specification>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/lock.xml HTTP/1.1</command>
+ <header>Content-Type: text/xml;charset=iso-8859-1</header>
+ <body fileReference="../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/lock.xml HTTP/1.1
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <header>Content-Type: text/xml;charset=iso-8859-1</header>
+ <body varUsage="globalVariableXMLReference"
fileReference="../../contentDirectory/%globalVariableXMLReference%validXML.xm1"/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/lock.xml HTTP/1.1</command>
+ <header>Content-Type: text/xml;charset=iso-8859-1</header>
+ <body fileReference="../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 (201,204) Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/lock.xml HTTP/1.1
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <header>Content-Type: text/xml;charset=iso-8859-1</header>
+ <body varUsage="globalVariableXMLReference"
fileReference="../../contentDirectory/%globalVariableXMLReference%validXML.xm1"/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/help-doc.xml HTTP/1.1</command>
+ <header>Content-Type: text/xml;charset=iso-8859-1</header>
+ <body fileReference="../../contentDirectory/validXML.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 (201,204) Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/help-doc.xml</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <header>Content-Type: text/xml;charset=iso-8859-1</header>
+ <body varUsage="globalVariableXMLReference"
fileReference="../../contentDirectory/%globalVariableXMLReference%validXML.xm1"/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/help-doc.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/lock.xml HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
</test>
-
1.4 +34 -34
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/get/code/get200.xml
Index: get200.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/extra/get/code/get200.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- get200.xml 3 Nov 2003 19:22:16 -0000 1.3
+++ get200.xml 9 Jan 2004 17:38:30 -0000 1.4
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
- <specification>
- <abstract> Checks if Get Method with Status code 200 works fine. </abstract>
- <pre-Requisite> In header, no if-modified-since should be
present</pre-Requisite>
- <description> The test case consist of following steps: puts a files in a
directory, does a get on the file, and deletes the file</description>
- <expectedResult> Status code returned by Get Method must be 200 ok
</expectedResult>
- </specification>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
- <body fileReference="../../../../contentDirectory/html.html" />
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <header>Content-Type: text/html</header>
- <body fileReference="../../../../contentDirectory/html.html" />
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
+ <specification>
+ <abstract> Checks if Get Method with Status code 200 works fine. </abstract>
+ <pre-Requisite> In header, no if-modified-since should be
present</pre-Requisite>
+ <description> The test case consist of following steps: puts a files in a
directory, does a get on the file, and deletes the file</description>
+ <expectedResult> Status code returned by Get Method must be 200 ok
</expectedResult>
+ </specification>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
+ <header>Content-Type: text/html;charset=utf-8</header>
+ <body fileReference="../../../../contentDirectory/html.html"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <header>Content-Type: text/html;charset=utf-8</header>
+ <body fileReference="../../../../contentDirectory/html.html"/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
</test>
-
1.4 +34 -34
jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/get/code/get200.xml
Index: get200.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/get/code/get200.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- get200.xml 3 Nov 2003 19:22:17 -0000 1.3
+++ get200.xml 9 Jan 2004 17:38:30 -0000 1.4
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
<test>
- <specification>
- <abstract> Checks if Get Method with Status code 200 works fine. </abstract>
- <pre-Requisite> In header, if-modified-since should be present</pre-Requisite>
- <description> The test case consist of following steps: PUTs a file, performs a
GET on it and then DELETEs the file</description>
- <expectedResult> Status code returned by Get Method must be 200 Not Modified
</expectedResult>
- </specification>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
- <body fileReference="../../../contentDirectory/html.html" />
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 200 OK</command>
- <header>Content-Type: text/html</header>
- <body fileReference="../../../contentDirectory/html.html" />
- </response>
- </step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
+ <specification>
+ <abstract> Checks if Get Method with Status code 200 works fine. </abstract>
+ <pre-Requisite> In header, if-modified-since should be
present</pre-Requisite>
+ <description> The test case consist of following steps: PUTs a file,
performs a GET on it and then DELETEs the file</description>
+ <expectedResult> Status code returned by Get Method must be 200 Not
Modified </expectedResult>
+ </specification>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
+ <header>Content-Type: text/html;charset=utf-8</header>
+ <body fileReference="../../../contentDirectory/html.html"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">GET
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <header>Content-Type: text/html;charset=utf-8</header>
+ <body fileReference="../../../contentDirectory/html.html"/>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/%globalVariableCollection%/resource1.html
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
</test>
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
