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 ju...@apache.org on 2002/08/14 10:44:10 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics WSVcWSChoutUnchout.xml VcWsNonvrsn.xml VcVcSameHistory.xml VcVc409.xml
juergen 2002/08/14 01:44:10
Modified: testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics
WSVcWSChoutUnchout.xml VcWsNonvrsn.xml
VcVcSameHistory.xml VcVc409.xml
Log:
changed the test case to work with all three variations (/workspaces, /workspaces/{store}, {store}/workspaces) (kaz)
Revision Changes Path
1.5 +34 -9 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/WSVcWSChoutUnchout.xml
Index: WSVcWSChoutUnchout.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/WSVcWSChoutUnchout.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSVcWSChoutUnchout.xml 7 Aug 2002 16:00:52 -0000 1.4
+++ WSVcWSChoutUnchout.xml 14 Aug 2002 08:44:10 -0000 1.5
@@ -4,6 +4,7 @@
<specification>
<abstract> Test to check if its possible to checkout a Vc resource in a workspace when it is alread checked out in another 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) PUT command creates a file
@@ -16,9 +17,33 @@
</description>
<expectedResult> Second checkout command should fail</expectedResult>
</specification>
+
<step>
<request>
- <command varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <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,WS">MKWORKSPACE %WS%/WS HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 201 Created</command>
@@ -26,7 +51,7 @@
</step>
<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>
</request>
<response>
<command>HTTP/1.0 201 Created</command>
@@ -76,7 +101,7 @@
</step>
<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="VHR"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:version-control xmlns:D="DAV:">
@@ -91,7 +116,7 @@
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL /%globalVariableServerName%/workspace/%globalVariableCollection%/WS2/test.xml HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL %WS%/WS2/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:version-control xmlns:D="DAV:">
@@ -106,7 +131,7 @@
</step>
<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>
</request>
<response>
<command>HTTP/1.0 200 OK</command>
@@ -114,7 +139,7 @@
</step>
<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>
</request>
<response>
<command>HTTP/1.0 (403,409)</command>
@@ -122,7 +147,7 @@
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">UNCHECKOUT /%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">UNCHECKOUT %WS%/WS/test.xml HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 200 OK</command>
@@ -139,7 +164,7 @@
</step>
<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>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
@@ -147,7 +172,7 @@
</step>
<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>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
1.4 +29 -3 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcWsNonvrsn.xml
Index: VcWsNonvrsn.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcWsNonvrsn.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VcWsNonvrsn.xml 13 Aug 2002 12:45:36 -0000 1.3
+++ VcWsNonvrsn.xml 14 Aug 2002 08:44:10 -0000 1.4
@@ -4,14 +4,40 @@
<specification>
<abstract> Test to check if its possible to put a workspace resource under version control when it doesnt point to a version history </abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSPACE command carried out to create a workspace
2) VERSION-CONTROL command which creates a resource in a second workspace and puts the file under version control
</description>
<expectedResult> Version Control on workspace resource should throw 409 Conflict</expectedResult>
</specification>
+
<step>
<request>
- <command varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <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,WS">MKWORKSPACE %WS%/WS HTTP/1.1</command>
<header>Content-length: 0</header>
</request>
<response>
@@ -20,7 +46,7 @@
</step>
<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><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:version-control xmlns:D="DAV:">
@@ -36,7 +62,7 @@
<cleanup>
<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>
</request>
<response>
1.7 +30 -4 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcVcSameHistory.xml
Index: VcVcSameHistory.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcVcSameHistory.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VcVcSameHistory.xml 13 Aug 2002 12:45:36 -0000 1.6
+++ VcVcSameHistory.xml 14 Aug 2002 08:44:10 -0000 1.7
@@ -4,6 +4,7 @@
<specification>
<abstract> Test to check if its possible to put a workspace resource under version control when it another resource already points to the history </abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSPACE command carried out to create a workspace
2) PUT command creates a file
3) VERSION-CONTROL command which puts the file under version control
@@ -12,9 +13,34 @@
</description>
<expectedResult> Version Control on workspace resource should throw 409 Conflict</expectedResult>
</specification>
+
<step>
<request>
- <command varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <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,WS">MKWORKSPACE %WS%/WS HTTP/1.1</command>
<header>Content-length: 0</header>
</request>
<response>
@@ -66,7 +92,7 @@
</step>
<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="VHR"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:version-control xmlns:D="DAV:">
@@ -81,7 +107,7 @@
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">VERSION-CONTROL /%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test2.xml HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">VERSION-CONTROL %WS%/WS/test2.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:version-control xmlns:D="DAV:">
@@ -97,7 +123,7 @@
<cleanup>
<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>
</request>
<response>
1.6 +30 -4 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcVc409.xml
Index: VcVc409.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Version_Control_Semantics/VcVc409.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VcVc409.xml 5 Aug 2002 07:56:52 -0000 1.5
+++ VcVc409.xml 14 Aug 2002 08:44:10 -0000 1.6
@@ -4,6 +4,7 @@
<specification>
<abstract> Test to check if its possible to checkout a Vc resource in a workspace when it is already checkout out </abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSPACE command carried out to create a workspace
2) PUT command creates a file
3) VERSION-CONTROL command which puts the file under version control
@@ -12,9 +13,34 @@
</description>
<expectedResult> Version Control on workspace resource should throw 409 Conflict</expectedResult>
</specification>
+
<step>
<request>
- <command varUsage="globalVariableServerName,globalVariableCollection">MKWORKSPACE /%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <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,WS">MKWORKSPACE %WS%/WS HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 201 Created</command>
@@ -39,7 +65,7 @@
</step>
<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>
<body fileReference="../../../../contentDirectory/validXML.xm1"/>
</request>
<response>
@@ -73,7 +99,7 @@
</step>
<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="VHR"><![CDATA[<?xml version="1.0" encoding="utf-8" ?>
<D:version-control xmlns:D="DAV:">
@@ -89,7 +115,7 @@
<cleanup>
<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>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>