juergen 2002/08/13 05:34:13
Modified:
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics
VcMveWS.xml MveWsChoutChin.xml MveWs.xml
MveNonWs.xml
Log:
Changed the testcase to work iwith all three variations (/workspaces,
/workspaces/{store}, {store}/workspaces)
Revision Changes Path
1.3 +31 -7
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/VcMveWS.xml
Index: VcMveWS.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/VcMveWS.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VcMveWS.xml 5 Aug 2002 07:56:53 -0000 1.2
+++ VcMveWS.xml 13 Aug 2002 12:34:13 -0000 1.3
@@ -7,6 +7,7 @@
<abstract> Test to check if possible to move a workspace </abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSPACE command carried out to create a workspace
2) MKWORKSPACE command carried out to create another workspace
3) MOVE command carried out on resource
@@ -14,10 +15,33 @@
<expectedResult> MOVE command should return a 409
Conflict</expectedResult>
</specification>
-
+<step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">OPTIONS
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:options xmlns:D="DAV:">
+ <D:workspace-collection-set/>
+ </D:options>
+ ]]>
+ </body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <body
varUsage="globalVariableCollection,globalVariableServerName" varDefinition="WS"
varPath="options-response/workspace-collection-set/href"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?>
+ <D:options-response xmlns:D="DAV:">
+ <D:workspace-collection-set>
+ <D:href>*</D:href>
+ </D:workspace-collection-set>
+ </D:options-response>
+ ]]>
+ </body>
+ </response>
+ </step>
+
<step>
<request>
- <command
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command
varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE %WS%/WS
HTTP/1.1</command>
<header>Content-length: 0</header>
</request>
<response>
@@ -27,7 +51,7 @@
<step>
<request>
- <command
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2 HTTP/1.1</command>
+ <command
varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE %WS%/WS2
HTTP/1.1</command>
<header>Content-length: 0</header>
</request>
<response>
@@ -39,10 +63,10 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MOVE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/ HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE
%WS%/WS/ HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
<header>content-length: 0</header>
- <header
varUsage="globalVariableCollection,globalVariableServerName">Destination:
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/WS</header>
+ <header
varUsage="globalVariableCollection,globalVariableServerName,WS">Destination:
%WS%/WS2/WS</header>
<header>host: localhost</header>
</request>
<response>
@@ -55,7 +79,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE
%WS%/WS HTTP/1.1</command>
<header>Destroy: NoUndelete</header>
@@ -71,7 +95,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2 HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE
%WS%/WS2 HTTP/1.1</command>
<header>Destroy: NoUndelete</header>
1.2 +48 -24
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveWsChoutChin.xml
Index: MveWsChoutChin.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveWsChoutChin.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MveWsChoutChin.xml 31 Jul 2002 08:51:50 -0000 1.1
+++ MveWsChoutChin.xml 13 Aug 2002 12:34:13 -0000 1.2
@@ -7,6 +7,7 @@
<abstract> Test to check the workspace property exist when the file is
moved to another workspace collection </abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSPACE command carried out
2) MKWORKSPACE command carried out
3) PUT command creates a resource in the workspace
@@ -22,10 +23,33 @@
<expectedResult> Propfind should find the workspace property after the
MOVE</expectedResult>
</specification>
+<step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">OPTIONS
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:options xmlns:D="DAV:">
+ <D:workspace-collection-set/>
+ </D:options>
+ ]]>
+ </body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <body
varUsage="globalVariableCollection,globalVariableServerName" varDefinition="WS"
varPath="options-response/workspace-collection-set/href"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?>
+ <D:options-response xmlns:D="DAV:">
+ <D:workspace-collection-set>
+ <D:href>*</D:href>
+ </D:workspace-collection-set>
+ </D:options-response>
+ ]]>
+ </body>
+ </response>
+ </step>
<step>
<request>
- <command
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command
varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE %WS%/WS
HTTP/1.1</command>
<header>Content-length: 0</header>
</request>
<response>
@@ -35,7 +59,7 @@
<step>
<request>
- <command
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2 HTTP/1.1</command>
+ <command
varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE %WS%/WS2
HTTP/1.1</command>
<header>Content-length: 0</header>
</request>
<response>
@@ -45,7 +69,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT
%WS%/WS/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Translate: f</header>
<header>User-Agent: Microsoft Data Access Internet Publishing Provider
DAV</header>
@@ -63,7 +87,7 @@
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL
%WS%/WS/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
</request>
<response>
@@ -73,7 +97,7 @@
<step>
<request>
- <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">REPORT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">REPORT
%WS%/WS/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Content-Type: text/xml</header>
<body><![CDATA[<D:version-tree
xmlns:D="DAV:"><D:prop><D:version-history/></D:prop></D:version-tree>]]></body>
@@ -102,7 +126,7 @@
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND
%WS%/WS/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Content-Type: text/xml</header>
<header>Translate: f</header>
@@ -117,11 +141,11 @@
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml</D:href>
+ <D:href>%WS%/WS/test.xml</D:href>
<D:propstat>
<D:prop>
<D:workspace>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS</D:href>
+ <D:href>%WS%/WS</D:href>
</D:workspace>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
@@ -134,7 +158,7 @@
<step>
<request>
- <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND
%WS%/WS/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Content-Type: text/xml</header>
<header>Translate: f</header>
@@ -146,10 +170,10 @@
<response>
<command>HTTP/1.0 207 Multi Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet
2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body
varUsage="globalVariableCollection,VH,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,VH,globalVariableServerName,WS"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml</D:href>
+ <D:href>%WS%/WS/test.xml</D:href>
<D:propstat>
<D:prop>
<D:checked-in>
@@ -166,10 +190,10 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MOVE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName">MOVE
%WS%/WS/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
<header>content-length: 0</header>
- <header
varUsage="globalVariableCollection,globalVariableServerName">Destination:
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml</header>
+ <header
varUsage="globalVariableCollection,globalVariableServerName,WS">Destination:
%WS%/WS2/test.xml</header>
<header>host: localhost</header>
</request>
<response>
@@ -180,7 +204,7 @@
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND
%WS%/WS2/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Content-Type: text/xml</header>
<header>Translate: f</header>
@@ -192,14 +216,14 @@
<response>
<command>HTTP/1.0 207 Multi Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet
2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableServerName,WS"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml</D:href>
+ <D:href>%WS%/WS2/test.xml</D:href>
<D:propstat>
<D:prop>
<D:workspace>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2</D:href>
+ <D:href>%WS%/WS2</D:href>
</D:workspace>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
@@ -212,7 +236,7 @@
<step>
<request>
- <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND
%WS%/WS2/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Content-Type: text/xml</header>
<header>Translate: f</header>
@@ -224,10 +248,10 @@
<response>
<command>HTTP/1.0 207 Multi Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet
2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body
varUsage="globalVariableCollection,VH,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,VH,globalVariableServerName,WS"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml</D:href>
+ <D:href>%WS%/WS2/test.xml</D:href>
<D:propstat>
<D:prop>
<D:checked-in>
@@ -244,7 +268,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT
%WS%/WS2/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
</request>
<response>
@@ -254,7 +278,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">CHECKIN
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKIN
%WS%/WS2/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
</request>
<response>
@@ -266,7 +290,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE
%WS%/WS HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Destroy: NoUndelete</header>
<header>Translate: f</header>
@@ -283,7 +307,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2 HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE
%WS%/WS2 HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Destroy: NoUndelete</header>
<header>Translate: f</header>
1.2 +39 -15
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveWs.xml
Index: MveWs.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveWs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MveWs.xml 31 Jul 2002 08:51:50 -0000 1.1
+++ MveWs.xml 13 Aug 2002 12:34:13 -0000 1.2
@@ -7,6 +7,7 @@
<abstract> Test to check the workspace property exist when the file is
moved to another workspace collection </abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSPACE command carried out
2) MKWORKSPACE command carried out to create another workspace
3) PUT command creates a resource in the workspace
@@ -17,10 +18,33 @@
<expectedResult> Propfind should find the workspace property after the
MOVE</expectedResult>
</specification>
+<step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">OPTIONS
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:options xmlns:D="DAV:">
+ <D:workspace-collection-set/>
+ </D:options>
+ ]]>
+ </body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <body
varUsage="globalVariableCollection,globalVariableServerName" varDefinition="WS"
varPath="options-response/workspace-collection-set/href"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?>
+ <D:options-response xmlns:D="DAV:">
+ <D:workspace-collection-set>
+ <D:href>*</D:href>
+ </D:workspace-collection-set>
+ </D:options-response>
+ ]]>
+ </body>
+ </response>
+ </step>
<step>
<request>
- <command
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command
varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE %WS%/WS
HTTP/1.1</command>
<header>Content-length: 0</header>
</request>
<response>
@@ -30,7 +54,7 @@
<step>
<request>
- <command
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2 HTTP/1.1</command>
+ <command
varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE %WS%/WS2
HTTP/1.1</command>
<header>Content-length: 0</header>
</request>
<response>
@@ -40,7 +64,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT
%WS%/WS/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Translate: f</header>
<header>User-Agent: Microsoft Data Access Internet Publishing Provider
DAV</header>
@@ -58,7 +82,7 @@
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND
%WS%/WS/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Content-Type: text/xml</header>
<header>Translate: f</header>
@@ -70,14 +94,14 @@
<response>
<command>HTTP/1.0 207 Multi Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet
2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableServerName,WS"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml</D:href>
+ <D:href>%WS%/WS/test.xml</D:href>
<D:propstat>
<D:prop>
<D:workspace>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS</D:href>
+ <D:href>%WS%/WS</D:href>
</D:workspace>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
@@ -90,10 +114,10 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MOVE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE
%WS%/WS/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
<header>content-length: 0</header>
- <header
varUsage="globalVariableCollection,globalVariableServerName">Destination:
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml</header>
+ <header
varUsage="globalVariableCollection,globalVariableServerName,WS">Destination:
%WS%/WS2/test.xml</header>
<header>host: localhost</header>
</request>
<response>
@@ -104,7 +128,7 @@
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND
%WS%/WS2/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Content-Type: text/xml</header>
<header>Translate: f</header>
@@ -116,14 +140,14 @@
<response>
<command>HTTP/1.0 207 Multi Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet
2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableServerName,WS"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml</D:href>
+ <D:href>%WS%/WS2/test.xml</D:href>
<D:propstat>
<D:prop>
<D:workspace>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2</D:href>
+ <D:href>%WS%/WS2</D:href>
</D:workspace>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
@@ -138,7 +162,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE
%WS%/WS HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Destroy: NoUndelete</header>
<header>Translate: f</header>
@@ -155,7 +179,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS2 HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE
%WS%/WS2 HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Destroy: NoUndelete</header>
<header>Translate: f</header>
1.3 +32 -8
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveNonWs.xml
Index: MveNonWs.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Move_Semantics/MveNonWs.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MveNonWs.xml 6 Aug 2002 08:39:24 -0000 1.2
+++ MveNonWs.xml 13 Aug 2002 12:34:13 -0000 1.3
@@ -7,6 +7,7 @@
<abstract> Test to check the workspace property doesnt exist when the
file is moved to a non-workspace collection </abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSPACE command carried out
2) PUT command creates a resource in the workspace
3) PROPFIND command checks the workspace property
@@ -16,10 +17,33 @@
<expectedResult> Propfind should not find the workspace property after
the MOVE</expectedResult>
</specification>
+<step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">OPTIONS
/%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0" ?>
+ <D:options xmlns:D="DAV:">
+ <D:workspace-collection-set/>
+ </D:options>
+ ]]>
+ </body>
+ </request>
+ <response>
+ <command>HTTP/1.0 200 OK</command>
+ <body
varUsage="globalVariableCollection,globalVariableServerName" varDefinition="WS"
varPath="options-response/workspace-collection-set/href"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?>
+ <D:options-response xmlns:D="DAV:">
+ <D:workspace-collection-set>
+ <D:href>*</D:href>
+ </D:workspace-collection-set>
+ </D:options-response>
+ ]]>
+ </body>
+ </response>
+ </step>
<step>
<request>
- <command
varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command
varUsage="globalVariableServerName,globalVariableCollection,WS">MKWORKSPACE %WS%/WS
HTTP/1.1</command>
<header>Content-length: 0</header>
</request>
<response>
@@ -29,7 +53,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">PUT
%WS%/WS/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Translate: f</header>
<header>User-Agent: Microsoft Data Access Internet Publishing Provider
DAV</header>
@@ -47,7 +71,7 @@
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPFIND
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPFIND
%WS%/WS/test.xml HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Content-Type: text/xml</header>
<header>Translate: f</header>
@@ -59,14 +83,14 @@
<response>
<command>HTTP/1.0 207 Multi Status</command>
<header>Servlet-Engine: Tomcat Web Server/3.2.1 (JSP 1.1; Servlet
2.2; Java 1.3.0_02; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- <body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableServerName,WS"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml</D:href>
+ <D:href>%WS%/WS/test.xml</D:href>
<D:propstat>
<D:prop>
<D:workspace>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS</D:href>
+ <D:href>%WS%/WS</D:href>
</D:workspace>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
@@ -79,7 +103,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">MOVE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">MOVE
%WS%/WS/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
<header>content-length: 0</header>
<header
varUsage="globalVariableCollection,globalVariableServerName">Destination:
/%globalVariableServerName%/%globalVariableCollection%/test.xml</header>
@@ -125,7 +149,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">DELETE
%WS%/WS HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Destroy: NoUndelete</header>
<header>Translate: f</header>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
