[CalendarServer-changes] [93] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Sep 1 09:14:10 PDT 2006
Revision: 93
Author: cdaboo at apple.com
Date: 2006-09-01 09:14:08 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Turn off response printing and instead use proper data checks to verify the response.
Modified Paths:
--------------
CalDAVTester/trunk/schedule.xml
CalDAVTester/trunk/scheduleacl.xml
CalDAVTester/trunk/schedulepost.xml
CalDAVTester/trunk/schedulepostacl.xml
Modified: CalDAVTester/trunk/schedule.xml
===================================================================
--- CalDAVTester/trunk/schedule.xml 2006-09-01 16:13:33 UTC (rev 92)
+++ CalDAVTester/trunk/schedule.xml 2006-09-01 16:14:08 UTC (rev 93)
@@ -661,7 +661,7 @@
<test-suite name="SCHEDULEs free busy" ignore='no'>
<test name='1'>
<description>SCHEDULE free busy</description>
- <request print-response='yes'>
+ <request print-response='no'>
<method>SCHEDULE</method>
<header>
<name>Originator</name>
@@ -679,11 +679,20 @@
<verify>
<callback>statusCode</callback>
</verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T170000Z/PT1H,20060101T190000Z/PT1H,20060101T2
+ 20000Z/PT1H</value>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T190000Z/PT2H,20060101T220000Z/PT1H</value>
+ </arg>
+ </verify>
</request>
</test>
<test name='2'>
<description>SCHEDULE free busy - recipients with failure</description>
- <request print-response='yes'>
+ <request print-response='no'>
<method>SCHEDULE</method>
<header>
<name>Originator</name>
@@ -701,6 +710,14 @@
<verify>
<callback>statusCode</callback>
</verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value><![CDATA[<recipient-exists xmlns='urn:ietf:params:xml:ns:caldav'/>]]></value>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T190000Z/PT2H,20060101T220000Z/PT1H</value>
+ </arg>
+ </verify>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/scheduleacl.xml
===================================================================
--- CalDAVTester/trunk/scheduleacl.xml 2006-09-01 16:13:33 UTC (rev 92)
+++ CalDAVTester/trunk/scheduleacl.xml 2006-09-01 16:14:08 UTC (rev 93)
@@ -240,7 +240,7 @@
<test-suite name='Schedule free-busy' ignore='no'>
<test name='1'>
<description>SCHEDULE free busy</description>
- <request user='user02' pswd='user02' print-response='yes'>
+ <request user='user02' pswd='user02' print-response='no'>
<method>SCHEDULE</method>
<header>
<name>Originator</name>
@@ -258,15 +258,14 @@
<verify>
<callback>statusCode</callback>
</verify>
- <!-- This does not work because UID is different each time
<verify>
- <callback>dataMatch</callback>
+ <callback>dataString</callback>
<arg>
- <name>filepath</name>
- <value>Resource/scheduleacl/data1.txt</value>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T060000Z/PT1H,20060101T100000Z/PT1H,20060101T1
+ 80000Z/PT1H,20060101T220000Z/PT1H</value>
</arg>
</verify>
- -->
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/schedulepost.xml 2006-09-01 16:13:33 UTC (rev 92)
+++ CalDAVTester/trunk/schedulepost.xml 2006-09-01 16:14:08 UTC (rev 93)
@@ -661,7 +661,7 @@
<test-suite name="POSTs free busy" ignore='no'>
<test name='1'>
<description>POST free busy</description>
- <request print-response='yes'>
+ <request print-response='no'>
<method>POST</method>
<header>
<name>Originator</name>
@@ -679,11 +679,20 @@
<verify>
<callback>statusCode</callback>
</verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T170000Z/PT1H,20060101T190000Z/PT1H,20060101T2
+ 20000Z/PT1H</value>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T190000Z/PT2H,20060101T220000Z/PT1H</value>
+ </arg>
+ </verify>
</request>
</test>
<test name='2'>
<description>POST free busy - recipients with failure</description>
- <request print-response='yes'>
+ <request print-response='no'>
<method>POST</method>
<header>
<name>Originator</name>
@@ -701,6 +710,14 @@
<verify>
<callback>statusCode</callback>
</verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value><![CDATA[<recipient-exists xmlns='urn:ietf:params:xml:ns:caldav'/>]]></value>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T190000Z/PT2H,20060101T220000Z/PT1H</value>
+ </arg>
+ </verify>
</request>
</test>
</test-suite>
Modified: CalDAVTester/trunk/schedulepostacl.xml
===================================================================
--- CalDAVTester/trunk/schedulepostacl.xml 2006-09-01 16:13:33 UTC (rev 92)
+++ CalDAVTester/trunk/schedulepostacl.xml 2006-09-01 16:14:08 UTC (rev 93)
@@ -231,7 +231,7 @@
<test-suite name='Schedule free-busy' ignore='no'>
<test name='1'>
<description>POST free busy</description>
- <request user='user02' pswd='user02' print-response='yes'>
+ <request user='user02' pswd='user02' print-response='no'>
<method>POST</method>
<header>
<name>Originator</name>
@@ -249,6 +249,14 @@
<verify>
<callback>statusCode</callback>
</verify>
+ <verify>
+ <callback>dataString</callback>
+ <arg>
+ <name>contains</name>
+ <value>FREEBUSY;FBTYPE=BUSY:20060101T060000Z/PT1H,20060101T100000Z/PT1H,20060101T1
+ 80000Z/PT1H,20060101T220000Z/PT1H</value>
+ </arg>
+ </verify>
</request>
</test>
</test-suite>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060901/e750446c/attachment.html
More information about the calendarserver-changes
mailing list