[CalendarServer-changes] [5290] CalDAVTester/branches/users/cdaboo/sharing-5228
source_changes at macosforge.org
source_changes at macosforge.org
Fri Mar 12 11:26:20 PST 2010
Revision: 5290
http://trac.macosforge.org/projects/calendarserver/changeset/5290
Author: cdaboo at apple.com
Date: 2010-03-12 11:26:20 -0800 (Fri, 12 Mar 2010)
Log Message:
-----------
Checks for sharing reply notifications.
Modified Paths:
--------------
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/3.xml
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/1.xml
CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-replies.xml
CalDAVTester/branches/users/cdaboo/sharing-5228/verifiers/xmlDataMatch.py
Added Paths:
-----------
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/6.xml
CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/4.xml
Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/3.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/3.xml 2010-03-12 16:23:52 UTC (rev 5289)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/3.xml 2010-03-12 19:26:20 UTC (rev 5290)
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
<href xmlns='DAV:'>/principals/__uids__/user02/</href>
- <in-reply-to>$inviteuid:</in-reply-to>
<invite-accepted/>
<hosturl>
<href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
</hosturl>
+ <in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
</invite-reply>
Added: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/6.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/6.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/accept/6.xml 2010-03-12 19:26:20 UTC (rev 5290)
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <uid>$inviteuid:-reply</uid>
+ <invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <invite-accepted/>
+ <hosturl>
+ <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ </hosturl>
+ <in-reply-to>$inviteuid:</in-reply-to>
+ <summary>The Shared Calendar</summary>
+ </invite-reply>
+</notification>
Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/1.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/1.xml 2010-03-12 16:23:52 UTC (rev 5289)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/1.xml 2010-03-12 19:26:20 UTC (rev 5290)
@@ -1,10 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<invite-reply xmlns='http://calendarserver.org/ns/'>
<href xmlns='DAV:'>/principals/__uids__/user02/</href>
- <in-reply-to>$inviteuid:</in-reply-to>
<invite-declined/>
<hosturl>
<href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
</hosturl>
+ <in-reply-to>$inviteuid:</in-reply-to>
<summary>The Shared Calendar</summary>
</invite-reply>
Added: CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/4.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/4.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/Resource/CalDAV/sharing/replies/decline/4.xml 2010-03-12 19:26:20 UTC (rev 5290)
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?><notification xmlns='http://calendarserver.org/ns/'>
+ <dtstamp></dtstamp>
+ <uid>$inviteuid:-reply</uid>
+ <invite-reply xmlns='http://calendarserver.org/ns/'>
+ <href xmlns='DAV:'>/principals/__uids__/user02/</href>
+ <invite-declined/>
+ <hosturl>
+ <href xmlns='DAV:'>/calendars/__uids__/user01/shared</href>
+ </hosturl>
+ <in-reply-to>$inviteuid:</in-reply-to>
+ </invite-reply>
+</notification>
Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-replies.xml 2010-03-12 16:23:52 UTC (rev 5289)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/scripts/tests/CalDAV/sharing-replies.xml 2010-03-12 19:26:20 UTC (rev 5290)
@@ -130,6 +130,28 @@
</verify>
</request>
</test>
+ <test name='5'>
+ <description>Check Sharer notification collection</description>
+ <request>
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$notificationpath1:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/replies/accept/6.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</test-suite>
<test-suite name='Update reply'>
@@ -173,6 +195,28 @@
</verify>
</request>
</test>
+ <test name='3'>
+ <description>Check Sharer notification collection</description>
+ <request>
+ <method>WAITCOUNT 1</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request print-response='no'>
+ <method>GETNEW</method>
+ <ruri>$notificationpath1:/</ruri>
+ <verify>
+ <callback>xmlDataMatch</callback>
+ <arg>
+ <name>filepath</name>
+ <value>Resource/CalDAV/sharing/replies/decline/4.xml</value>
+ </arg>
+ <arg>
+ <name>filter</name>
+ <value>{http://calendarserver.org/ns/}dtstamp</value>
+ </arg>
+ </verify>
+ </request>
+ </test>
</test-suite>
<end/>
Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/verifiers/xmlDataMatch.py
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/verifiers/xmlDataMatch.py 2010-03-12 16:23:52 UTC (rev 5289)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/verifiers/xmlDataMatch.py 2010-03-12 19:26:20 UTC (rev 5290)
@@ -55,6 +55,7 @@
return False, " Could not read data file"
data = manager.server_info.subs(data)
+ data = manager.server_info.extrasubs(data)
def normalizeXMLData(data):
# Read in XML
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100312/8cc6b272/attachment-0001.html>
More information about the calendarserver-changes
mailing list