luetzkendorf 2004/11/29 10:35:56
Modified:
testsuite/testsuite/junit/xmltestcases/DASL/functional/where/content_ops
contentAndProps.xml onlyProps.xml
testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops
userdefinedAndDisplayname.xml
Added:
testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops
displaynameAndContent.xml userdefinedAndContent.xml
Log:
no message
Revision Changes Path
1.7 +2 -2
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/content_ops/contentAndProps.xml
Index: contentAndProps.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/content_ops/contentAndProps.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- contentAndProps.xml 16 Nov 2004 14:28:51 -0000 1.6
+++ contentAndProps.xml 29 Nov 2004 18:35:56 -0000 1.7
@@ -18,7 +18,7 @@
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test.xml
HTTP/1.1</command>
- <!-- Element 13 contains the string that is being searched for =
Unsinn. -->
+ <!-- Element 13 contains the string that is being searched for =
Hallo. -->
<body
fileReference="../../../../contentDirectory/attributedChoice1Instance1k.xm1" />
</request>
<response>
@@ -51,7 +51,7 @@
</D:scope>
</D:from>
<D:where>
- <D:contains>Unsinn</D:contains>
+ <D:contains>Hallo</D:contains>
</D:where>
</D:basicsearch>
</searchrequest>
1.7 +1 -1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/content_ops/onlyProps.xml
Index: onlyProps.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/content_ops/onlyProps.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- onlyProps.xml 16 Nov 2004 14:28:51 -0000 1.6
+++ onlyProps.xml 29 Nov 2004 18:35:56 -0000 1.7
@@ -50,7 +50,7 @@
</D:scope>
</D:from>
<D:where>
- <D:contains>Unsinn</D:contains>
+ <D:contains>Hallo</D:contains>
</D:where>
</D:basicsearch>
</searchrequest>
1.2 +187 -68
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/userdefinedAndDisplayname.xml
Index: userdefinedAndDisplayname.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/userdefinedAndDisplayname.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- userdefinedAndDisplayname.xml 16 Nov 2004 14:31:12 -0000 1.1
+++ userdefinedAndDisplayname.xml 29 Nov 2004 18:35:56 -0000 1.2
@@ -11,7 +11,7 @@
</specification>
<step>
<request>
- <command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test.xml
HTTP/1.1</command>
+ <command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test1.xml
HTTP/1.1</command>
<body fileReference="../../../../contentDirectory/validXML.xm1" />
</request>
<response>
@@ -20,48 +20,47 @@
</step>
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test1.xml
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
- <D:set>
- <D:prop>
- <D:displayname>FOO</D:displayname>
- </D:prop>
- </D:set>
- <D:set>
- <D:prop>
- <X:user-defined>BAR</X:user-defined>
- </D:prop>
- </D:set>
-</D:propertyupdate>
-
-]]></body>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
+ <D:set>
+ <D:prop>
+ <D:displayname>FOO</D:displayname>
+ </D:prop>
+ </D:set>
+ <D:set>
+ <D:prop>
+ <X:user-defined>BAR</X:user-defined>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate>
+ ]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
-<d:multistatus xmlns:d="DAV" xmlns:x="extra">
- <d:response>
-
<d:href>%globalVariableServerName%/%globalVariableCollection%/test.xml</d:href>
- <d:propstat>
- <d:prop>
- <d:displayname/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- <d:propstat>
- <d:prop>
- <x:user-defined/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- </d:response>
-</d:multistatus>
-
-]]></body>
+ <d:multistatus xmlns:d="DAV" xmlns:x="extra">
+ <d:response>
+
<d:href>%globalVariableServerName%/%globalVariableCollection%/test1.xml</d:href>
+ <d:propstat>
+ <d:prop>
+ <d:displayname/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <x:user-defined/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]></body>
</response>
</step>
+
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test2.xml
HTTP/1.1</command>
@@ -76,47 +75,151 @@
<command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test2.xml
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
-<D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
- <D:set>
- <D:prop>
- <D:displayname>different value</D:displayname>
- </D:prop>
- </D:set>
- <D:set>
- <D:prop>
- <X:user-defined>ditto</X:user-defined>
- </D:prop>
- </D:set>
-</D:propertyupdate>
-
-]]></body>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
+ <D:set>
+ <D:prop>
+ <D:displayname>different value</D:displayname>
+ </D:prop>
+ </D:set>
+ <D:set>
+ <D:prop>
+ <X:user-defined>ditto</X:user-defined>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate>
+ ]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<d:multistatus xmlns:d="DAV" xmlns:x="extra">
- <d:response>
-
<d:href>%globalVariableServerName%/%globalVariableCollection%/test2.xml</d:href>
- <d:propstat>
- <d:prop>
- <d:displayname/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- <d:propstat>
- <d:prop>
- <x:user-defined/>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- </d:response>
-</d:multistatus>
+ <d:response>
+
<d:href>%globalVariableServerName%/%globalVariableCollection%/test2.xml</d:href>
+ <d:propstat>
+ <d:prop>
+ <d:displayname/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <x:user-defined/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]></body>
+ </response>
+ </step>
-]]></body>
+
+ <step>
+ <request>
+ <command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test3.xml
HTTP/1.1</command>
+ <body fileReference="../../../../contentDirectory/validXML.xm1" />
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test3.xml
HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
+ <D:set>
+ <D:prop>
+ <D:displayname>FOO</D:displayname>
+ </D:prop>
+ </D:set>
+ <D:set>
+ <D:prop>
+ <X:user-defined>ditto</X:user-defined>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
+ <d:multistatus xmlns:d="DAV" xmlns:x="extra">
+ <d:response>
+
<d:href>%globalVariableServerName%/%globalVariableCollection%/test3.xml</d:href>
+ <d:propstat>
+ <d:prop>
+ <d:displayname/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <x:user-defined/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]></body>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test4.xml
HTTP/1.1</command>
+ <body fileReference="../../../../contentDirectory/validXML.xm1" />
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test4.xml
HTTP/1.1</command>
+ <header>Content-Type: text/xml</header>
+ <body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
+ <D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
+ <D:set>
+ <D:prop>
+ <D:displayname>different value</D:displayname>
+ </D:prop>
+ </D:set>
+ <D:set>
+ <D:prop>
+ <X:user-defined>BAR</X:user-defined>
+ </D:prop>
+ </D:set>
+ </D:propertyupdate>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
+ <d:multistatus xmlns:d="DAV" xmlns:x="extra">
+ <d:response>
+
<d:href>%globalVariableServerName%/%globalVariableCollection%/test4.xml</d:href>
+ <d:propstat>
+ <d:prop>
+ <d:displayname/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+ <d:propstat>
+ <d:prop>
+ <x:user-defined/>
+ </d:prop>
+ <d:status>HTTP/1.1 200 OK</d:status>
+ </d:propstat>
+ </d:response>
+ </d:multistatus>
+ ]]></body>
+ </response>
+ </step>
+
+
+ <step>
+ <request>
<command varUsage="globalVariableServerName">SEARCH
%globalVariableServerName% HTTP/1.1</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<searchrequest xmlns:D="DAV:" xmlns:X="extra">
@@ -151,7 +254,7 @@
<body
varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
-
<D:href>%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
+
<D:href>%globalVariableServerName%/%globalVariableCollection%/test1.xml</D:href>
<D:propstat>
<D:prop>
<D:displayname>FOO</D:displayname>
@@ -167,7 +270,7 @@
<cleanup>
<step>
<request>
- <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
%globalVariableServerName%/%globalVariableCollection%/test.xml
HTTP/1.1</command>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
%globalVariableServerName%/%globalVariableCollection%/test1.xml
HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
@@ -176,6 +279,22 @@
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
%globalVariableServerName%/%globalVariableCollection%/test2.xml
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
%globalVariableServerName%/%globalVariableCollection%/test3.xml
HTTP/1.1</command>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
%globalVariableServerName%/%globalVariableCollection%/test4.xml
HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
1.1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/displaynameAndContent.xml
Index: displaynameAndContent.xml
===================================================================
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
<specification>
<abstract> Tests query that queries content AND metadata </abstract>
<pre-Requisite></pre-Requisite>
<description>
1) Put a resource. (contains 'Hallo')
1a) set displayname to "FOO"
2) Put a resource. (contains NOT 'Hallo')
2a) set displayname to "FOO"
3) Put a resource. (contains 'Hallo')
3a) set displayname to "BAR"
4) Put a resource. (contains NOT 'Hallo')
4a) set displayname to "BAR"
5) Search for only the resource where contains "Hallo" AND has
displayname == "FOO".
6) Delete resources.
</description>
<expectedResult>A 207 Multi-Status response should be returned as a
result of the Search.
Only the first resource should be found.
</expectedResult>
</specification>
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test1.xml
HTTP/1.1</command>
<body
fileReference="../../../../contentDirectory/attributedChoice1Instance1k.xm1" />
</request>
<response>
<command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test1.xml
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
<D:set>
<D:prop>
<D:displayname>FOO</D:displayname>
</D:prop>
</D:set>
</D:propertyupdate>
]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<d:multistatus xmlns:d="DAV" xmlns:x="extra">
<d:response>
<d:href>%globalVariableServerName%/%globalVariableCollection%/test1.xml</d:href>
<d:propstat>
<d:prop>
<d:displayname/>
</d:prop>
<d:status>HTTP/1.1 200 OK</d:status>
</d:propstat>
</d:response>
</d:multistatus>
]]></body>
</response>
</step>
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test2.xml
HTTP/1.1</command>
<body fileReference="../../../../contentDirectory/validXML.xm1" />
</request>
<response>
<command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test2.xml
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
<D:set>
<D:prop>
<D:displayname>FOO</D:displayname>
</D:prop>
</D:set>
</D:propertyupdate>
]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<d:multistatus xmlns:d="DAV" xmlns:x="extra">
<d:response>
<d:href>%globalVariableServerName%/%globalVariableCollection%/test2.xml</d:href>
<d:propstat>
<d:prop>
<d:displayname/>
</d:prop>
<d:status>HTTP/1.1 200 OK</d:status>
</d:propstat>
</d:response>
</d:multistatus>
]]></body>
</response>
</step>
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test3.xml
HTTP/1.1</command>
<body
fileReference="../../../../contentDirectory/attributedChoice1Instance1k.xm1" />
</request>
<response>
<command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test3.xml
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
<D:set>
<D:prop>
<D:displayname>BAR</D:displayname>
</D:prop>
</D:set>
</D:propertyupdate>
]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<d:multistatus xmlns:d="DAV" xmlns:x="extra">
<d:response>
<d:href>%globalVariableServerName%/%globalVariableCollection%/test3.xml</d:href>
<d:propstat>
<d:prop>
<d:displayname/>
</d:prop>
<d:status>HTTP/1.1 200 OK</d:status>
</d:propstat>
</d:response>
</d:multistatus>
]]></body>
</response>
</step>
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test4.xml
HTTP/1.1</command>
<body fileReference="../../../../contentDirectory/validXML.xm1" />
</request>
<response>
<command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test4.xml
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
<D:set>
<D:prop>
<D:displayname>BAR</D:displayname>
</D:prop>
</D:set>
</D:propertyupdate>
]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<d:multistatus xmlns:d="DAV" xmlns:x="extra">
<d:response>
<d:href>%globalVariableServerName%/%globalVariableCollection%/test4.xml</d:href>
<d:propstat>
<d:prop>
<d:displayname/>
</d:prop>
<d:status>HTTP/1.1 200 OK</d:status>
</d:propstat>
</d:response>
</d:multistatus>
]]></body>
</response>
</step>
<step>
<request>
<command varUsage="globalVariableServerName">SEARCH
%globalVariableServerName% HTTP/1.1</command>
<body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0"
encoding="utf-8"?>
<searchrequest xmlns:D="DAV:">
<D:basicsearch>
<D:select>
<D:prop />
</D:select>
<D:from>
<D:scope>
<D:href>%globalVariableCollection%</D:href>
<D:depth>1</D:depth>
</D:scope>
</D:from>
<D:where>
<D:and>
<D:contains>Hallo</D:contains>
<D:eq>
<D:prop><D:displayname/></D:prop>
<D:literal>FOO</D:literal>
</D:eq>
</D:and>
</D:where>
</D:basicsearch>
</searchrequest>
]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>%globalVariableServerName%/%globalVariableCollection%/test1.xml</D:href>
</D:response>
</D:multistatus>
]]></body>
</response>
</step>
<cleanup>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
%globalVariableServerName%/%globalVariableCollection%/test1.xml
HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
%globalVariableServerName%/%globalVariableCollection%/test2.xml
HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
%globalVariableServerName%/%globalVariableCollection%/test3.xml
HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">DELETE
%globalVariableServerName%/%globalVariableCollection%/test4.xml
HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
</response>
</step>
</cleanup>
</test>
1.1
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/where/log_ops/userdefinedAndContent.xml
Index: userdefinedAndContent.xml
===================================================================
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
<test>
<specification>
<abstract> Tests query that queries content AND metadata (an userdefined
property, i.e. a property not index by
the lucene proeprties indexer</abstract>
<pre-Requisite></pre-Requisite>
<description>
1) Put a resource. (contains 'Hallo')
1a) set X:user-defined to "FOO"
2) Put a resource. (contains NOT 'Hallo')
2a) set X:user-defined to "FOO"
3) Put a resource. (contains 'Hallo')
3a) set X:user-defined to "BAR"
4) Put a resource. (contains NOT 'Hallo')
4a) set X:user-defined to "BAR"
5) Search for only the resource where contains "Hallo" AND has
X:user-defined == "FOO".
6) Delete resources.
</description>
<expectedResult>A 207 Multi-Status response should be returned as a
result of the Search.
Only the first resource should be found.
</expectedResult>
</specification>
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test1.xml
HTTP/1.1</command>
<body
fileReference="../../../../contentDirectory/attributedChoice1Instance1k.xm1" />
</request>
<response>
<command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test1.xml
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
<D:set>
<D:prop>
<X:user-defined>FOO</X:user-defined>
</D:prop>
</D:set>
</D:propertyupdate>
]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<d:multistatus xmlns:d="DAV" xmlns:X="extra">
<d:response>
<d:href>%globalVariableServerName%/%globalVariableCollection%/test1.xml</d:href>
<d:propstat>
<d:prop>
<X:user-defined/>
</d:prop>
<d:status>HTTP/1.1 200 OK</d:status>
</d:propstat>
</d:response>
</d:multistatus>
]]></body>
</response>
</step>
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test2.xml
HTTP/1.1</command>
<body fileReference="../../../../contentDirectory/validXML.xm1" />
</request>
<response>
<command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test2.xml
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
<D:set>
<D:prop>
<X:user-defined>FOO</X:user-defined>
</D:prop>
</D:set>
</D:propertyupdate>
]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<d:multistatus xmlns:d="DAV" xmlns:X="extra">
<d:response>
<d:href>%globalVariableServerName%/%globalVariableCollection%/test2.xml</d:href>
<d:propstat>
<d:prop>
<X:user-defined/>
</d:prop>
<d:status>HTTP/1.1 200 OK</d:status>
</d:propstat>
</d:response>
</d:multistatus>
]]></body>
</response>
</step>
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test3.xml
HTTP/1.1</command>
<body
fileReference="../../../../contentDirectory/attributedChoice1Instance1k.xm1" />
</request>
<response>
<command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test3.xml
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
<D:set>
<D:prop>
<X:user-defined>BAR</X:user-defined>
</D:prop>
</D:set>
</D:propertyupdate>
]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<d:multistatus xmlns:d="DAV" xmlns:X="extra">
<d:response>
<d:href>%globalVariableServerName%/%globalVariableCollection%/test3.xml</d:href>
<d:propstat>
<d:prop>
<X:user-defined/>
</d:prop>
<d:status>HTTP/1.1 200 OK</d:status>
</d:propstat>
</d:response>
</d:multistatus>
]]></body>
</response>
</step>
<step>
<request>
<command
varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT
%globalVariableServerName%/%globalVariableCollection%/test4.xml
HTTP/1.1</command>
<body fileReference="../../../../contentDirectory/validXML.xm1" />
</request>
<response>
<command>HTTP/1.0 201 Created</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName">PROPPATCH
%globalVariableServerName%/%globalVariableCollection%/test4.xml
HTTP/1.1</command>
<header>Content-Type: text/xml</header>
<body><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<D:propertyupdate xmlns:D="DAV:" xmlns:X="extra">
<D:set>
<D:prop>
<X:user-defined>BAR</X:user-defined>
</D:prop>
</D:set>
</D:propertyupdate>
]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<d:multistatus xmlns:d="DAV" xmlns:X="extra">
<d:response>
<d:href>%globalVariableServerName%/%globalVariableCollection%/test4.xml</d:href>
<d:propstat>
<d:prop>
<X:user-defined/>
</d:prop>
<d:status>HTTP/1.1 200 OK</d:status>
</d:propstat>
</d:response>
</d:multistatus>
]]></body>
</response>
</step>
<step>
<request>
<command varUsage="globalVariableServerName">SEARCH
%globalVariableServerName% HTTP/1.1</command>
<body varUsage="globalVariableCollection"><![CDATA[<?xml version="1.0"
encoding="utf-8"?>
<searchrequest xmlns:D="DAV:" xmlns:x="extra">
<D:basicsearch>
<D:select>
<D:prop />
</D:select>
<D:from>
<D:scope>
<D:href>%globalVariableCollection%</D:href>
<D:depth>1</D:depth>
</D:scope>
</D:from>
<D:where>
<D:and>
<D:contains>Hallo</D:contains>
<D:eq>
<D:prop><x:user-defined/></D:prop>
<D:literal>FOO</D:literal>
</D:eq>
</D:and>
</D:where>
</D:basicsearch>
</searchrequest>
]]></body>
</request>
<response>
<command>HTTP/1.0 207 Multi-Status</command>
<body
varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[<?xml
version="1.0" encoding="utf-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>%globalVariableServerName%/%globalVariableCollection%/test1.xml</D:href>
</D:response>
</D:multistatus>
]]></body>
</response>
</step>
<cleanup>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
%globalVariableServerName%/%globalVariableCollection%/test1.xml
HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
%globalVariableServerName%/%globalVariableCollection%/test2.xml
HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
%globalVariableServerName%/%globalVariableCollection%/test3.xml
HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
</response>
</step>
<step>
<request>
<command
varUsage="globalVariableCollection,globalVariableServerName"> DELETE
%globalVariableServerName%/%globalVariableCollection%/test4.xml
HTTP/1.1</command>
</request>
<response>
<command>HTTP/1.0 204 No Content</command>
</response>
</step>
</cleanup>
</test>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
