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/05/23 13:28:13 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/I18N/lock colLock_en.xml colLock_ja.xml colLock_zh.xml
juergen 02/05/23 04:28:13
Modified: testsuite/testsuite/junit/xmltestcases/I18N/lock
colLock_en.xml colLock_ja.xml colLock_zh.xml
Log:
removed the locking of root collection & introduced automaticVariable2
Revision Changes Path
1.3 +30 -52 jakarta-slide/testsuite/testsuite/junit/xmltestcases/I18N/lock/colLock_en.xml
Index: colLock_en.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/I18N/lock/colLock_en.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- colLock_en.xml 23 May 2002 07:13:44 -0000 1.2
+++ colLock_en.xml 23 May 2002 11:28:12 -0000 1.3
@@ -4,37 +4,37 @@
<specification>
<abstract> Checks if Lock of collection works fine.</abstract>
- <description> The test case consist of following steps: MKCOL with collection name having i18N char, PUTs a file, Locks the collection %globalVariableCollection%, tries to lock the created collection, unlocks collection file, DELETEs the collection</description>
+ <description> The test case consist of following steps: MKCOL with collection name having i18N char, PUTs a file, tries to lock the created collection, unlocks collection file, DELETEs the collection</description>
<expectedResult> Status code returned by Get Method must be 200 Not Modified </expectedResult>
</specification>
- <!-- schema_en -->
- <!-- schema_en/ISO-8859-1/attribute -->
+
<!-- Test Case Test Case Test Case Test Case -->
<step>
- <assign varDefinition ="subCollName">àçèéäöüÄÖÜ</assign>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
+ <assign varDefinition ="subCollName">àçèéäöüÄÖÜ</assign>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
</step>
<step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">PUT /%globalVariableServerName%/%globalVariableCollection%/%subCollName%/i18ndoc.xml HTTP/1.1</command>
- <body fileReference="../../contentDirectory/I18N/schema_en/ISO-8859-1/none/inst_table_nonei18n_iso-8859-1UE.xm1" fileEncoding='ISO-8859-1'>
- </body>
- </request>
- <response>
- <command>HTTP/1.0 201 Created</command>
- </response>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">PUT /%globalVariableServerName%/%globalVariableCollection%/%subCollName%/i18ndoc.xml HTTP/1.1</command>
+ <body fileReference="../../contentDirectory/I18N/schema_en/ISO-8859-1/none/inst_table_nonei18n_iso-8859-1UE.xm1" fileEncoding='ISO-8859-1'>
+ </body>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">LOCK /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
- <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
+ <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]>
+ </body>
</request>
<response>
<command>HTTP/1.0 200 OK</command>
@@ -42,33 +42,11 @@
</response>
</step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">LOCK /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
-
- <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 207</command>
-
- <body varUsage="globalVariableCollection">
- <![CDATA[<?xml version="1.0"?>
- <d:multistatus xmlns:d="DAV">
- <d:response>
- <d:href>/%globalVariableCollection%</d:href>
- <d:status>HTTP/1.1 423 Locked</d:status>
- </d:response>
- </d:multistatus>
- ]]>
- </body>
-
- </response>
- </step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
- <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
+ <header varUsage="automaticVariable2">Lock-Token: %varUsage%</header>
</request>
<response>
@@ -79,14 +57,14 @@
<step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">DELETE /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
- <header>Destroy: NoUndelete</header>
- </request>
- <response>
- <command>HTTP/1.0 204 No Content</command>
- </response>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">DELETE /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
+ <header>Destroy: NoUndelete</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
</step>
- <!-- Test Case Test Case Test Case Test Case -->
+
</test>
1.3 +15 -35 jakarta-slide/testsuite/testsuite/junit/xmltestcases/I18N/lock/colLock_ja.xml
Index: colLock_ja.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/I18N/lock/colLock_ja.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- colLock_ja.xml 23 May 2002 07:13:44 -0000 1.2
+++ colLock_ja.xml 23 May 2002 11:28:12 -0000 1.3
@@ -2,16 +2,16 @@
<!DOCTYPE test SYSTEM "../../../Tprocessor.dtd">
<test>
<specification>
- <abstract> Checks if Get Method with Status code 200 works fine. </abstract>
- <pre-Requisite> In header, if-modified-since should be present</pre-Requisite>
- <description> The test case consist of following steps: MKCOL with collection name having i18N char, PUTs a file, Locks the collection %globalVariableCollection%, tries to lock the created collection, unlocks collection file, DELETEs the collection</description>
+ <abstract> Checks if Lock of collection works fine.</abstract>
+
+ <description> The test case consist of following steps: MKCOL with collection name having i18N char, PUTs a file, tries to lock the created collection, unlocks collection file, DELETEs the collection</description>
<expectedResult> Status code returned by Get Method must be 200 Not Modified </expectedResult>
</specification>
- <!-- schema_ja -->
- <!-- schema_ja/Shift_JIS/attribute -->
+
<!-- Test Case Test Case Test Case Test Case -->
+
<step>
- <assign varDefinition ="subCollName">製品番号</assign>
+ <assign varDefinition ="subCollName">製品番号</assign>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName,subCollName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
</request>
@@ -19,7 +19,7 @@
<command>HTTP/1.0 201 Created</command>
</response>
</step>
- <step>
+ <step>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName,subCollName">PUT /%globalVariableServerName%/%globalVariableCollection%/%subCollName%/i18ndoc.xml HTTP/1.1</command>
<body fileReference="../../contentDirectory/I18N/schema_ja/Shift_JIS/none/inst_table_nonei18n_Shift_JIS.xm1" fileEncoding='Shift_JIS'>
@@ -29,11 +29,12 @@
<command>HTTP/1.0 201 Created</command>
</response>
</step>
- <step>
+ <step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">LOCK /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
- <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
+ <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]>
+ </body>
</request>
<response>
<command>HTTP/1.0 200 OK</command>
@@ -41,33 +42,11 @@
</response>
</step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">LOCK /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
-
- <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 207</command>
-
- <body varUsage="globalVariableCollection">
- <![CDATA[<?xml version="1.0"?>
- <d:multistatus xmlns:d="DAV">
- <d:response>
- <d:href>/%globalVariableCollection%</d:href>
- <d:status>HTTP/1.1 423 Locked</d:status>
- </d:response>
- </d:multistatus>
- ]]>
- </body>
-
- </response>
- </step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
- <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
+ <header varUsage="automaticVariable2">Lock-Token: %varUsage%</header>
</request>
<response>
@@ -76,6 +55,7 @@
</response>
</step>
+
<step>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName,subCollName">DELETE /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
@@ -86,5 +66,5 @@
</response>
</step>
- <!-- Test Case Test Case Test Case Test Case -->
+
</test>
1.3 +15 -36 jakarta-slide/testsuite/testsuite/junit/xmltestcases/I18N/lock/colLock_zh.xml
Index: colLock_zh.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/I18N/lock/colLock_zh.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- colLock_zh.xml 23 May 2002 07:13:44 -0000 1.2
+++ colLock_zh.xml 23 May 2002 11:28:12 -0000 1.3
@@ -2,16 +2,16 @@
<!DOCTYPE test SYSTEM "../../../Tprocessor.dtd">
<test>
<specification>
- <abstract> Checks if Get Method with Status code 200 works fine. </abstract>
- <pre-Requisite> In header, if-modified-since should be present</pre-Requisite>
- <description> The test case consist of following steps: MKCOL with collection name having i18N char, PUTs a file, performs a GET on it and then DELETEs the collection</description>
+ <abstract> Checks if Lock of collection works fine.</abstract>
+
+ <description> The test case consist of following steps: MKCOL with collection name having i18N char, PUTs a file, tries to lock the created collection, unlocks collection file, DELETEs the collection</description>
<expectedResult> Status code returned by Get Method must be 200 Not Modified </expectedResult>
</specification>
- <!-- schema_zh -->
- <!-- schema_zh/Big5/attribute -->
+
<!-- Test Case Test Case Test Case Test Case -->
- <step>
- <assign varDefinition ="subCollName">即可顯示</assign>
+
+ <step>
+ <assign varDefinition ="subCollName">即可顯示</assign>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName,subCollName">MKCOL /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
</request>
@@ -19,10 +19,10 @@
<command>HTTP/1.0 201 Created</command>
</response>
</step>
- <step>
+ <step>
<request>
<command varUsage="globalVariableCollection,globalVariableServerName,subCollName">PUT /%globalVariableServerName%/%globalVariableCollection%/%subCollName%/i18ndoc.xml HTTP/1.1</command>
- <body fileReference="../../contentDirectory/I18N/schema_zh/Big5/none/inst_table_nonei18n_Big5JP.xm1" fileEncoding='Big5'>
+ <body fileReference="../../contentDirectory/I18N/schema_zh/Big5/none/inst_table_nonei18n_Big5JP.xm1" fileEncoding='Big5'>
</body>
</request>
<response>
@@ -31,9 +31,10 @@
</step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">LOCK /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">LOCK /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
- <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
+ <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]>
+ </body>
</request>
<response>
<command>HTTP/1.0 200 OK</command>
@@ -41,33 +42,11 @@
</response>
</step>
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">LOCK /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
-
- <body><![CDATA[<?xml version="1.0"?><A:lockinfo xmlns:A="DAV:"><A:locktype><A:write/></A:locktype><A:lockscope><A:exclusive/></A:lockscope><A:owner><A:href></A:href></A:owner></A:lockinfo>]]></body>
- </request>
- <response>
- <command>HTTP/1.0 207</command>
-
- <body varUsage="globalVariableCollection">
- <![CDATA[<?xml version="1.0"?>
- <d:multistatus xmlns:d="DAV">
- <d:response>
- <d:href>/%globalVariableCollection%</d:href>
- <d:status>HTTP/1.1 423 Locked</d:status>
- </d:response>
- </d:multistatus>
- ]]>
- </body>
-
- </response>
- </step>
<step>
<request>
- <command varUsage="globalVariableCollection,globalVariableServerName">UNLOCK /%globalVariableServerName%/%globalVariableCollection% HTTP/1.1</command>
+ <command varUsage="globalVariableCollection,globalVariableServerName,subCollName">UNLOCK /%globalVariableServerName%/%globalVariableCollection%/%subCollName% HTTP/1.1</command>
- <header varUsage="automaticVariable1">Lock-Token: %varUsage%</header>
+ <header varUsage="automaticVariable2">Lock-Token: %varUsage%</header>
</request>
<response>
@@ -87,5 +66,5 @@
</response>
</step>
- <!-- Test Case Test Case Test Case Test Case -->
+
</test>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>