[CalendarServer-changes] [14358] CalDAVTester/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Feb 2 08:56:15 PST 2015
Revision: 14358
http://trac.calendarserver.org//changeset/14358
Author: cdaboo at apple.com
Date: 2015-02-02 08:56:15 -0800 (Mon, 02 Feb 2015)
Log Message:
-----------
Add more VPOLL tests.
Modified Paths:
--------------
CalDAVTester/trunk/scripts/tests/CalDAV/polls.xml
Added Paths:
-----------
CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/
CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/1.ics
CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/2.ics
CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/3.ics
CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/4.ics
CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/5.ics
CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/6.ics
Added: CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/1.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/1.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/1.ics 2015-02-02 16:56:15 UTC (rev 14358)
@@ -0,0 +1,45 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VPOLL
+UID:$uid1:
+DTSTAMP:20051222T205953Z
+ORGANIZER:$cuaddr1:
+POLL-MODE:BASIC
+POLL-PROPERTIES:DTSTART,DTEND
+SUMMARY:poll 1
+BEGIN:VVOTER
+VOTER:$cuaddr1:
+BEGIN:VOTE
+POLL-ITEM-ID:1
+RESPONSE:100
+END:VOTE
+BEGIN:VOTE
+POLL-ITEM-ID:2
+RESPONSE:80
+END:VOTE
+END:VVOTER
+BEGIN:VVOTER
+VOTER;RSVP=TRUE:$cuaddr2:
+END:VVOTER
+BEGIN:VVOTER
+VOTER;RSVP=TRUE:$cuaddr3:
+END:VVOTER
+BEGIN:VEVENT
+UID:$uid2:
+DTSTART;VALUE=DATE:20130101
+DTEND;VALUE=DATE:20130102
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:1
+SUMMARY:Party option #1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid3:
+DTSTART;VALUE=DATE:20130201
+DTEND;VALUE=DATE:20130202
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:2
+SUMMARY:Party option #2
+END:VEVENT
+END:VPOLL
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/2.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/2.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/2.ics 2015-02-02 16:56:15 UTC (rev 14358)
@@ -0,0 +1,45 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VPOLL
+UID:$uid1:
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+POLL-MODE:BASIC
+POLL-PROPERTIES:DTSTART,DTEND
+SUMMARY:poll 1
+BEGIN:VVOTER
+VOTER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+BEGIN:VOTE
+POLL-ITEM-ID:1
+RESPONSE:100
+END:VOTE
+BEGIN:VOTE
+POLL-ITEM-ID:2
+RESPONSE:80
+END:VOTE
+END:VVOTER
+BEGIN:VVOTER
+VOTER;CN=$username2:;EMAIL=$email2:;RSVP=TRUE;SCHEDULE-STATUS=1.2:$cuaddrurn2:
+END:VVOTER
+BEGIN:VVOTER
+VOTER;CN=$username3:;EMAIL=$email3:;RSVP=TRUE;SCHEDULE-STATUS=1.2:$cuaddrurn3:
+END:VVOTER
+BEGIN:VEVENT
+UID:$uid2:
+DTSTART;VALUE=DATE:20130101
+DTEND;VALUE=DATE:20130102
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:1
+SUMMARY:Party option #1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid3:
+DTSTART;VALUE=DATE:20130201
+DTEND;VALUE=DATE:20130202
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:2
+SUMMARY:Party option #2
+END:VEVENT
+END:VPOLL
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/3.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/3.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/3.ics 2015-02-02 16:56:15 UTC (rev 14358)
@@ -0,0 +1,45 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VPOLL
+UID:$uid1:
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+POLL-MODE:BASIC
+POLL-PROPERTIES:DTSTART,DTEND
+SUMMARY:poll 1
+BEGIN:VVOTER
+VOTER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+BEGIN:VOTE
+POLL-ITEM-ID:1
+RESPONSE:100
+END:VOTE
+BEGIN:VOTE
+POLL-ITEM-ID:2
+RESPONSE:80
+END:VOTE
+END:VVOTER
+BEGIN:VVOTER
+VOTER;CN=$username2:;EMAIL=$email2:;RSVP=TRUE:$cuaddrurn2:
+END:VVOTER
+BEGIN:VVOTER
+VOTER;CN=$username3:;EMAIL=$email3:;RSVP=TRUE:$cuaddrurn3:
+END:VVOTER
+BEGIN:VEVENT
+UID:$uid2:
+DTSTART;VALUE=DATE:20130101
+DTEND;VALUE=DATE:20130102
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:1
+SUMMARY:Party option #1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid3:
+DTSTART;VALUE=DATE:20130201
+DTEND;VALUE=DATE:20130202
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:2
+SUMMARY:Party option #2
+END:VEVENT
+END:VPOLL
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/4.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/4.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/4.ics 2015-02-02 16:56:15 UTC (rev 14358)
@@ -0,0 +1,53 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VPOLL
+UID:$uid1:
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+POLL-MODE:BASIC
+POLL-PROPERTIES:DTSTART,DTEND
+SUMMARY:poll 1
+BEGIN:VVOTER
+VOTER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+BEGIN:VOTE
+POLL-ITEM-ID:1
+RESPONSE:100
+END:VOTE
+BEGIN:VOTE
+POLL-ITEM-ID:2
+RESPONSE:80
+END:VOTE
+END:VVOTER
+BEGIN:VVOTER
+VOTER;CN=$username2:;EMAIL=$email2:;RSVP=TRUE:$cuaddrurn2:
+BEGIN:VOTE
+POLL-ITEM-ID:1
+RESPONSE:50
+END:VOTE
+BEGIN:VOTE
+POLL-ITEM-ID:2
+RESPONSE:0
+END:VOTE
+END:VVOTER
+BEGIN:VVOTER
+VOTER;CN=$username3:;EMAIL=$email3:;RSVP=TRUE:$cuaddrurn3:
+END:VVOTER
+BEGIN:VEVENT
+UID:$uid2:
+DTSTART;VALUE=DATE:20130101
+DTEND;VALUE=DATE:20130102
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:1
+SUMMARY:Party option #1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid3:
+DTSTART;VALUE=DATE:20130201
+DTEND;VALUE=DATE:20130202
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:2
+SUMMARY:Party option #2
+END:VEVENT
+END:VPOLL
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/5.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/5.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/5.ics 2015-02-02 16:56:15 UTC (rev 14358)
@@ -0,0 +1,55 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VPOLL
+UID:$uid1:
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1:;SCHEDULE-STATUS=1.2:$cuaddrurn1:
+POLL-MODE:BASIC
+POLL-PROPERTIES:DTSTART,DTEND
+SUMMARY:poll 1
+BEGIN:VVOTER
+VOTER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+BEGIN:VOTE
+POLL-ITEM-ID:1
+RESPONSE:100
+END:VOTE
+BEGIN:VOTE
+POLL-ITEM-ID:2
+RESPONSE:80
+END:VOTE
+END:VVOTER
+BEGIN:VVOTER
+VOTER;CN=$username2:;EMAIL=$email2:;RSVP=TRUE:$cuaddrurn2:
+BEGIN:VOTE
+POLL-ITEM-ID:1
+RESPONSE:50
+LAST-MODIFIED:20020101T000000Z
+END:VOTE
+BEGIN:VOTE
+POLL-ITEM-ID:2
+RESPONSE:0
+LAST-MODIFIED:20020101T000000Z
+END:VOTE
+END:VVOTER
+BEGIN:VVOTER
+VOTER;CN=$username3:;EMAIL=$email3:;RSVP=TRUE:$cuaddrurn3:
+END:VVOTER
+BEGIN:VEVENT
+UID:$uid2:
+DTSTART;VALUE=DATE:20130101
+DTEND;VALUE=DATE:20130102
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:1
+SUMMARY:Party option #1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid3:
+DTSTART;VALUE=DATE:20130201
+DTEND;VALUE=DATE:20130202
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:2
+SUMMARY:Party option #2
+END:VEVENT
+END:VPOLL
+END:VCALENDAR
Added: CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/6.ics
===================================================================
--- CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/6.ics (rev 0)
+++ CalDAVTester/trunk/Resource/CalDAV/polls/twovoters/6.ics 2015-02-02 16:56:15 UTC (rev 14358)
@@ -0,0 +1,55 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//PYVOBJECT//NONSGML Version 1//EN
+BEGIN:VPOLL
+UID:$uid1:
+DTSTAMP:20051222T205953Z
+ORGANIZER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+POLL-MODE:BASIC
+POLL-PROPERTIES:DTSTART,DTEND
+SUMMARY:poll 1
+BEGIN:VVOTER
+VOTER;CN=$username1:;EMAIL=$email1::$cuaddrurn1:
+BEGIN:VOTE
+POLL-ITEM-ID:1
+RESPONSE:100
+END:VOTE
+BEGIN:VOTE
+POLL-ITEM-ID:2
+RESPONSE:80
+END:VOTE
+END:VVOTER
+BEGIN:VVOTER
+VOTER;CN=$username2:;EMAIL=$email2:;SCHEDULE-STATUS=2.0:$cuaddrurn2:
+BEGIN:VOTE
+POLL-ITEM-ID:1
+RESPONSE:50
+LAST-MODIFIED:20020101T000000Z
+END:VOTE
+BEGIN:VOTE
+POLL-ITEM-ID:2
+RESPONSE:0
+LAST-MODIFIED:20020101T000000Z
+END:VOTE
+END:VVOTER
+BEGIN:VVOTER
+VOTER;CN=$username3:;EMAIL=$email3:;RSVP=TRUE;SCHEDULE-STATUS=1.2:$cuaddrurn3:
+END:VVOTER
+BEGIN:VEVENT
+UID:$uid2:
+DTSTART;VALUE=DATE:20130101
+DTEND;VALUE=DATE:20130102
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:1
+SUMMARY:Party option #1
+END:VEVENT
+BEGIN:VEVENT
+UID:$uid3:
+DTSTART;VALUE=DATE:20130201
+DTEND;VALUE=DATE:20130202
+DTSTAMP:20020101T000000Z
+POLL-ITEM-ID:2
+SUMMARY:Party option #2
+END:VEVENT
+END:VPOLL
+END:VCALENDAR
Modified: CalDAVTester/trunk/scripts/tests/CalDAV/polls.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/polls.xml 2015-02-02 15:46:19 UTC (rev 14357)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/polls.xml 2015-02-02 16:56:15 UTC (rev 14358)
@@ -296,6 +296,151 @@
</test>
</test-suite>
+
+ <test-suite name='PUT VPOLL - Two voter scheduling'>
+ <test name='1'>
+ <description>Organizer invites two Attendees</description>
+ <request>
+ <method>PUT</method>
+ <ruri>$pollspath1:/1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/polls/twovoters/1.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='2'>
+ <description>Organizer checks data</description>
+ <request>
+ <method>GET</method>
+ <ruri>$pollspath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/polls/twovoters/2.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='3'>
+ <description>Attendee Inbox Items</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ </test>
+ <test name='4'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$pollspath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/polls/twovoters/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='5'>
+ <description>Attendee has data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GETNEW</method>
+ <ruri>$pollspath2:/</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/polls/twovoters/3.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='6'>
+ <description>Attendee responds</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>PUT</method>
+ <ruri>$</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/CalDAV/polls/twovoters/4.ics</filepath>
+ </data>
+ <verify>
+ <callback>statusCode</callback>
+ </verify>
+ </request>
+ </test>
+ <test name='7'>
+ <description>Attendee checks data</description>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>GET</method>
+ <ruri>$</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/polls/twovoters/5.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='8'>
+ <description>Organizer Inbox Item</description>
+ <pause/>
+ <request>
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ </test>
+ <test name='9'>
+ <description>Organizer data changed</description>
+ <request>
+ <method>GET</method>
+ <ruri>$pollspath1:/1.ics</ruri>
+ <verify>
+ <callback>calendarDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/polls/twovoters/6.ics</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
+ <test name='-1'>
+ <description>Clean-up</description>
+ <request user="$userid1:" pswd="$pswd1:">
+ <method>DELETEALL</method>
+ <ruri>$pollspath1:/</ruri>
+ <ruri>$inboxpath1:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath2:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>WAITDELETEALL 1</method>
+ <ruri>$inboxpath3:/</ruri>
+ </request>
+ <request user="$userid2:" pswd="$pswd2:">
+ <method>DELETEALL</method>
+ <ruri>$pollspath2:/</ruri>
+ </request>
+ <request user="$userid3:" pswd="$pswd3:">
+ <method>DELETEALL</method>
+ <ruri>$pollspath3:/</ruri>
+ </request>
+ </test>
+ </test-suite>
+
<end/>
</caldavtest>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150202/72def2a3/attachment-0001.html>
More information about the calendarserver-changes
mailing list