[CalendarServer-changes] [5625] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed May 19 13:41:10 PDT 2010
Revision: 5625
http://trac.macosforge.org/projects/calendarserver/changeset/5625
Author: cdaboo at apple.com
Date: 2010-05-19 13:41:08 -0700 (Wed, 19 May 2010)
Log Message:
-----------
Fix directory gateway tests to work with odsetup DS records.
Modified Paths:
--------------
CalDAVTester/trunk/Resource/CardDAV/vreports/searchmultiget/1.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/1.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/11.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/12.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/13.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/14.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/3.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/4.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/6.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/7.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/8.xml
CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/9.xml
CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchmultiget/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchmultiget/1.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchmultiget/1.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -5,12 +5,12 @@
<C:prop name="UID"/>
</C:address-data>
</D:prop>
-<D:href>/directory/00000000-cf07a1a2-Sm9zaCBCZWhua2U%3D.vcf</D:href>
-<D:href>/directory/00000000-cf07a1a2-Sm9zaHVhIEJhbmtv.vcf</D:href>
-<D:href>/directory/00000000-cf07a1a2-Sm9zZSBBbHZhcmV6.vcf</D:href>
-<D:href>/directory/00000000-cf07a1a2-Sm9zZXBoIEFuZGVyc29u.vcf</D:href>
-<D:href>/directory/00000000-cf07a1a2-Sm9zZWxpbiBCdXN0YW1hbnRl.vcf</D:href>
-<D:href>/directory/00000000-cf07a1a2-Sm9zZWYgQmlzbWFub3Zza3k%3D.vcf</D:href>
-<D:href>/directory/00000000-cf07a1a2-Sm9zZSBBYmFyY2E%3D.vcf</D:href>
-<D:href>/directory/00000000-cf07a1a2-Sm9zZSBCYXNhcm90.vcf</D:href>
+<D:href>/directory/$userguid1:.vcf</D:href>
+<D:href>/directory/$userguid2:.vcf</D:href>
+<D:href>/directory/$userguid3:.vcf</D:href>
+<D:href>/directory/$userguid4:.vcf</D:href>
+<D:href>/directory/$publicuserguid1:.vcf</D:href>
+<D:href>/directory/$publicuserguid2:.vcf</D:href>
+<D:href>/directory/$publicuserguid3:.vcf</D:href>
+<D:href>/directory/$publicuserguid4:.vcf</D:href>
</C:addressbook-multiget>
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/1.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/1.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/1.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -15,7 +15,7 @@
<C:prop-filter name="FN">
<C:text-match collation="i;unicode-casemap"
match-type="starts-with"
- >jos</C:text-match>
+ >pub</C:text-match>
</C:prop-filter>
</C:filter>
</C:addressbook-query>
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/11.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/11.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/11.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -15,18 +15,18 @@
<C:prop-filter name="FN" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >Anderson</C:text-match>
+ >Public</C:text-match>
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >John</C:text-match>
+ >03</C:text-match>
</C:prop-filter>
<C:prop-filter name="EMAIL" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >john</C:text-match>
+ >example</C:text-match>
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >apple</C:text-match>
+ >public</C:text-match>
</C:prop-filter>
</C:filter>
<C:limit>
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/12.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/12.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/12.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -15,22 +15,22 @@
<C:prop-filter name="FN" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >Anderson</C:text-match>
+ >Public</C:text-match>
</C:prop-filter>
<C:prop-filter name="FN" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >John</C:text-match>
+ >03</C:text-match>
</C:prop-filter>
<C:prop-filter name="EMAIL" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >ank</C:text-match>
+ >example</C:text-match>
</C:prop-filter>
<C:prop-filter name="EMAIL" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >apple</C:text-match>
+ >user</C:text-match>
</C:prop-filter>
</C:filter>
<C:limit>
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/13.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/13.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/13.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -15,25 +15,22 @@
<C:prop-filter name="FN" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >Anderson</C:text-match>
+ >02</C:text-match>
</C:prop-filter>
<C:prop-filter name="FN" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >John</C:text-match>
+ >03</C:text-match>
</C:prop-filter>
<C:prop-filter name="EMAIL" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >ank</C:text-match>
+ >04</C:text-match>
</C:prop-filter>
<C:prop-filter name="EMAIL" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >apple</C:text-match>
+ >user</C:text-match>
</C:prop-filter>
</C:filter>
- <C:limit>
- <C:nresults>4</C:nresults>
- </C:limit>
</C:addressbook-query>
\ No newline at end of file
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/14.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/14.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/14.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -15,15 +15,15 @@
<C:prop-filter name="FN" test="anyof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >Anderson</C:text-match>
+ >Public</C:text-match>
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >John</C:text-match>
+ >03</C:text-match>
</C:prop-filter>
<C:prop-filter name="EMAIL" test="anyof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >ank</C:text-match>
+ >bogus</C:text-match>
<C:param-filter name="TYPE">
<C:text-match>work</C:text-match>
</C:param-filter>
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/3.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/3.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/3.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -9,8 +9,8 @@
</C:address-data>
</D:prop>
<C:filter>
- <C:prop-filter name="ADR">
- <C:text-match negate-condition='yes'>A</C:text-match>
+ <C:prop-filter name="EMAIL">
+ <C:text-match negate-condition='yes'>b</C:text-match>
</C:prop-filter>
</C:filter>
</C:addressbook-query>
\ No newline at end of file
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/4.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/4.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/4.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -9,8 +9,8 @@
</C:address-data>
</D:prop>
<C:filter>
- <C:prop-filter name="EMAIL">
- <C:is-not-defined/>
+ <C:prop-filter name="ADR">
+ <C:is-not-defined/>
</C:prop-filter>
</C:filter>
</C:addressbook-query>
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/6.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/6.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/6.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -15,7 +15,7 @@
<C:prop-filter name="EMAIL" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >@euro</C:text-match>
+ >@example</C:text-match>
<C:param-filter name="TYPE">
<C:text-match>HOME</C:text-match>
</C:param-filter>
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/7.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/7.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/7.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -12,15 +12,15 @@
</C:address-data>
</D:prop>
<C:filter test="allof">
- <C:prop-filter name="N">
+ <C:prop-filter name="FN">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >Mac</C:text-match>
+ >ic 01</C:text-match>
</C:prop-filter>
<C:prop-filter name="EMAIL">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >@euro</C:text-match>
+ >@example</C:text-match>
</C:prop-filter>
</C:filter>
</C:addressbook-query>
\ No newline at end of file
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/8.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/8.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/8.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -18,7 +18,7 @@
>.com</C:text-match>
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >apple</C:text-match>
+ >public</C:text-match>
<C:param-filter name="TYPE">
<C:text-match>work</C:text-match>
</C:param-filter>
Modified: CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/9.xml
===================================================================
--- CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/9.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/Resource/CardDAV/vreports/searchquery/9.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -15,18 +15,18 @@
<C:prop-filter name="FN" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >Anderson</C:text-match>
+ >Public</C:text-match>
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >John</C:text-match>
+ >03</C:text-match>
</C:prop-filter>
<C:prop-filter name="EMAIL" test="allof">
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >ank</C:text-match>
+ >user</C:text-match>
<C:text-match collation="i;unicode-casemap"
match-type="contains"
- >apple</C:text-match>
+ >02</C:text-match>
<C:param-filter name="TYPE">
<C:text-match>work</C:text-match>
</C:param-filter>
Modified: CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml 2010-05-19 20:29:28 UTC (rev 5624)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml 2010-05-19 20:41:08 UTC (rev 5625)
@@ -899,9 +899,13 @@
</test>
</test-suite>
- <test-suite name='search query reports' ignore='yes'>
+ <test-suite name='directory gateway query reports' ignore='no'>
+ <require-feature>
+ <feature>directory-gateway</feature>
+ </require-feature>
+
<test name='1' ignore='no'>
- <description>query for FN starts with "jos"</description>
+ <description>query for FN starts with "pub"</description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -913,14 +917,16 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>00000000-cf07a1a2-Sm9zaCBCZWhua2U%3D.vcf</value>
- <value>00000000-cf07a1a2-Sm9zaHVhIEJhbmtv.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZSBBbHZhcmV6.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZXBoIEFuZGVyc29u.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZWxpbiBCdXN0YW1hbnRl.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZWYgQmlzbWFub3Zza3k%3D.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZSBBYmFyY2E%3D.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZSBCYXNhcm90.vcf</value>
+ <value>$publicuserguid1:.vcf</value>
+ <value>$publicuserguid2:.vcf</value>
+ <value>$publicuserguid3:.vcf</value>
+ <value>$publicuserguid4:.vcf</value>
+ <value>$publicuserguid5:.vcf</value>
+ <value>$publicuserguid6:.vcf</value>
+ <value>$publicuserguid7:.vcf</value>
+ <value>$publicuserguid8:.vcf</value>
+ <value>$publicuserguid9:.vcf</value>
+ <value>$publicuserguid10:.vcf</value>
</arg>
</verify>
</request>
@@ -929,7 +935,7 @@
<description>query for FN starts with "sim" in a unmatching vCard</description>
<request print-response="no">
<method>REPORT</method>
- <ruri>$directory:00000000-cf07a1a2-Sm9zZWYgQmlzbWFub3Zza3k%3D.vcf</ruri>
+ <ruri>$directory:$publicuserguid1:.vcf</ruri>
<data substitutions='yes'>
<content-type>text/xml; charset=utf-8</content-type>
<filepath>Resource/CardDAV/vreports/searchquery/2.xml</filepath>
@@ -943,7 +949,7 @@
</request>
</test>
<test name='3' ignore='no'>
- <description>query for ADR does not contain "a"</description>
+ <description>query for EMAIL does not contain "b"</description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -955,28 +961,39 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>00000000-cf07a1a2-U2FyYWggQWJib3R0.vcf</value>
- <value>00000000-cf07a1a2-SmFtZXMgQmFja2Vz.vcf</value>
- <value>00000000-cf07a1a2-U3RldmUgQ2Fubw%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-UmljayBBbWV6cXVpdGE%3D.vcf</value>
- <value>00000000-cf07a1a2-U3RldmVuIEJpbmRlcg%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-Vml2aWVubmUgQWhlcm4gQWhlcm4%3D.vcf</value>
- <value>00000000-cf07a1a2-QmVwcGUgQ2FydWdubw%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-TGVpZ2ggQmxhbmtlbnNoaXA%3D.vcf</value>
- <value>00000000-cf07a1a2-VG9ueSBBZ2hhemFyaWFu.vcf</value>
- <value>00000000-cf07a1a2-R2FyZXRoIEFsZWNvY2s%3D.vcf</value>
- <value>00000000-cf07a1a2-QXJhY2VseSBBY29zdGE%3D.vcf</value>
- <value>00000000-cf07a1a2-w4VzYSBCZXJnZ3Jlbg%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-TWljaGVsZSBCdXJucw%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-Q29yZXkgQ2Fyc29u.vcf</value>
- <value>00000000-cf07a1a2-TWFyeS1FbGlzYSBCdXJrZQ%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-UGhpbGlwIEJvaw%3D%3D.vcf</value>
+ <value>$userguid1:.vcf</value>
+ <value>$userguid2:.vcf</value>
+ <value>$userguid3:.vcf</value>
+ <value>$userguid4:.vcf</value>
+ <value>$userguid5:.vcf</value>
+ <value>$userguid6:.vcf</value>
+ <value>$userguid7:.vcf</value>
+ <value>$userguid8:.vcf</value>
+ <value>$userguid9:.vcf</value>
+ <value>$userguid10:.vcf</value>
</arg>
+ <arg>
+ <name>nohrefs</name>
+ <value>$publicuserguid1:.vcf</value>
+ <value>$publicuserguid2:.vcf</value>
+ <value>$publicuserguid3:.vcf</value>
+ <value>$publicuserguid4:.vcf</value>
+ <value>$publicuserguid5:.vcf</value>
+ <value>$publicuserguid6:.vcf</value>
+ <value>$publicuserguid7:.vcf</value>
+ <value>$publicuserguid8:.vcf</value>
+ <value>$publicuserguid9:.vcf</value>
+ <value>$publicuserguid10:.vcf</value>
+ </arg>
+ <arg>
+ <name>ignoremissing</name>
+ <value/>
+ </arg>
</verify>
</request>
</test>
<test name='4' ignore='no'>
- <description>query for EMAIL is-not-defined</description>
+ <description>query for ADR is-not-defined</description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -988,19 +1005,21 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>00000000-cf07a1a2-UGF1bCBCb2xpbmc%3D.vcf</value>
- <value>00000000-cf07a1a2-QnJ5YXIgQnJvd24%3D.vcf</value>
- <value>00000000-cf07a1a2-SmltIEFpZWxsbw%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-RWxpemFiZXRoIENhbnRyYWxs.vcf</value>
- <value>00000000-cf07a1a2-UGV0ZXIgQm9obGlu.vcf</value>
- <value>00000000-cf07a1a2-U2FtIEFnbmV3.vcf</value>
- <value>00000000-cf07a1a2-b25lIEJhZGdlcw%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-Q2hyaXMgQnJ1Z2g%3D.vcf</value>
- <value>00000000-cf07a1a2-QW15IENhcmxvdw%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-U3RhY3kgQW50aWE%3D.vcf</value>
- <value>00000000-cf07a1a2-VmljdG9yIENhYmFnYmFnLCBKci4%3D.vcf</value>
- <value>00000000-cf07a1a2-Um9iZXJ0IEJsYWluZXk%3D.vcf</value>
+ <value>$userguid1:.vcf</value>
+ <value>$userguid2:.vcf</value>
+ <value>$userguid3:.vcf</value>
+ <value>$userguid4:.vcf</value>
+ <value>$userguid5:.vcf</value>
+ <value>$userguid6:.vcf</value>
+ <value>$userguid7:.vcf</value>
+ <value>$userguid8:.vcf</value>
+ <value>$userguid9:.vcf</value>
+ <value>$userguid10:.vcf</value>
</arg>
+ <arg>
+ <name>ignoremissing</name>
+ <value/>
+ </arg>
</verify>
</request>
</test>
@@ -1015,28 +1034,15 @@
</data>
<verify>
<callback>multistatusItems</callback>
- <arg>
- <name>badhrefs</name>
- <value/>
- </arg>
<arg>
- <name>okhrefs</name>
- <value>00000000-cf07a1a2-RWxvZGlhIEFuZ3VpYW5vIFBhbnRvamE%3D.vcf</value>
- <value>00000000-cf07a1a2-S2FyZW4gQWJnYXJpYW4%3D.vcf</value>
- <value>00000000-cf07a1a2-VG9taWNrbyBBYmVsbGE%3D.vcf</value>
- <value>00000000-cf07a1a2-S0VMTFkgQUxGT1JE.vcf</value>
- <value>00000000-cf07a1a2-QWFyb24gQWJib3R0.vcf</value>
- <value>00000000-cf07a1a2-RmF0aW1hIEFiZHVsbGFo.vcf</value>
- <value>00000000-cf07a1a2-SGFuaSBBYmRlbGF6aW0%3D.vcf</value>
- <value>00000000-cf07a1a2-U2FyYWggQWJib3R0.vcf</value>
- <value>00000000-cf07a1a2-VGFtbXkgQWJlbGw%3D.vcf</value>
- <value>00000000-cf07a1a2-Sm9uYXRoYW4gQWJlcmxl.vcf</value>
+ <name>totalcount</name>
+ <value>10</value>
</arg>
</verify>
</request>
</test>
<test name='6' ignore='no'>
- <description>query EMAIL contains "@euro" with parameter "HOME"</description>
+ <description>query EMAIL contains "@example" with parameter "HOME"</description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -1047,14 +1053,14 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>badhrefs</name>
- <value/>
+ <name>totalcount</name>
+ <value>0</value>
</arg>
</verify>
</request>
</test>
<test name='7' ignore='no'>
- <description>query N contains "Mac" and EMAIL contains "@euro"</description>
+ <description>query FN contains "ic 01" and EMAIL contains "@example"</description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -1066,13 +1072,13 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>00000000-cf07a1a2-Q2xhaXJlIE1hY1JhZQ%3D%3D.vcf</value>
+ <value>$publicuserguid1:.vcf</value>
</arg>
</verify>
</request>
</test>
<test name="8" ignore="no">
- <description>query for resources with EMAIL contains '.com' and 'apple" with parameter TYPE = "WORK") limited to 4 responses</description>
+ <description>query for resources with EMAIL contains '.com' and '01' with parameter TYPE = "WORK") limited to 4 responses</description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -1087,17 +1093,14 @@
<value/>
</arg>
<arg>
- <name>okhrefs</name>
- <value>00000000-cf07a1a2-Sm9zZSBBYmFyY2E%3D.vcf</value>
- <value>00000000-cf07a1a2-RWxvZGlhIEFuZ3VpYW5vIFBhbnRvamE%3D.vcf</value>
- <value>00000000-cf07a1a2-U2FyYWggQWJib3R0.vcf</value>
- <value>00000000-cf07a1a2-S0VMTFkgQUxGT1JE.vcf</value>
+ <name>totalcount</name>
+ <value>4</value>
</arg>
</verify>
</request>
</test>
<test name="9" ignore="no">
- <description>query for resources with (FN contains 'John' and 'Anderson") or (EMAIL contains 'apple' and 'ank')" </description>
+ <description>query for resources with (FN contains 'Public' and '03") or (EMAIL contains 'User' and '02')" </description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -1107,16 +1110,10 @@
</data>
<verify>
<callback>multistatusItems</callback>
- <arg>
- <name>badhrefs</name>
- <value/>
- </arg>
<arg>
<name>okhrefs</name>
- <value>00000000-cf07a1a2-TWljaGVsbGUgQmFua3M%3D.vcf</value>
- <value>00000000-cf07a1a2-Sm9obiBBbmtlcg%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-Sm9obiBBbmRlcnNvbg%3D%3D.vcf</value>
- <value>00000000-cf07a1a2-Sm9zaHVhIEJhbmtv.vcf</value>
+ <value>$publicuserguid3:.vcf</value>
+ <value>$userguid2:.vcf</value>
</arg>
</verify>
</request>
@@ -1137,17 +1134,14 @@
<value/>
</arg>
<arg>
- <name>okhrefs</name>
- <value>00000000-cf07a1a2-Sm9zZSBBYmFyY2E%3D.vcf</value>
- <value>00000000-cf07a1a2-RWxvZGlhIEFuZ3VpYW5vIFBhbnRvamE%3D.vcf</value>
- <value>00000000-cf07a1a2-U2FyYWggQWJib3R0.vcf</value>
- <value>00000000-cf07a1a2-S0VMTFkgQUxGT1JE.vcf</value>
+ <name>totalcount</name>
+ <value>4</value>
</arg>
</verify>
</request>
</test>
<test name="11" ignore="no">
- <description>query for resources with (FN contains 'John' and 'Anderson") AND (EMAIL contains 'apple' and 'john') limited to 4 results"" </description>
+ <description>query for resources with (FN contains 'Public' and '03") AND (EMAIL contains 'example' and 'public') limited to 4 results"" </description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -1159,13 +1153,13 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>00000000-cf07a1a2-Sm9obiBBbmRlcnNvbg%3D%3D.vcf</value>
+ <value>$publicuserguid3:.vcf</value>
</arg>
</verify>
</request>
</test>
<test name="12" ignore="no">
- <description>query for resources with (FN contains 'John') AND (FN contains 'Anderson") AND (EMAIL contains 'apple') AND (EMAIL contains 'ank') limited to 4 results"" </description>
+ <description>query for resources with (FN contains 'Public' and '03") AND (EMAIL contains 'example' and 'user') limited to 4 results"" </description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -1182,7 +1176,7 @@
</request>
</test>
<test name="13" ignore="no">
- <description>query for resources where (FN contains 'John') OR (FN contains 'Anderson") OR (EMAIL contains 'apple') OR (EMAIL contains 'ank') limited to 4 results" </description>
+ <description>query for resources where (FN contains '02') OR (FN contains '03") OR (EMAIL contains '04') OR (EMAIL contains 'user')" </description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -1192,22 +1186,28 @@
</data>
<verify>
<callback>multistatusItems</callback>
- <arg>
- <name>badhrefs</name>
- <value/>
- </arg>
<arg>
<name>okhrefs</name>
- <value>00000000-cf07a1a2-Sm9zZSBBYmFyY2E%3D.vcf</value>
- <value>00000000-cf07a1a2-RWxvZGlhIEFuZ3VpYW5vIFBhbnRvamE%3D.vcf</value>
- <value>00000000-cf07a1a2-U2FyYWggQWJib3R0.vcf</value>
- <value>00000000-cf07a1a2-S0VMTFkgQUxGT1JE.vcf</value>
+ <value>$userguid2:.vcf</value>
+ <value>$publicuserguid2:.vcf</value>
+ <value>$userguid3:.vcf</value>
+ <value>$publicuserguid3:.vcf</value>
+ <value>$userguid4:.vcf</value>
+ <value>$publicuserguid4:.vcf</value>
+ <value>$userguid1:.vcf</value>
+ <value>$userguid4:.vcf</value>
+ <value>$userguid5:.vcf</value>
+ <value>$userguid6:.vcf</value>
+ <value>$userguid7:.vcf</value>
+ <value>$userguid8:.vcf</value>
+ <value>$userguid9:.vcf</value>
+ <value>$userguid10:.vcf</value>
</arg>
</verify>
</request>
</test>
<test name="14" ignore="no">
- <description>query for resources with (FN contains 'John' AND 'Anderson") OR (EMAIL contains 'ank' with TYPE parameter = "work") limited to 4 results" </description>
+ <description>query for resources with (FN contains 'Public' or '03") AND (EMAIL contains 'bogus' with TYPE parameter = "work") limited to 4 results" </description>
<request print-response="no">
<method>REPORT</method>
<ruri>$directory:</ruri>
@@ -1218,14 +1218,19 @@
<verify>
<callback>multistatusItems</callback>
<arg>
- <name>okhrefs</name>
- <value>00000000-cf07a1a2-Sm9obiBBbmtlcg%3D%3D.vcf</value>
+ <name>totalcount</name>
+ <value>0</value>
</arg>
</verify>
</request>
</test>
</test-suite>
- <test-suite name='search multiget reports' ignore='yes'>
+
+ <test-suite name='directory gateway multiget reports' ignore='no'>
+ <require-feature>
+ <feature>directory-gateway</feature>
+ </require-feature>
+
<test name='1' ignore='no'>
<description>basic multiget of 8 resources in search node returning etag and entire vcf data</description>
<request print-response="no">
@@ -1239,14 +1244,14 @@
<callback>multistatusItems</callback>
<arg>
<name>okhrefs</name>
- <value>00000000-cf07a1a2-Sm9zaCBCZWhua2U%3D.vcf</value>
- <value>00000000-cf07a1a2-Sm9zaHVhIEJhbmtv.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZSBBbHZhcmV6.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZXBoIEFuZGVyc29u.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZWxpbiBCdXN0YW1hbnRl.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZWYgQmlzbWFub3Zza3k%3D.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZSBBYmFyY2E%3D.vcf</value>
- <value>00000000-cf07a1a2-Sm9zZSBCYXNhcm90.vcf</value>
+ <value>$userguid1:.vcf</value>
+ <value>$userguid2:.vcf</value>
+ <value>$userguid3:.vcf</value>
+ <value>$userguid4:.vcf</value>
+ <value>$publicuserguid1:.vcf</value>
+ <value>$publicuserguid2:.vcf</value>
+ <value>$publicuserguid3:.vcf</value>
+ <value>$publicuserguid4:.vcf</value>
</arg>
</verify>
</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100519/8918c860/attachment-0001.html>
More information about the calendarserver-changes
mailing list