[CalendarServer-changes] [12047] CalendarServer/branches/users/sagen/groupcacher/twext/who/test/ test_groups.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:17:02 PDT 2014 

Revision: 12047
          http://trac.calendarserver.org//changeset/12047
Author:   gaya at apple.com
Date:     2013-12-09 15:45:37 -0800 (Mon, 09 Dec 2013)
Log Message:
-----------
test rename and factoring

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py

Modified: CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py
===================================================================
--- CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py	2013-12-09 23:35:19 UTC (rev 12046)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py	2013-12-09 23:45:37 UTC (rev 12047)
@@ -248,7 +248,7 @@
 
 class GroupAttendeeReconciliation(CommonCommonTests, unittest.TestCase):
     """
-    CalendarObject splitting tests
+    GroupAttendeeReconciliation tests
     """
 
     @inlineCallbacks
@@ -291,13 +291,13 @@
     }
 
     @inlineCallbacks
-    def test_groupAttendeeReconciliation(self):
+    def test_simplePUT(self):
         """
-        Test that (manual) splitting of calendar objects works.
+        Test that group attendee is expanded on PUT
         """
         calendar = yield self.calendarUnderTest(name="calendar", home="user01")
 
-        data_put_1 = """BEGIN:VCALENDAR
+        data_put_2 = """BEGIN:VCALENDAR
 CALSCALE:GREGORIAN
 PRODID:-//Example Inc.//Example Calendar//EN
 VERSION:2.0
@@ -306,34 +306,50 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20140101T100000
 DURATION:PT1H
-SUMMARY:event 1
-UID:event1 at ninevah.local
+SUMMARY:event 2
+UID:event2 at ninevah.local
 ORGANIZER:MAILTO:user01 at example.com
 ATTENDEE:mailto:user01 at example.com
-ATTENDEE:mailto:user02 at example.com
-ATTENDEE:MAILTO:group01 at example.com
+ATTENDEE:MAILTO:group02 at example.com
 END:VEVENT
 END:VCALENDAR"""
 
-        data_get_1 = """BEGIN:VCALENDAR
+        data_get_2 = """BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
-UID:event1 at ninevah.local
+UID:event2 at ninevah.local
 DTSTART;TZID=US/Eastern:20140101T100000
 DURATION:PT1H
 ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:uuid:user01
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:uuid:user02
-ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01 at example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:uuid:group01
+ATTENDEE;CN=Group 02;CUTYPE=GROUP;EMAIL=group02 at example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:uuid:group02
+ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:uuid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:uuid:user06
+ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:uuid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:uuid:user07
 CREATED:20060101T150000Z
 ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:uuid:user01
-SUMMARY:event 1
+SUMMARY:event 2
 END:VEVENT
 END:VCALENDAR
 """
 
-        data_put_2 = """BEGIN:VCALENDAR
+        vcalendar2 = Component.fromString(data_put_2)
+        cobj2 = yield calendar.createCalendarObjectWithName("data2.ics", vcalendar2)
+        yield self.commit()
+
+        cobj2 = yield self.calendarObjectUnderTest(name="data2.ics", calendar_name="calendar", home="user01")
+        vcalendar2 = yield cobj2.component()
+        self.assertEqual(normalize_iCalStr(vcalendar2), normalize_iCalStr(data_get_2))
+
+
+    @inlineCallbacks
+    def test_primaryAttendeeInGroupPUT(self):
+        """
+        Test that primary attendee also in group remains primary
+        """
+        calendar = yield self.calendarUnderTest(name="calendar", home="user01")
+
+        data_put_1 = """BEGIN:VCALENDAR
 CALSCALE:GREGORIAN
 PRODID:-//Example Inc.//Example Calendar//EN
 VERSION:2.0
@@ -342,46 +358,36 @@
 CREATED:20060101T150000Z
 DTSTART;TZID=US/Eastern:20140101T100000
 DURATION:PT1H
-SUMMARY:event 2
-UID:event2 at ninevah.local
+SUMMARY:event 1
+UID:event1 at ninevah.local
 ORGANIZER:MAILTO:user01 at example.com
 ATTENDEE:mailto:user01 at example.com
 ATTENDEE:mailto:user02 at example.com
-ATTENDEE:MAILTO:group02 at example.com
+ATTENDEE:MAILTO:group01 at example.com
 END:VEVENT
 END:VCALENDAR"""
 
-        data_get_2 = """BEGIN:VCALENDAR
+        data_get_1 = """BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
-UID:event2 at ninevah.local
+UID:event1 at ninevah.local
 DTSTART;TZID=US/Eastern:20140101T100000
 DURATION:PT1H
 ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:uuid:user01
 ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:uuid:user02
-ATTENDEE;CN=Group 02;CUTYPE=GROUP;EMAIL=group02 at example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:uuid:group02
-ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:uuid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:uuid:user06
-ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:uuid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:uuid:user07
+ATTENDEE;CN=Group 01;CUTYPE=GROUP;EMAIL=group01 at example.com;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:uuid:group01
 CREATED:20060101T150000Z
 ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:uuid:user01
-SUMMARY:event 2
+SUMMARY:event 1
 END:VEVENT
 END:VCALENDAR
 """
-
         vcalendar1 = Component.fromString(data_put_1)
         cobj1 = yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
-
-        vcalendar2 = Component.fromString(data_put_2)
-        cobj2 = yield calendar.createCalendarObjectWithName("data2.ics", vcalendar2)
         yield self.commit()
 
         cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
         vcalendar1 = yield cobj1.component()
         self.assertEqual(normalize_iCalStr(vcalendar1), normalize_iCalStr(data_get_1))
-
-        cobj2 = yield self.calendarObjectUnderTest(name="data2.ics", calendar_name="calendar", home="user01")
-        vcalendar2 = yield cobj2.component()
-        self.assertEqual(normalize_iCalStr(vcalendar2), normalize_iCalStr(data_get_2))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/65f381fa/attachment.html>

More information about the calendarserver-changes mailing list