[CalendarServer-changes] [5791] CalDAVTester/trunk/scripts/tests/CardDAV

[source_changes at macosforge.org]

Revision: 5791
          http://trac.macosforge.org/projects/calendarserver/changeset/5791
Author:   cdaboo at apple.com
Date:     2010-06-21 09:43:20 -0700 (Mon, 21 Jun 2010)
Log Message:
-----------
Tweaks for addressbookstore support.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/get.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/put.xml

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml	2010-06-21 16:42:13 UTC (rev 5790)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml	2010-06-21 16:43:20 UTC (rev 5791)
@@ -108,7 +108,7 @@
 				<method>GET</method>
 				<ruri>$posted:/</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/1.vcf</value>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml	2010-06-21 16:42:13 UTC (rev 5790)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml	2010-06-21 16:43:20 UTC (rev 5791)
@@ -34,6 +34,7 @@
 				<filepath>Resource/CardDAV/verrors/6.vcf</filepath>
 			</data>
 		</request>
+		<!--
 		<request end-delete="yes">
 			<method>PUT</method>
 			<ruri>$addressbookhome1:/1.xml</ruri>
@@ -106,6 +107,7 @@
 				<filepath>Resource/CardDAV/verrors/9.vcf</filepath>
 			</data>
 		</request>
+		-->
 	</start>
 	
 	<test-suite name='PUT' ignore='no'>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/get.xml	2010-06-21 16:42:13 UTC (rev 5790)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/get.xml	2010-06-21 16:43:20 UTC (rev 5791)
@@ -48,7 +48,7 @@
 					<callback>statusCode</callback>
 				</verify>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/1.vcf</value>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/put.xml	2010-06-21 16:42:13 UTC (rev 5790)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/put.xml	2010-06-21 16:43:20 UTC (rev 5791)
@@ -52,7 +52,7 @@
 				<method>GET</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/1.vcf</value>
@@ -84,7 +84,7 @@
 				<method>GET</method>
 				<ruri>$addressbookpath1:/2.vcf</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/2.vcf</value>
@@ -116,7 +116,7 @@
 				<method>GET</method>
 				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/3.vcf</value>
@@ -148,7 +148,7 @@
 				<method>GET</method>
 				<ruri>$addressbookpath1:/4.vcf</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/4.vcf</value>
@@ -180,7 +180,7 @@
 				<method>GET</method>
 				<ruri>$addressbookpath1:/5.vcf</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/5.vcf</value>
@@ -212,7 +212,7 @@
 				<method>GET</method>
 				<ruri>$addressbookpath1:/6.vcf</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/6.vcf</value>
@@ -244,7 +244,7 @@
 				<method>GET</method>
 				<ruri>$addressbookpath1:/7.vcf</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/7.vcf</value>
@@ -276,7 +276,7 @@
 				<method>GET</method>
 				<ruri>$addressbookpath1:/8.vcf</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/8.vcf</value>
@@ -308,7 +308,7 @@
 				<method>GET</method>
 				<ruri>$addressbookpath1:/9.vcf</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/9.vcf</value>
@@ -340,7 +340,7 @@
 				<method>GET</method>
 				<ruri>$addressbookpath1:/10.vcf</ruri>
 				<verify>
-					<callback>dataMatch</callback>
+					<callback>calendarDataMatch</callback>
 					<arg>
 						<name>filepath</name>
 						<value>Resource/CardDAV/vcardput/10.vcf</value>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100621/47d6aac6/attachment.html>