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:26:17 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties MkwsProppworkspace.xml MkwsPropfworkspace.xml
juergen 2002/08/14 01:26:17
Modified: testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties
MkwsProppworkspace.xml MkwsPropfworkspace.xml
Log:
changed the test case to work with all three variations (/workspaces, /workspaces/{store}, {store}/workspaces) (kaz)
Revision Changes Path
1.4 +32 -6 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties/MkwsProppworkspace.xml
Index: MkwsProppworkspace.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties/MkwsProppworkspace.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MkwsProppworkspace.xml 13 Aug 2002 12:45:27 -0000 1.3
+++ MkwsProppworkspace.xml 14 Aug 2002 08:26:17 -0000 1.4
@@ -4,15 +4,41 @@
<specification>
<abstract> Test to check if its possible to modify the workspace property </abstract>
<description>
+ 0) Compute the workspace path.
1) MKWORKSPACE command carried out
2) PUT command creates a resource in the workspace
3) Proppatch command attemtps to modify the workspace property
</description>
<expectedResult> Proppatch should return a 207 multi status which contains a 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>
@@ -21,7 +47,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>
@@ -31,7 +57,7 @@
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH /%globalVariableServerName%/workspace/%globalVariableCollection%/WS/test.xml HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,WS">PROPPATCH %WS%/WS/test.xml HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<header>Pragma: no-cache</header>
<header>Connection: close</header>
@@ -46,10 +72,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/test.xml</D:href>
+ <D:href>%WS%/WS/test.xml</D:href>
<D:propstat>
<D:prop>
<D:workspace />
@@ -68,7 +94,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.3 +32 -7 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties/MkwsPropfworkspace.xml
Index: MkwsPropfworkspace.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Workspace_Feature/Additional_Resource_Properties/MkwsPropfworkspace.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MkwsPropfworkspace.xml 13 Aug 2002 12:45:27 -0000 1.2
+++ MkwsPropfworkspace.xml 14 Aug 2002 08:26:17 -0000 1.3
@@ -4,6 +4,7 @@
<specification>
<abstract> Test to check the workspace property </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
@@ -12,7 +13,31 @@
</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>
@@ -21,7 +46,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>
<header>Accept-Language: en-us</header>
<header>Translate: f</header>
<header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
@@ -37,7 +62,7 @@
</step>
<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>
@@ -49,14 +74,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>
@@ -68,7 +93,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: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>