2 commits - pykolab/xml tests/functional tests/unit
Thomas Brüderli
bruederli at kolabsys.com
Thu Aug 7 10:41:42 CEST 2014
pykolab/xml/event.py | 4 +++-
tests/functional/test_wallace/test_007_invitationpolicy.py | 8 ++++----
tests/unit/test-003-event.py | 8 ++++++--
3 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 644a18cba9af53c90d770dfa29ce4601e278c667
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Wed Aug 6 17:38:12 2014 -0400
Finalize test for handling delegated iTip REPLY messages
diff --git a/tests/functional/test_wallace/test_007_invitationpolicy.py b/tests/functional/test_wallace/test_007_invitationpolicy.py
index 568a0e8..bdbfc98 100644
--- a/tests/functional/test_wallace/test_007_invitationpolicy.py
+++ b/tests/functional/test_wallace/test_007_invitationpolicy.py
@@ -625,14 +625,14 @@ class TestWallaceInvitationpolicy(unittest.TestCase):
attendee = event.get_attendee(self.jane['mail'])
self.assertIsInstance(attendee, pykolab.xml.Attendee)
self.assertEqual(attendee.get_participant_status(), kolabformat.PartDelegated)
- # FIXME: self.assertEqual(len(attendee.get_delegated_to()), 1)
- # FIXME: self.assertEqual(attendee.get_delegated_to(True)[0], 'jack at ripper.com')
+ self.assertEqual(len(attendee.get_delegated_to()), 1)
+ self.assertEqual(attendee.get_delegated_to(True)[0], 'jack at ripper.com')
delegatee = event.get_attendee('jack at ripper.com')
self.assertIsInstance(delegatee, pykolab.xml.Attendee)
self.assertEqual(delegatee.get_participant_status(), kolabformat.PartNeedsAction)
- # FIXME: self.assertEqual(len(delegatee.get_delegated_from()), 1)
- # FIXME: self.assertEqual(delegatee.get_delegated_from(True)[0], self.jane['mail'])
+ self.assertEqual(len(delegatee.get_delegated_from()), 1)
+ self.assertEqual(delegatee.get_delegated_from(True)[0], self.jane['mail'])
def test_007_invitation_cancel(self):
commit ebd0139376458fec75aa4dc0e7eeeb734dca5aef
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Wed Aug 6 17:31:48 2014 -0400
Fix laading attendees from XML; add tests for it
diff --git a/pykolab/xml/event.py b/pykolab/xml/event.py
index 6655b8c..c199a5a 100644
--- a/pykolab/xml/event.py
+++ b/pykolab/xml/event.py
@@ -117,7 +117,9 @@ class Event(object):
def _load_attendees(self):
for a in self.event.attendees():
- self._attendees.append(Attendee(a.contact().email(), a.contact().name(), a.rsvp(), a.role(), a.partStat(), a.cutype()))
+ att = Attendee(a.contact().email())
+ att.copy_from(a)
+ self._attendees.append(att)
def add_attendee(self, email, name=None, rsvp=False, role=None, participant_status=None, cutype="INDIVIDUAL", params=None):
attendee = Attendee(email, name, rsvp, role, participant_status, cutype, params)
diff --git a/tests/unit/test-003-event.py b/tests/unit/test-003-event.py
index fa5d0fe..d9e05fa 100644
--- a/tests/unit/test-003-event.py
+++ b/tests/unit/test-003-event.py
@@ -160,13 +160,15 @@ xml_event = """
<partstat><text>ACCEPTED</text></partstat>
<role><text>REQ-PARTICIPANT</text></role>
<rsvp><boolean>true</boolean></rsvp>
+ <delegated-from><cal-address>mailto:%3Csomebody%40else.com%3E</cal-address></delegated-from>
</parameters>
<cal-address>mailto:%3Cjane%40example.org%3E</cal-address>
</attendee>
<attendee>
<parameters>
- <partstat><text>TENTATIVE</text></partstat>
- <role><text>OPT-PARTICIPANT</text></role>
+ <partstat><text>DELEGATED</text></partstat>
+ <role><text>NON-PARTICIPANT</text></role>
+ <delegated-to><cal-address>mailto:%3Cjane%40example.org%3E</cal-address></delegated-to>
</parameters>
<cal-address>mailto:%3Csomebody%40else.com%3E</cal-address>
</attendee>
@@ -527,6 +529,8 @@ END:VEVENT
event = event_from_string(xml_event)
self.assertEqual(event.uid, '75c740bb-b3c6-442c-8021-ecbaeb0a025e')
self.assertEqual(event.get_attendee_by_email("jane at example.org").get_participant_status(), kolabformat.PartAccepted)
+ self.assertEqual(len(event.get_attendee_by_email("jane at example.org").get_delegated_from()), 1)
+ self.assertEqual(len(event.get_attendee_by_email("somebody at else.com").get_delegated_to()), 1)
self.assertEqual(event.get_sequence(), 1)
self.assertIsInstance(event.get_start(), datetime.datetime)
self.assertEqual(str(event.get_start()), "2014-08-13 10:00:00+00:00")
More information about the commits
mailing list