You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2004/08/17 17:30:29 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/copy/mix copyChangedProperties.xml copyDepth0.xml copyDepthInfinity.xml
luetzkendorf 2004/08/17 08:30:29
Modified: testsuite/testsuite/junit/xmltestcases/functional/copy/mix
copyChangedProperties.xml copyDepth0.xml
copyDepthInfinity.xml
Log:
continued
Revision Changes Path
1.2 +18 -16 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/copy/mix/copyChangedProperties.xml
Index: copyChangedProperties.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/copy/mix/copyChangedProperties.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copyChangedProperties.xml 17 Aug 2004 14:35:21 -0000 1.1
+++ copyChangedProperties.xml 17 Aug 2004 15:30:28 -0000 1.2
@@ -68,21 +68,23 @@
</response>
</step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/help-doc.html 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%/copy.html HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
- </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/help-doc.html 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%/copy.html HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +43 -14 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/copy/mix/copyDepth0.xml
Index: copyDepth0.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/copy/mix/copyDepth0.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copyDepth0.xml 17 Aug 2004 14:34:55 -0000 1.1
+++ copyDepth0.xml 17 Aug 2004 15:30:29 -0000 1.2
@@ -2,12 +2,12 @@
<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
<test>
<specification>
- <abstract></abstract>
+ <abstract>checks whether shallow copy does work</abstract>
<description>
1. mkcol c
- 2. put file to collection c
+ 2. fill the collection (with file, coll and file )
3. copy c with depth 0 to d
- 4. test that d ie empty
+ 4. test that d is empty
</description>
<expectedResult></expectedResult>
</specification>
@@ -30,41 +30,70 @@
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">COPY /%globalVariableServerName%/%globalVariableCollection%/c HTTP/1.1</command>
- <header varUsage="globalVariableCollection,globalVariableServerName">Destination: /%globalVariableServerName%/%globalVariableCollection%/d</header>
- <header>Depth: 0</header>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/c/sub HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 201 Created</command>
</response>
</step>
-
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/d/f.html HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/c/sub/g.html HTTP/1.1</command>
+ <body fileReference="../../../contentDirectory/html.html" />
</request>
<response>
- <command>HTTP/1.0 404 Not Found</command>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">COPY /%globalVariableServerName%/%globalVariableCollection%/c HTTP/1.1</command>
+ <header varUsage="globalVariableCollection,globalVariableServerName">Destination: /%globalVariableServerName%/%globalVariableCollection%/d</header>
+ <header>Depth: 0</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/c HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/d/f.html HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
</request>
<response>
- <command>HTTP/1.0 204 No Content</command>
+ <command>HTTP/1.0 404 Not Found</command>
</response>
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/d HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/d/sub/g.html HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
</request>
<response>
- <command>HTTP/1.0 204 No Content</command>
+ <command>HTTP/1.0 404 Not Found</command>
</response>
</step>
+
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/c 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%/d HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
1.2 +46 -15 jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/copy/mix/copyDepthInfinity.xml
Index: copyDepthInfinity.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/functional/copy/mix/copyDepthInfinity.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copyDepthInfinity.xml 17 Aug 2004 14:34:55 -0000 1.1
+++ copyDepthInfinity.xml 17 Aug 2004 15:30:29 -0000 1.2
@@ -2,12 +2,12 @@
<!DOCTYPE test SYSTEM "../../../../Tprocessor.dtd">
<test>
<specification>
- <abstract></abstract>
+ <abstract>checks whether shallow copy does work</abstract>
<description>
1. mkcol c
- 2. put file f to collection c
- 3. copy c with depth infinity to d
- 4. check file f exists in d too
+ 2. fill the collection (with file, coll and file )
+ 3. copy c with depth 0 to d
+ 4. test that d has the same content as c
</description>
<expectedResult></expectedResult>
</specification>
@@ -30,42 +30,73 @@
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">COPY /%globalVariableServerName%/%globalVariableCollection%/c HTTP/1.1</command>
- <header varUsage="globalVariableCollection,globalVariableServerName">Destination: /%globalVariableServerName%/%globalVariableCollection%/d</header>
- <header>Depth: infinity</header>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/c/sub HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/c/sub/g.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%/d/f.html HTTP/1.1</command>
- <header>Content-Type: text/xml</header>
+ <command varUsage="globalVariableCollection,globalVariableServerName">COPY /%globalVariableServerName%/%globalVariableCollection%/c HTTP/1.1</command>
+ <header varUsage="globalVariableCollection,globalVariableServerName">Destination: /%globalVariableServerName%/%globalVariableCollection%/d</header>
+ <header>Depth: infinity</header>
</request>
<response>
- <command>HTTP/1.0 200 OK</command>
- <body fileReference="../../../contentDirectory/html.html" />
+ <command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/c HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/d/f.html HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
</request>
<response>
- <command>HTTP/1.0 204 No Content</command>
+ <command>HTTP/1.0 200 OK</command>
+ <body fileReference="../../../contentDirectory/html.html" />
</response>
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/d HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName">GET /%globalVariableServerName%/%globalVariableCollection%/d/sub/g.html HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
</request>
<response>
- <command>HTTP/1.0 204 No Content</command>
+ <command>HTTP/1.0 200 OK</command>
+ <body fileReference="../../../contentDirectory/html.html" />
</response>
</step>
+
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName">DELETE /%globalVariableServerName%/%globalVariableCollection%/c 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%/d HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ </cleanup>
</test>
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org