juergen 2002/08/14 01:54:21
Modified:
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Workspace_Properties
Proppworkspacecheckoutset.xml
Propfworkspacecheckoutset.xml
Log:
changed the test case to work with all three variations (/workspaces,
/workspaces/{store}, {store}/workspaces) (kaz)
Revision Changes Path
1.4 +32 -5
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Workspace_Properties/Proppworkspacecheckoutset.xml
Index: Proppworkspacecheckoutset.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Workspace_Properties/Proppworkspacecheckoutset.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Proppworkspacecheckoutset.xml 13 Aug 2002 12:45:33 -0000 1.3
+++ Proppworkspacecheckoutset.xml 14 Aug 2002 08:54:21 -0000 1.4
@@ -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) PUT command creates a file
3) PUT command creates another file
@@ -17,9 +18,35 @@
</description>
<expectedResult> Propfind should find the workspace-checkout-set
</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>
@@ -28,7 +55,7 @@
</step>
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">PROPPATCH %WS%/WS
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
@@ -43,10 +70,10 @@
</request>
<response>
<command>HTTP/1.0 207 Multi Status</command>
- <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</D:href>
+ <D:href>%WS%/WS</D:href>
<D:propstat>
<D:prop>
<D:workspace-checkout-set />
@@ -65,7 +92,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.4 +37 -11
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Workspace_Properties/Propfworkspacecheckoutset.xml
Index: Propfworkspacecheckoutset.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Workspace_Properties/Propfworkspacecheckoutset.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Propfworkspacecheckoutset.xml 7 Aug 2002 16:02:08 -0000 1.3
+++ Propfworkspacecheckoutset.xml 14 Aug 2002 08:54:21 -0000 1.4
@@ -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) PUT command creates a file
3) PUT command creates another file
@@ -17,9 +18,34 @@
</description>
<expectedResult> Propfind should find the workspace-checkout-set
</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>
@@ -138,7 +164,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="VHR1"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?>
<D:version-control xmlns:D="DAV:">
@@ -153,7 +179,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="VHR2"><![CDATA[<?xml version="1.0"
encoding="utf-8" ?>
<D:version-control xmlns:D="DAV:">
@@ -168,7 +194,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>
<header>Content-type: text/xml; charset="utf-8"</header>
</request>
<response>
@@ -177,7 +203,7 @@
</step>
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">CHECKOUT
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test2.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName,WS">CHECKOUT
%WS%/WS/test2.xml HTTP/1.1</command>
<header>Content-type: text/xml; charset="utf-8"</header>
</request>
<response>
@@ -186,7 +212,7 @@
</step>
<step>
<request>
- <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName">PROPFIND
/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/ HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,userNumber,globalVariableServerName,WS">PROPFIND
%WS%/WS/ HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header>Content-Type: text/xml</header>
<header>Translate: f</header>
@@ -198,15 +224,15 @@
<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" varDefinition="VHR2"
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableServerName,WS" varDefinition="VHR2"
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS</D:href>
+ <D:href>%WS%/WS</D:href>
<D:propstat>
<D:prop>
<D:workspace-checkout-set>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml</D:href>
-
<D:href>/%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test2.xml</D:href>
+ <D:href>%WS%/WS/test.xml</D:href>
+ <D:href>%WS%/WS/test2.xml</D:href>
</D:workspace-checkout-set>
</D:prop>
<D:status>HTTP/1.1 200 OK</D:status>
@@ -218,7 +244,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>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]>
