juergen 2002/07/01 06:29:58
Modified:
testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics
DestinationVcCopyOverwriteF.xml
SourceVcDestinationVcCopy.xml
SourceVcdestinationVcCopyOverwriteF.xml
SourceVersionDestinationVcVcCopyOverwriteF.xml
VcCopyA-VCheckout.xml
VcCopyAVCheckoutOverwriteF.xml
VcCopyAVCheckoutOverwriteT.xml
VcCopyOverwriteT204.xml
Log:
fixed various minor problems (mainly expected response in report)
Revision Changes Path
1.2 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/DestinationVcCopyOverwriteF.xml
Index: DestinationVcCopyOverwriteF.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/DestinationVcCopyOverwriteF.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DestinationVcCopyOverwriteF.xml 28 Jun 2002 14:17:03 -0000 1.1
+++ DestinationVcCopyOverwriteF.xml 1 Jul 2002 13:29:58 -0000 1.2
@@ -127,7 +127,7 @@
<body
varUsage="globalVariableCollection,globalVariableServerName,VHR"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>http://localhost:80%VHR%</D:href>
+ <D:href>%VHR%</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set />
1.2 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/SourceVcDestinationVcCopy.xml
Index: SourceVcDestinationVcCopy.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/SourceVcDestinationVcCopy.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceVcDestinationVcCopy.xml 28 Jun 2002 14:17:03 -0000 1.1
+++ SourceVcDestinationVcCopy.xml 1 Jul 2002 13:29:58 -0000 1.2
@@ -135,7 +135,7 @@
<body
varUsage="globalVariableCollection,globalVariableServerName,VH1,VH2"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>http://localhost:80%VH1%</D:href>
+ <D:href>%VH1%</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set />
@@ -144,7 +144,7 @@
</D:propstat>
</D:response>
<D:response>
- <D:href>http://localhost:80%VH2%</D:href>
+ <D:href>%VH2%</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set>
1.2 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/SourceVcdestinationVcCopyOverwriteF.xml
Index: SourceVcdestinationVcCopyOverwriteF.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/SourceVcdestinationVcCopyOverwriteF.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceVcdestinationVcCopyOverwriteF.xml 28 Jun 2002 14:17:03 -0000 1.1
+++ SourceVcdestinationVcCopyOverwriteF.xml 1 Jul 2002 13:29:58 -0000 1.2
@@ -135,7 +135,7 @@
<body
varUsage="globalVariableCollection,globalVariableServerName,VHR"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>http://localhost:80%VHR%</D:href>
+ <D:href>%VHR%</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set />
1.2 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/SourceVersionDestinationVcVcCopyOverwriteF.xml
Index: SourceVersionDestinationVcVcCopyOverwriteF.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/SourceVersionDestinationVcVcCopyOverwriteF.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceVersionDestinationVcVcCopyOverwriteF.xml 28 Jun 2002 14:17:03 -0000
1.1
+++ SourceVersionDestinationVcVcCopyOverwriteF.xml 1 Jul 2002 13:29:58 -0000
1.2
@@ -140,7 +140,7 @@
<body
varUsage="globalVariableCollection,globalVariableServerName,VHR"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>http://localhost:80%VHR%</D:href>
+ <D:href>%VHR%</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set />
1.2 +3 -3
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/VcCopyA-VCheckout.xml
Index: VcCopyA-VCheckout.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/VcCopyA-VCheckout.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VcCopyA-VCheckout.xml 28 Jun 2002 14:17:03 -0000 1.1
+++ VcCopyA-VCheckout.xml 1 Jul 2002 13:29:58 -0000 1.2
@@ -166,7 +166,7 @@
<body varUsage="globalVariableCollection,globalVariableServerName"
varDefinition="VH"
varPath="multistatus/response/propstat/prop/version-history/href"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>http://localhost:80/%globalVariableServerName%/history/108/1.0</D:href>
+ <D:href>/%globalVariableServerName%/history/108/1.0</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set />
@@ -175,7 +175,7 @@
</D:propstat>
</D:response>
<D:response>
-
<D:href>http://localhost:80/%globalVariableServerName%/history/108/1.1</D:href>
+ <D:href>/%globalVariableServerName%/history/108/1.1</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set>
@@ -186,7 +186,7 @@
</D:propstat>
</D:response>
<D:response>
-
<D:href>http://localhost:80/%globalVariableServerName%/history/108/1.2</D:href>
+ <D:href>/%globalVariableServerName%/history/108/1.2</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set />
1.2 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/VcCopyAVCheckoutOverwriteF.xml
Index: VcCopyAVCheckoutOverwriteF.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/VcCopyAVCheckoutOverwriteF.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VcCopyAVCheckoutOverwriteF.xml 28 Jun 2002 14:17:03 -0000 1.1
+++ VcCopyAVCheckoutOverwriteF.xml 1 Jul 2002 13:29:58 -0000 1.2
@@ -198,7 +198,7 @@
<body
varUsage="globalVariableCollection,globalVariableServerName,VH1,VH2"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>http://localhost:80%VH1%</D:href>
+ <D:href>%VH1%</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set />
@@ -207,7 +207,7 @@
</D:propstat>
</D:response>
<D:response>
- <D:href>http://localhost:80%VH2%</D:href>
+ <D:href>%VH2%</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set>
1.2 +5 -5
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/VcCopyAVCheckoutOverwriteT.xml
Index: VcCopyAVCheckoutOverwriteT.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/VcCopyAVCheckoutOverwriteT.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VcCopyAVCheckoutOverwriteT.xml 28 Jun 2002 14:17:03 -0000 1.1
+++ VcCopyAVCheckoutOverwriteT.xml 1 Jul 2002 13:29:58 -0000 1.2
@@ -42,7 +42,7 @@
<header>Translate: f</header>
<header>User-Agent: Microsoft Data Access Internet Publishing Provider
DAV</header>
<header>Connection: Keep-Alive</header>
- <body fileReference="../../../../contentDirectory/validXML.xm1">
+ <body fileReference="../../../../contentDirectory/invalidXML.xm1">
</body>
</request>
<response>
@@ -215,7 +215,7 @@
<body><![CDATA[<?xml version="1.0" ?><D:propfind
xmlns:D="DAV:"><D:prop><D:checked-in/></D:prop></D:propfind>]]></body>
</request>
<response>
- <command>HTTP/1.0 666 Multi Status</command>
+ <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,VH2,globalVariableServerName" varDefinition="VH2"
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
@@ -243,12 +243,12 @@
<body><![CDATA[<D:version-tree
xmlns:D="DAV:"><D:prop><D:predecessor-set/></D:prop></D:version-tree>]]></body>
</request>
<response>
- <command>HTTP/1.0 666 Multi Status</command>
+ <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,VH1,VH2"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>http://localhost:80%VH1%</D:href>
+ <D:href>%VH1%</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set />
@@ -257,7 +257,7 @@
</D:propstat>
</D:response>
<D:response>
- <D:href>http://localhost:80%VH2%</D:href>
+ <D:href>%VH2%</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set>
1.2 +17 -9
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/VcCopyOverwriteT204.xml
Index: VcCopyOverwriteT204.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DeltaV/functional/Version_control_features/Additional_Copy_semantics/VcCopyOverwriteT204.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VcCopyOverwriteT204.xml 28 Jun 2002 14:17:03 -0000 1.1
+++ VcCopyOverwriteT204.xml 1 Jul 2002 13:29:58 -0000 1.2
@@ -59,14 +59,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,VHR,globalVariableServerName" varDefinition="VHR"
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,VHR1,globalVariableServerName" varDefinition="VHR1"
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>/%globalVariableServerName%/%globalVariableCollection%/test2.xml</href>
<propstat>
<prop>
<checked-in>
- <href>%VHR%</href>
+ <href>%VHR1%</href>
</checked-in>
</prop>
<status>HTTP/1.1 200 OK</status>
@@ -79,7 +79,7 @@
<step>
<request>
- <command varUsage="globalVariableCollection,VHR,globalVariableServerName">COPY
%VHR% HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,VHR1,globalVariableServerName">COPY
%VHR1% HTTP/1.1</command>
<header>Accept-Language: en-us</header>
<header
varUsage="globalVariableCollection,globalVariableServerName">Destination:
/%globalVariableServerName%/%globalVariableCollection%/test2.xml</header>
<header>Overwrite: T</header>
@@ -109,14 +109,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,VHR,globalVariableServerName" varDefinition="VHR"
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,VHR2,globalVariableServerName" varDefinition="VHR2"
varPath="multistatus/response/propstat/prop/checked-in/href"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>/%globalVariableServerName%/%globalVariableCollection%/test2.xml</href>
<propstat>
<prop>
<checked-in>
- <href>%VHR%</href>
+ <href>%VHR2%</href>
</checked-in>
</prop>
<status>HTTP/1.1 200 OK</status>
@@ -135,12 +135,21 @@
<body><![CDATA[<D:version-tree
xmlns:D="DAV:"><D:prop><D:predecessor-set/></D:prop></D:version-tree>]]></body>
</request>
<response>
- <command>HTTP/1.0 666 Multi Status</command>
+ <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,VHR"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
+ <body
varUsage="globalVariableCollection,globalVariableServerName,VHR1,VHR2"><![CDATA[<?xml
version="1.0" encoding="utf-8" ?>
<D:multistatus xmlns:D="DAV:">
<D:response>
- <D:href>http://localhost:80%VHR%</D:href>
+ <D:href>%VHR1%</D:href>
+ <D:propstat>
+ <D:prop>
+ <D:predecessor-set />
+ </D:prop>
+ <D:status>HTTP/1.1 200 OK</D:status>
+ </D:propstat>
+ </D:response>
+ <D:response>
+ <D:href>%VHR2%</D:href>
<D:propstat>
<D:prop>
<D:predecessor-set />
@@ -148,7 +157,6 @@
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>
-
</D:multistatus>]]>
</body>
</response>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
