juergen 2002/08/13 05:13:34
Modified:
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method
WsChoutChout409forkokForbid.xml
WsChoutChout409forkokDisged.xml WSChoutChout409.xml
Log:
Changed the testcase to work iwith all three variations (/workspaces,
/workspaces/{store}, {store}/workspaces)
Revision Changes Path
1.5 +30 -5
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method/WsChoutChout409forkokForbid.xml
Index: WsChoutChout409forkokForbid.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method/WsChoutChout409forkokForbid.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WsChoutChout409forkokForbid.xml 5 Aug 2002 11:40:48 -0000 1.4
+++ WsChoutChout409forkokForbid.xml 13 Aug 2002 12:13:34 -0000 1.5
@@ -7,6 +7,7 @@
<abstract> Test to check if possible to checkout a resource twice when
checkout-fork is forbidden and fork-ok</abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSAPCE command creates a workspace
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
@@ -17,10 +18,34 @@
<expectedResult> Second checkout command should return 403 Forbidden
</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>
@@ -90,7 +115,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>
<body varUsage="VHR1"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:version-control xmlns:D="DAV:">
@@ -108,7 +133,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT
%WS%/WS/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
</request>
<response>
@@ -118,7 +143,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT
%WS%/WS/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
<body varUsage="VHR"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:checkout xmlns:D="DAV:" xmlns:R="http://www.com/">
@@ -151,7 +176,7 @@
<step>
<request>
- <command
varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command
varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,WS">DELETE
%WS%/WS HTTP/1.1</command>
<header>Destroy: NoUndelete</header>
1.5 +32 -5
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method/WsChoutChout409forkokDisged.xml
Index: WsChoutChout409forkokDisged.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method/WsChoutChout409forkokDisged.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WsChoutChout409forkokDisged.xml 5 Aug 2002 11:37:57 -0000 1.4
+++ WsChoutChout409forkokDisged.xml 13 Aug 2002 12:13:34 -0000 1.5
@@ -7,6 +7,7 @@
<abstract> Test to check if possible to checkout a resource twice when
checkout-fork is discouraged and fork-ok </abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSAPCE command creates a workspace
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
@@ -17,10 +18,36 @@
<expectedResult> Second checkout command should return 403 Forbidden
</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>
@@ -126,7 +153,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>
<body varUsage="VHR1"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:version-control xmlns:D="DAV:">
@@ -144,7 +171,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT
%WS%/WS/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
</request>
<response>
@@ -154,7 +181,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT
%WS%/WS/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
<body varUsage="VHR"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:checkout xmlns:D="DAV:" xmlns:R="http://www.com/">
@@ -187,7 +214,7 @@
<step>
<request>
- <command
varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command
varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,WS">DELETE
%WS%/WS HTTP/1.1</command>
<header>Destroy: NoUndelete</header>
1.4 +32 -5
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method/WSChoutChout409.xml
Index: WSChoutChout409.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Checkout-in-place_feature/Checkout_method/WSChoutChout409.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSChoutChout409.xml 5 Aug 2002 09:19:32 -0000 1.3
+++ WSChoutChout409.xml 13 Aug 2002 12:13:34 -0000 1.4
@@ -7,6 +7,7 @@
<abstract> Test to check if possible to checkout a resource twice when
checkout-fork is forbidden </abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSAPCE command creates a workspace
1) PUT command creates a file
2) VERSION-CONTROL command which puts the file under version control
@@ -17,10 +18,36 @@
<expectedResult> Second checkout command should return 403 forbidden
</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>
@@ -90,7 +117,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>
<body varUsage="VHR1"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:version-control xmlns:D="DAV:">
@@ -108,7 +135,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT
%WS%/WS/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
</request>
<response>
@@ -118,7 +145,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT
%WS%/WS/test.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
</request>
<response>
@@ -146,7 +173,7 @@
<step>
<request>
- <command
varUsage="repeatCounter,globalVariableCollection,globalVariableServerName">DELETE
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command
varUsage="repeatCounter,globalVariableCollection,globalVariableServerName,WS">DELETE
%WS%/WS HTTP/1.1</command>
<header>Destroy: NoUndelete</header>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>