diff --git a/pykolab/xml/todo.py b/pykolab/xml/todo.py index f73f239..ccd798f 100644 --- a/pykolab/xml/todo.py +++ b/pykolab/xml/todo.py @@ -1,264 +1,267 @@ import datetime import kolabformat import icalendar import pytz import base64 import pykolab from pykolab import constants from pykolab.xml import Event from pykolab.xml import RecurrenceRule from pykolab.xml import utils as xmlutils from pykolab.xml.event import InvalidEventDateError from pykolab.translate import _ log = pykolab.getLogger('pykolab.xml_todo') def todo_from_ical(ical, string=None): return Todo(from_ical=ical, from_string=string) def todo_from_string(string): return Todo(from_string=string) def todo_from_message(message): todo = None if message.is_multipart(): for part in message.walk(): if part.get_content_type() == "application/calendar+xml": payload = part.get_payload(decode=True) todo = todo_from_string(payload) # append attachment parts to Todo object elif todo and part.has_key('Content-ID'): todo._attachment_parts.append(part) return todo # FIXME: extend a generic pykolab.xml.Xcal class instead of Event class Todo(Event): type = 'task' + # This have to be a copy (see T1221) + properties_map = Event.properties_map.copy() + def __init__(self, from_ical="", from_string=""): self._attendees = [] self._categories = [] self._exceptions = [] self._attachment_parts = [] self.properties_map.update({ "due": "get_due", "percent-complete": "get_percentcomplete", "related-to": "get_related_to", "duration": "void", "end": "void" }) if isinstance(from_ical, str) and from_ical == "": if from_string == "": self.event = kolabformat.Todo() else: self.event = kolabformat.readTodo(from_string, False) self._load_attendees() else: self.from_ical(from_ical, from_string) self.set_created(self.get_created()) self.uid = self.get_uid() def from_ical(self, ical, raw): if isinstance(ical, icalendar.Todo): ical_todo = ical elif hasattr(icalendar.Todo, 'from_ical'): ical_todo = icalendar.Todo.from_ical(ical) elif hasattr(icalendar.Todo, 'from_string'): ical_todo = icalendar.Todo.from_string(ical) # VCALENDAR block was given, find the first VTODO item if isinstance(ical_todo, icalendar.Calendar): for c in ical_todo.walk(): if c.name == 'VTODO': ical_todo = c break log.debug("Todo.from_ical(); %r, %r, %r" % (type(ical_todo), ical_todo.has_key('ATTACH'), ical_todo.has_key('ATTENDEE')), level=8) # DISABLED: use the libkolab calendaring bindings to load the full iCal data # TODO: this requires support for iCal parsing in the kolab.calendaring bindings if False and ical_todo.has_key('ATTACH') or [part for part in ical_todo.walk() if part.name == 'VALARM']: if raw is None or raw == "": raw = ical if isinstance(ical, str) else ical.to_ical() self._xml_from_ical(raw) else: self.event = kolabformat.Todo() for attr in list(set(ical_todo.required)): if ical_todo.has_key(attr): self.set_from_ical(attr.lower(), ical_todo[attr]) for attr in list(set(ical_todo.singletons)): if ical_todo.has_key(attr): if isinstance(ical_todo[attr], list): ical_todo[attr] = ical_todo[attr][0]; self.set_from_ical(attr.lower(), ical_todo[attr]) for attr in list(set(ical_todo.multiple)): if ical_todo.has_key(attr): self.set_from_ical(attr.lower(), ical_todo[attr]) # although specified by RFC 2445/5545, icalendar doesn't have this property listed if ical_todo.has_key('PERCENT-COMPLETE'): self.set_from_ical('percentcomplete', ical_todo['PERCENT-COMPLETE']) def _xml_from_ical(self, ical): # FIXME: kolabformat or kolab.calendaring modules do not provide bindings to import Todo from iCal self.event = Todo() def set_ical_attach(self, attachment): if hasattr(attachment, 'params'): params = attachment.params else: params = {} _attachment = kolabformat.Attachment() if params.has_key('FMTTYPE'): mimetype = str(params['FMTTYPE']) else: mimetype = 'application/octet-stream' if params.has_key('X-LABEL'): _attachment.setLabel(str(params['X-LABEL'])) decode = False if params.has_key('ENCODING'): if params['ENCODING'] == "BASE64" or params['ENCODING'] == "B": decode = True _attachment.setData(base64.b64decode(str(attachment)) if decode else str(attachment), mimetype) vattach = self.event.attachments() vattach.append(_attachment) self.event.setAttachments(vattach) def set_ical_rrule(self, rrule): _rrule = RecurrenceRule() _rrule.from_ical(rrule) if _rrule.isValid(): self.event.setRecurrenceRule(_rrule) def set_ical_due(self, due): self.set_due(due) def set_due(self, _datetime): valid_datetime = False if isinstance(_datetime, datetime.date): valid_datetime = True if isinstance(_datetime, datetime.datetime): # If no timezone information is passed on, make it UTC if _datetime.tzinfo == None: _datetime = _datetime.replace(tzinfo=pytz.utc) valid_datetime = True if not valid_datetime: raise InvalidEventDateError, _("Todo due needs datetime.date or datetime.datetime instance") self.event.setDue(xmlutils.to_cdatetime(_datetime, True)) def set_ical_percent(self, percent): self.set_percentcomplete(percent) def set_percentcomplete(self, percent): self.event.setPercentComplete(int(percent)) def set_transparency(self, transp): # empty stub pass def get_due(self): return xmlutils.from_cdatetime(self.event.due(), True) def get_ical_due(self): dt = self.get_due() if dt: return icalendar.vDatetime(dt) return None def get_percentcomplete(self): return self.event.percentComplete() def get_duration(self): return None def get_related_to(self): for x in self.event.relatedTo(): return x return None def as_string_itip(self, method="REQUEST"): cal = icalendar.Calendar() cal.add( 'prodid', '-//pykolab-%s-%s//kolab.org//' % ( constants.__version__, constants.__release__ ) ) cal.add('version', '2.0') cal.add('calscale', 'GREGORIAN') cal.add('method', method) ical_todo = icalendar.Todo() singletons = list(set(ical_todo.singletons)) singletons.extend(['PERCENT-COMPLETE']) for attr in singletons: ical_getter = 'get_ical_%s' % (attr.lower()) default_getter = 'get_%s' % (attr.lower()) retval = None if hasattr(self, ical_getter): retval = getattr(self, ical_getter)() if not retval == None and not retval == "": ical_todo.add(attr.lower(), retval) elif hasattr(self, default_getter): retval = getattr(self, default_getter)() if not retval == None and not retval == "": ical_todo.add(attr.lower(), retval, encode=0) for attr in list(set(ical_todo.multiple)): ical_getter = 'get_ical_%s' % (attr.lower()) default_getter = 'get_%s' % (attr.lower()) retval = None if hasattr(self, ical_getter): retval = getattr(self, ical_getter)() elif hasattr(self, default_getter): retval = getattr(self, default_getter)() if isinstance(retval, list) and not len(retval) == 0: for _retval in retval: ical_todo.add(attr.lower(), _retval, encode=0) # copy custom properties to iCal for cs in self.event.customProperties(): ical_todo.add(cs.identifier, cs.value) cal.add_component(ical_todo) if hasattr(cal, 'to_ical'): return cal.to_ical() elif hasattr(cal, 'as_string'): return cal.as_string() def __str__(self): xml = kolabformat.writeTodo(self.event) error = kolabformat.error() if error == None or not error: return xml else: raise TodoIntegrityError, kolabformat.errorMessage() class TodoIntegrityError(Exception): def __init__(self, message): Exception.__init__(self, message) diff --git a/tests/unit/test-003-event.py b/tests/unit/test-003-event.py index a7ab82f..09ab17d 100644 --- a/tests/unit/test-003-event.py +++ b/tests/unit/test-003-event.py @@ -1,1016 +1,1016 @@ import re import datetime import pytz import sys import unittest import kolabformat import icalendar import pykolab from pykolab.xml import Attendee from pykolab.xml import Event from pykolab.xml import RecurrenceRule from pykolab.xml import EventIntegrityError from pykolab.xml import InvalidAttendeeParticipantStatusError from pykolab.xml import InvalidEventDateError from pykolab.xml import event_from_ical from pykolab.xml import event_from_string from pykolab.xml import event_from_message from pykolab.xml import compute_diff from pykolab.xml import property_to_string from collections import OrderedDict ical_event = """ BEGIN:VEVENT UID:7a35527d-f783-4b58-b404-b1389bd2fc57 DTSTAMP;VALUE=DATE-TIME:20140407T122311Z CREATED;VALUE=DATE-TIME:20140407T122245Z LAST-MODIFIED;VALUE=DATE-TIME:20140407T122311Z DTSTART;TZID=Europe/Zurich;VALUE=DATE-TIME:20140523T110000 DURATION:PT1H30M0S RRULE:FREQ=WEEKLY;INTERVAL=1;COUNT=10 EXDATE;TZID=Europe/Zurich;VALUE=DATE-TIME:20140530T110000 EXDATE;TZID=Europe/Zurich;VALUE=DATE-TIME:20140620T110000 SUMMARY:Summary LOCATION:Location DESCRIPTION:Description\\n2 lines CATEGORIES:Personal TRANSP:OPAQUE PRIORITY:2 SEQUENCE:2 CLASS:PUBLIC ATTENDEE;CN="Manager, Jane";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYP E=INDIVIDUAL;RSVP=TRUE:mailto:jane.manager@example.org ATTENDEE;CUTYPE=RESOURCE;PARTSTAT=NEEDS-ACTION;ROLE=OPT-PARTICIPANT;RSVP=FA LSE:MAILTO:max@imum.com ORGANIZER;CN=Doe\, John:mailto:john.doe@example.org URL:http://somelink.com/foo ATTACH;VALUE=BINARY;ENCODING=BASE64;FMTTYPE=image/png;X-LABEL=silhouette.pn g:iVBORw0KGgoAAAANSUhEUgAAAC4AAAAuCAIAAADY27xgAAAAGXRFWHRTb2Z0d2FyZQBBZG9i ZSBJbWFnZVJlYWR5ccllPAAAAsRJREFUeNrsmeluKjEMhTswrAWB4P3fECGx79CjsTDmOKRkpF xxpfoHSmchX7ybFrfb7eszpPH1MfKH8ofyH6KUtd/c7/en0wmfWBdF0Wq1Op1Ou91uNGoer6iX V1ar1Xa7xUJeB4qsr9frdyVlWWZH2VZyPp+xPXHIAoK70+m02+1m9JXj8bhcLi+Xi3J4xUCazS bUltdtd7ud7ldUIhC3u+iTwF0sFhlR4Kds4LtRZK1w4te5UM6V6JaqhqC3CQ28OAsKggJfbZ3U eozCqZ4koHIZCGmD9ivuos9YONFirmxrI0UNZG1kbZeUXdJQNJNa91RlqMn0ekYUMZDup6dXVV m+1OSZhqLx6bVCELJGSsyFQtFrF15JGYMZgoxubWGDSDVhvTipDKWhoBOIpFobxtlbJ0Gh0/tg lgXal4woUHi/36fQoBQncDAlupa8DeVwOPRe4lUyGAwQ+dl7W+xBXkJBhEUqR32UoJfYIKrR4d ZBgcdIRqfEqn+mekl9FNRbSTA249la3ev1/kXHD47ZbEYR5L9kMplkd9vNZqMFyIYxxfN8Pk8q QGlagT5QDtfrNYUMlWW9LiGNPPSmC/+OgpK2r4RO6dOatZd+4gAAemdIi6Fg9EKLD4vASWkzv3 ew06NSCiA40CumAIoaIrhrcAwjF7aDo58gUchgNV+0n1BAcDgcoAZrXV9mI4qkhtK6FJFhi9Fo ZKPsgQI1ACJieH/Kd570t+xFoIzHYzl5Q40CFGrSqGuks3qmYIKJfIl0nPKLxAMFw7Dv1+2QYf vFSOBQubbOFDSc7ZcfWvHv6DzhOzT6IeOVPuz8Roex0f6EgsE/2IL4qdg7hIXz7/pBie7q1uWr tp66xrif0l1KwUE4P7Y9Gci/ZgtNRFX+Rw06Q2RigsjuDc3urwKHxuNITaaxyD9mT2WvSDAXn/ Pvhh8BBgBjyfPSGbSYcwAAAABJRU5ErkJggg== ATTACH;VALUE=BINARY;ENCODING=BASE64;FMTTYPE=text/plain;X-LABEL=text.txt:VGh pcyBpcyBhIHRleHQgZmlsZQo= BEGIN:VALARM ACTION:DISPLAY TRIGGER:-PT30M END:VALARM END:VEVENT """ ical_exception = """ BEGIN:VEVENT UID:7a35527d-f783-4b58-b404-b1389bd2fc57 DTSTAMP;VALUE=DATE-TIME:20140407T122311Z CREATED;VALUE=DATE-TIME:20140407T122245Z LAST-MODIFIED;VALUE=DATE-TIME:20140407T122311Z RECURRENCE-ID;TZID=Europe/Zurich;RANGE=THISANDFUTURE:20140606T110000 DTSTART;TZID=Europe/Zurich;VALUE=DATE-TIME:20140607T120000 DTEND;TZID=Europe/Zurich;VALUE=DATE-TIME:20140607T143000 SUMMARY:Exception CATEGORIES:Personal TRANSP:TRANSPARENT PRIORITY:2 SEQUENCE:3 STATUS:CANCELLED ORGANIZER;CN=Doe\, John:mailto:john.doe@example.org END:VEVENT """ ical_event_rdate = """ BEGIN:VEVENT UID:7a35527d-f783-4b58-b404-b1389bd2fc57 DTSTAMP;VALUE=DATE-TIME:20140407T122311Z CREATED;VALUE=DATE-TIME:20140407T122245Z LAST-MODIFIED;VALUE=DATE-TIME:20140407T122311Z DTSTART;TZID=Europe/Zurich;VALUE=DATE-TIME:20140523T110000 DURATION:PT1H30M0S RDATE;TZID=Europe/Zurich;VALUE=DATE-TIME:20140530T110000 RDATE;TZID=Europe/Zurich;VALUE=DATE-TIME:20140620T110000 SUMMARY:Summary LOCATION:Location DESCRIPTION:Description SEQUENCE:2 CLASS:PUBLIC ORGANIZER;CN=Doe\, John:mailto:john.doe@example.org END:VEVENT """ xml_event = """ Libkolabxml-1.1 2.0 3.1.0 75c740bb-b3c6-442c-8021-ecbaeb0a025e 2013-07-07T01:28:23Z 2013-07-07T01:28:23Z 1 PUBLIC /kolab.org/Europe/London 2013-08-13T10:00:00 /kolab.org/Europe/London 2013-08-13T14:00:00 DAILY 2015-07-25 /kolab.org/Europe/Berlin 2014-07-19 2014-07-26 2014-07-12 2014-07-13 2014-07-20 2014-07-27 2014-07-05 2014-07-06 test test 5 CANCELLED Room 101 Doe, John mailto:%3Cjohn%40example.org%3E ACCEPTED REQ-PARTICIPANT true mailto:%3Csomebody%40else.com%3E mailto:%3Cjane%40example.org%3E DELEGATED NON-PARTICIPANT mailto:%3Cjane%40example.org%3E mailto:%3Csomebody%40else.com%3E text/html noname.1395223627.5555 cid:noname.1395223627.5555 X-MOZ-RECEIVED-DTSTAMP 20140224T155612Z X-GWSHOW-AS BUSY DISPLAY alarm 1 START -PT2H EMAIL test alarm 2 mailto:%3Cjohn.doe%40example.org%3E START -P1D 75c740bb-b3c6-442c-8021-ecbaeb0a025e 2014-07-07T01:28:23Z 2014-07-07T01:28:23Z 2 PUBLIC /kolab.org/Europe/London 2014-08-16T13:00:00 /kolab.org/Europe/London 2014-08-16T16:00:00 /kolab.org/Europe/London THISANDFUTURE 2014-08-16T10:00:00 exception exception Room 101 Doe, John mailto:%3Cjohn%40example.org%3E DECLINED REQ-PARTICIPANT mailto:%3Cjane%40example.org%3E """ class TestEventXML(unittest.TestCase): event = Event() @classmethod def setUp(self): """ Compatibility for twisted.trial.unittest """ self.setup_class() @classmethod def setup_class(self, *args, **kw): # set language to default pykolab.translate.setUserLanguage('en_US') def assertIsInstance(self, _value, _type, _msg=None): if hasattr(unittest.TestCase, 'assertIsInstance'): return unittest.TestCase.assertIsInstance(self, _value, _type, _msg) else: if (type(_value)) == _type: return True else: if _msg is not None: raise AssertionError("%s != %s: %r" % (type(_value), _type, _msg)) else: raise AssertionError("%s != %s" % (type(_value), _type)) def test_000_no_start_date(self): self.assertRaises(EventIntegrityError, self.event.__str__) def test_001_minimal(self): self.event.set_start(datetime.datetime.now(pytz.timezone("Europe/London"))) self.assertIsInstance(self.event.get_start(), datetime.datetime) self.assertIsInstance(self.event.__str__(), str) def test_002_attendees_list(self): self.assertIsInstance(self.event.get_attendees(), list) def test_003_attendees_no_default(self): self.assertEqual(len(self.event.get_attendees()), 0) def test_004_attendee_add(self): self.event.add_attendee("john@doe.org") self.assertIsInstance(self.event.get_attendees(), list) self.assertEqual(len(self.event.get_attendees()), 1) def test_005_attendee_add_name_and_props(self): self.event.add_attendee("jane@doe.org", "Doe, Jane", role="OPT-PARTICIPANT", cutype="RESOURCE") self.assertIsInstance(self.event.get_attendees(), list) self.assertEqual(len(self.event.get_attendees()), 2) def test_006_get_attendees(self): self.assertEqual([x.get_email() for x in self.event.get_attendees()], ["john@doe.org", "jane@doe.org"]) def test_007_get_attendee_by_email(self): self.assertIsInstance(self.event.get_attendee_by_email("jane@doe.org"), Attendee) self.assertIsInstance(self.event.get_attendee("jane@doe.org"), Attendee) def test_007_get_attendee_props(self): self.assertEqual(self.event.get_attendee("jane@doe.org").get_cutype(), kolabformat.CutypeResource) self.assertEqual(self.event.get_attendee("jane@doe.org").get_role(), kolabformat.Optional) def test_007_get_nonexistent_attendee_by_email(self): self.assertRaises(ValueError, self.event.get_attendee_by_email, "nosuchattendee@invalid.domain") self.assertRaises(ValueError, self.event.get_attendee, "nosuchattendee@invalid.domain") def test_008_get_attendee_by_name(self): self.assertIsInstance(self.event.get_attendee_by_name("Doe, Jane"), Attendee) self.assertIsInstance(self.event.get_attendee("Doe, Jane"), Attendee) def test_008_get_nonexistent_attendee_by_name(self): self.assertRaises(ValueError, self.event.get_attendee_by_name, "Houdini, Harry") self.assertRaises(ValueError, self.event.get_attendee, "Houdini, Harry") def test_009_invalid_participant_status(self): self.assertRaises(InvalidAttendeeParticipantStatusError, self.event.set_attendee_participant_status, "jane@doe.org", "INVALID") def test_009_update_attendees(self): jane = self.event.get_attendee("jane@doe.org") jane.set_name("Jane (GI) Doe") self.event.update_attendees([jane]) self.assertEqual(len(self.event.get_attendees()), 2) self.assertEqual(self.event.get_attendee("jane@doe.org").get_name(), "Jane (GI) Doe") def test_010_datetime_from_string(self): self.assertRaises(InvalidEventDateError, self.event.set_start, "2012-05-23 11:58:00") def test_011_attendee_equality(self): self.assertEqual(self.event.get_attendee("jane@doe.org").get_email(), "jane@doe.org") def test_012_delegate_new_attendee(self): self.event.delegate("jane@doe.org", "max@imum.com") def test_013_delegatee_is_now_attendee(self): delegatee = self.event.get_attendee("max@imum.com") self.assertIsInstance(delegatee, Attendee) self.assertEqual(delegatee.get_role(), kolabformat.Optional) self.assertEqual(delegatee.get_cutype(), kolabformat.CutypeResource) def test_014_delegate_attendee_adds(self): self.assertEqual(len(self.event.get_attendee("jane@doe.org").get_delegated_to()), 1) self.event.delegate("jane@doe.org", "john@doe.org") self.assertEqual(len(self.event.get_attendee("jane@doe.org").get_delegated_to()), 2) def test_015_timezone(self): _tz = self.event.get_start() self.assertIsInstance(_tz.tzinfo, datetime.tzinfo) def test_016_start_with_timezone(self): _start = datetime.datetime(2012, 05, 23, 11, 58, 00, tzinfo=pytz.timezone("Europe/Zurich")) _start_utc = _start.astimezone(pytz.utc) # self.assertEqual(_start.__str__(), "2012-05-23 11:58:00+01:00") # self.assertEqual(_start_utc.__str__(), "2012-05-23 10:58:00+00:00") self.event.set_start(_start) self.assertIsInstance(_start.tzinfo, datetime.tzinfo) self.assertEqual(_start.tzinfo, pytz.timezone("Europe/Zurich")) def test_017_allday_without_timezone(self): _start = datetime.date(2012, 05, 23) self.assertEqual(_start.__str__(), "2012-05-23") self.event.set_start(_start) self.assertEqual(hasattr(_start, 'tzinfo'), False) self.assertEqual(self.event.get_start().__str__(), "2012-05-23") def test_018_load_from_ical(self): ical_str = """BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Roundcube//Roundcube libcalendaring 1.1-git//Sabre//Sabre VObject 2.1.3//EN CALSCALE:GREGORIAN METHOD:REQUEST """ + ical_event + ical_exception + "END:VCALENDAR" ical = icalendar.Calendar.from_ical(ical_str) event = event_from_ical(ical.walk('VEVENT')[0], ical_str) self.assertEqual(event.get_location(), "Location") self.assertEqual(str(event.get_lastmodified()), "2014-04-07 12:23:11+00:00") self.assertEqual(event.get_description(), "Description\n2 lines") self.assertEqual(event.get_url(), "http://somelink.com/foo") self.assertEqual(event.get_transparency(), False) self.assertEqual(event.get_categories(), ["Personal"]) self.assertEqual(event.get_priority(), '2') self.assertEqual(event.get_classification(), kolabformat.ClassPublic) self.assertEqual(event.get_attendee_by_email("max@imum.com").get_cutype(), kolabformat.CutypeResource) self.assertEqual(event.get_sequence(), 2) self.assertTrue(event.is_recurring()) self.assertIsInstance(event.get_duration(), datetime.timedelta) self.assertIsInstance(event.get_end(), datetime.datetime) self.assertEqual(str(event.get_end()), "2014-05-23 12:30:00+02:00") self.assertEqual(len(event.get_exception_dates()), 2) self.assertIsInstance(event.get_exception_dates()[0], datetime.datetime) self.assertEqual(len(event.get_alarms()), 1) self.assertEqual(len(event.get_attachments()), 2) self.assertEqual(len(event.get_exceptions()), 1) exception = event.get_exceptions()[0] self.assertIsInstance(exception.get_recurrence_id(), datetime.datetime) # self.assertEqual(exception.thisandfuture, True) self.assertEqual(str(exception.get_start()), "2014-06-07 12:00:00+02:00") def test_018_ical_to_message(self): event = event_from_ical(ical_event) message = event.to_message() self.assertTrue(message.is_multipart()) self.assertEqual(message['Subject'], event.uid) self.assertEqual(message['X-Kolab-Type'], 'application/x-vnd.kolab.event') parts = [p for p in message.walk()] attachments = event.get_attachments() self.assertEqual(len(parts), 5) self.assertEqual(parts[1].get_content_type(), 'text/plain') self.assertEqual(parts[2].get_content_type(), 'application/calendar+xml') self.assertEqual(parts[3].get_content_type(), 'image/png') self.assertEqual(parts[4].get_content_type(), 'text/plain') self.assertEqual(parts[2]['Content-ID'], None) self.assertEqual(parts[3]['Content-ID'].strip('<>'), attachments[0].uri()[4:]) self.assertEqual(parts[4]['Content-ID'].strip('<>'), attachments[1].uri()[4:]) def test_018_ical_allday_events(self): ical = """BEGIN:VEVENT UID:ffffffff-f783-4b58-b404-b1389bd2ffff DTSTAMP;VALUE=DATE-TIME:20140407T122311Z CREATED;VALUE=DATE-TIME:20140407T122245Z DTSTART;VALUE=DATE:20140823 DTEND;VALUE=DATE:20140824 SUMMARY:All day DESCRIPTION:One single day TRANSP:OPAQUE CLASS:PUBLIC END:VEVENT """ event = event_from_ical(ical) self.assertEqual(str(event.get_start()), "2014-08-23") self.assertEqual(str(event.get_end()), "2014-08-23") self.assertEqual(str(event.get_ical_dtend()), "2014-08-24") self.assertTrue(re.match('.*\s*2014-08-23', str(event), re.DOTALL)) def test_019_as_string_itip(self): self.event.set_summary("test") self.event.set_start(datetime.datetime(2014, 05, 23, 11, 00, 00, tzinfo=pytz.timezone("Europe/London"))) self.event.set_end(datetime.datetime(2014, 05, 23, 12, 30, 00, tzinfo=pytz.timezone("Europe/London"))) self.event.set_sequence(3) self.event.set_classification('CONFIDENTIAL') self.event.add_custom_property('X-Custom', 'check') self.event.set_recurrence_id(datetime.datetime(2014, 05, 23, 11, 0, 0), True) rrule = RecurrenceRule() rrule.set_frequency(kolabformat.RecurrenceRule.Weekly) rrule.set_byday(['2WE', '-1SU']) rrule.setBymonth([2]) rrule.set_count(10) rrule.set_until(datetime.datetime(2014, 7, 23, 11, 0, 0, tzinfo=pytz.timezone("Europe/London"))) self.event.set_recurrence(rrule) ical = icalendar.Calendar.from_ical(self.event.as_string_itip()) event = ical.walk('VEVENT')[0] self.assertEqual(event['uid'], self.event.get_uid()) self.assertEqual(event['summary'], "test") self.assertEqual(event['sequence'], 3) self.assertEqual(event['X-CUSTOM'], "check") self.assertIsInstance(event['dtstamp'].dt, datetime.datetime) self.assertEqual(event['class'], "CONFIDENTIAL") self.assertIsInstance(event['recurrence-id'].dt, datetime.datetime) self.assertEqual(event['recurrence-id'].params.get('RANGE'), 'THISANDFUTURE') self.assertTrue('rrule' in event) self.assertEqual(event['rrule']['FREQ'][0], 'WEEKLY') self.assertEqual(event['rrule']['INTERVAL'][0], 1) self.assertEqual(event['rrule']['COUNT'][0], 10) self.assertEqual(event['rrule']['BYMONTH'][0], 2) self.assertEqual(event['rrule']['BYDAY'], ['2WE', '-1SU']) self.assertIsInstance(event['rrule']['UNTIL'][0], datetime.datetime) self.assertEquals(event['rrule']['UNTIL'][0].tzinfo, pytz.utc) def test_019_to_message_itip(self): self.event = Event() self.event.set_summary("test") self.event.set_start(datetime.datetime(2014, 05, 23, 11, 00, 00, tzinfo=pytz.timezone("Europe/London"))) self.event.set_end(datetime.datetime(2014, 05, 23, 12, 30, 00, tzinfo=pytz.timezone("Europe/London"))) self.event.set_organizer("me@kolab.org") self.event.add_attendee("john@doe.org") self.event.add_attendee("jane@doe.org") message = self.event.to_message_itip("john@doe.org", method="REPLY", participant_status="ACCEPTED") itip_event = None for part in message.walk(): if part.get_content_type() == "text/calendar": ical = icalendar.Calendar.from_ical(part.get_payload(decode=True)) itip_event = ical.walk('VEVENT')[0] break self.assertEqual(itip_event['uid'], self.event.get_uid()) self.assertEqual(itip_event['attendee'].lower(), 'mailto:john@doe.org') # delegate jane => jack self.event.delegate("jane@doe.org", "jack@ripper.com", "Jack") message = self.event.to_message_itip("jane@doe.org", method="REPLY", participant_status="DELEGATED") itip_event = None for part in message.walk(): if part.get_content_type() == "text/calendar": ical = icalendar.Calendar.from_ical(part.get_payload(decode=True)) itip_event = ical.walk('VEVENT')[0] break self.assertEqual(len(itip_event['attendee']), 2) self.assertEqual(str(itip_event['attendee'][0]).lower(), 'mailto:jane@doe.org') self.assertEqual(str(itip_event['attendee'][1]).lower(), 'mailto:jack@ripper.com') self.assertEqual(itip_event['attendee'][0].params['delegated-to'], 'jack@ripper.com') self.assertEqual(itip_event['attendee'][1].params['delegated-from'], 'jane@doe.org') def test_020_calendaring_recurrence(self): rrule = kolabformat.RecurrenceRule() rrule.setFrequency(kolabformat.RecurrenceRule.Monthly) rrule.setCount(10) self.event = Event() self.event.set_recurrence(rrule) _start = datetime.datetime(2014, 5, 1, 11, 30, 00, tzinfo=pytz.timezone("Europe/London")) self.event.set_start(_start) self.event.set_end(_start + datetime.timedelta(hours=2)) self.assertTrue(self.event.is_recurring()) next_date = self.event.get_next_occurence(_start) self.assertIsInstance(next_date, datetime.datetime) self.assertEqual(next_date.month, 6) self.assertEqual(next_date.day, 1) end_date = self.event.get_occurence_end_date(next_date) self.assertIsInstance(end_date, datetime.datetime) self.assertEqual(end_date.month, 6) self.assertEqual(end_date.hour, 13) self.assertEqual(self.event.get_next_occurence(next_date).month, 7) last_date = self.event.get_last_occurrence() self.assertIsInstance(last_date, datetime.datetime) self.assertEqual(last_date.year, 2015) self.assertEqual(last_date.month, 2) self.assertEqual(self.event.get_next_occurence(last_date), None) # check infinite recurrence rrule = kolabformat.RecurrenceRule() rrule.setFrequency(kolabformat.RecurrenceRule.Monthly) self.event.set_recurrence(rrule) self.assertEqual(self.event.get_last_occurrence(), None) self.assertIsInstance(self.event.get_last_occurrence(force=True), datetime.datetime) # check get_next_instance() which returns a clone of the base event next_instance = self.event.get_next_instance(next_date) self.assertIsInstance(next_instance, Event) self.assertIsInstance(next_instance.get_recurrence_id(), datetime.datetime) self.assertEqual(self.event.get_summary(), next_instance.get_summary()) self.assertEqual(next_instance.get_start().month, 7) self.assertFalse(next_instance.is_recurring()) # check get_next_occurence() with an infinitely recurring all-day event rrule = kolabformat.RecurrenceRule() rrule.setFrequency(kolabformat.RecurrenceRule.Yearly) self.event.set_recurrence(rrule) self.event.set_start(datetime.date(2014, 5, 1)) self.event.set_end(datetime.date(2014, 5, 1)) next_date = self.event.get_next_occurence(datetime.date(2015, 1, 1)) self.assertIsInstance(next_date, datetime.date) self.assertEqual(next_date.year, 2015) self.assertEqual(next_date.month, 5) def test_021_calendaring_no_recurrence(self): _start = datetime.datetime(2014, 2, 1, 14, 30, 00, tzinfo=pytz.timezone("Europe/London")) self.event = Event() self.event.set_start(_start) self.event.set_end(_start + datetime.timedelta(hours=2)) self.assertEqual(self.event.get_next_occurence(_start), None) self.assertEqual(self.event.get_last_occurrence(), None) def test_021_add_exceptions(self): event = event_from_ical(ical_event) exception = event_from_ical(ical_exception) self.assertIsInstance(event, Event) self.assertIsInstance(exception, Event) event.add_exception(exception) self.assertEquals(len(event.get_exceptions()), 1) # second call shall replace the existing exception event.add_exception(exception) self.assertEquals(len(event.get_exceptions()), 1) # first real occurrence should be our exception occurrence = event.get_next_instance(event.get_start()) self.assertEqual(occurrence.get_summary(), "Exception") def test_021_allday_recurrence(self): rrule = kolabformat.RecurrenceRule() rrule.setFrequency(kolabformat.RecurrenceRule.Daily) rrule.setCount(10) self.event = Event() self.event.set_summary('alldays') self.event.set_recurrence(rrule) _start = datetime.date(2015, 1, 1) self.event.set_start(_start) self.event.set_end(_start) exdate = datetime.date(2015, 1, 5) xmlexception = Event(from_string=str(self.event)) xmlexception.set_start(exdate) xmlexception.set_end(exdate) xmlexception.set_recurrence_id(exdate, False) xmlexception.set_status('CANCELLED') self.event.add_exception(xmlexception) inst3 = self.event.get_instance(datetime.date(2015, 1, 3)) self.assertEqual(inst3.get_start(), datetime.date(2015, 1, 3)) inst5 = self.event.get_instance(exdate) self.assertEqual(inst5.get_status(True), 'CANCELLED') def test_021_ical_exceptions(self): self.event.set_summary("test") self.event.set_start(datetime.datetime(2014, 05, 23, 11, 00, 00, tzinfo=pytz.timezone("Europe/London"))) self.event.set_end(datetime.datetime(2014, 05, 23, 12, 30, 00, tzinfo=pytz.timezone("Europe/London"))) rrule = kolabformat.RecurrenceRule() rrule.setFrequency(kolabformat.RecurrenceRule.Weekly) self.event.set_recurrence(rrule) xmlexception = Event(from_string=str(self.event)) xmlexception.set_start(datetime.datetime(2014, 05, 30, 14, 00, 00, tzinfo=pytz.timezone("Europe/London"))) xmlexception.set_end(datetime.datetime(2014, 05, 30, 16, 00, 00, tzinfo=pytz.timezone("Europe/London"))) xmlexception.set_recurrence_id(datetime.datetime(2014, 05, 30, 11, 0, 0), False) self.event.add_exception(xmlexception) ical = icalendar.Calendar.from_ical(self.event.as_string_itip()) vevents = ical.walk('VEVENT') event = vevents[0] exception = vevents[1] self.assertEqual(event['uid'], self.event.get_uid()) self.assertEqual(event['summary'], "test") self.assertEqual(exception['uid'], self.event.get_uid()) self.assertIsInstance(exception['recurrence-id'].dt, datetime.datetime) self.assertEqual(exception['recurrence-id'].params.get('RANGE'), None) def test_021_single_instances(self): self.event = Event() self.event.set_summary('singles') _start = datetime.datetime(2015, 3, 1, 14, 0, 0, tzinfo=pytz.timezone("Europe/London")) self.event.set_start(_start) self.event.set_end(_start + datetime.timedelta(hours=1)) self.event.set_recurrence_id(_start) _start2 = datetime.datetime(2015, 3, 5, 15, 0, 0, tzinfo=pytz.timezone("Europe/London")) xmlexception = Event(from_string=str(self.event)) xmlexception.set_start(_start2) xmlexception.set_end(_start2 + datetime.timedelta(hours=1)) xmlexception.set_summary('singles #2') xmlexception.set_recurrence_id(_start2) self.event.add_exception(xmlexception) self.assertEqual(self.event.has_exceptions(), True) first = self.event.get_instance(_start) self.assertIsInstance(first, Event) self.assertEqual(first.get_summary(), "singles") second = self.event.get_instance(_start2) self.assertIsInstance(second, Event) self.assertEqual(second.get_summary(), "singles #2") # update main instance first.set_status('CANCELLED') first.set_summary("singles #1") self.event.add_exception(first) event = event_from_string(str(self.event)) self.assertEqual(self.event.has_exceptions(), True) self.assertEqual(event.get_status(True), 'CANCELLED') self.assertEqual(event.get_summary(), "singles #1") def test_022_load_from_xml(self): event = event_from_string(xml_event) self.assertEqual(event.uid, '75c740bb-b3c6-442c-8021-ecbaeb0a025e') self.assertEqual(event.get_attendee_by_email("jane@example.org").get_participant_status(), kolabformat.PartAccepted) self.assertEqual(len(event.get_attendee_by_email("jane@example.org").get_delegated_from()), 1) self.assertEqual(len(event.get_attendee_by_email("somebody@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()), "2013-08-13 10:00:00+01:00") self.assertEqual(str(event.get_end()), "2013-08-13 14:00:00+01:00") self.assertTrue(event.is_recurring()) exceptions = event.get_exceptions() self.assertEqual(len(exceptions), 1) exception = exceptions[0] self.assertIsInstance(exception.get_recurrence_id(), datetime.datetime) self.assertTrue(exception.thisandfuture) self.assertEqual(str(exception.get_start()), "2014-08-16 13:00:00+01:00") self.assertEqual(exception.get_attendee_by_email("jane@example.org").get_participant_status(), kolabformat.PartDeclined) self.assertRaises(ValueError, exception.get_attendee, "somebody@else.com") # get instances with exception data occurrence = event.get_next_instance(exception.get_start() - datetime.timedelta(days=1)) self.assertEqual(occurrence.get_start(), exception.get_start()) self.assertEqual(occurrence.get_summary(), "exception") # find instance directly by date _recurrence_id = datetime.datetime(2014, 8, 15, 10, 0, 0) occurrence = event.get_instance(_recurrence_id) self.assertIsInstance(occurrence, Event) self.assertEqual(str(occurrence.get_recurrence_id()), "2014-08-15 10:00:00+01:00") # set invalid date-only recurrence-id exception.set_recurrence_id(datetime.date(2014, 8, 16)) event.add_exception(exception) inst = event.get_next_instance(_recurrence_id) self.assertIsInstance(inst, Event) self.assertIsInstance(inst.get_recurrence_id(), datetime.datetime) def test_023_load_from_message(self): event = event_from_message(event_from_ical(ical_event).to_message()) event.set_sequence(3) message = event.to_message() self.assertTrue(message.is_multipart()) # check attachment MIME parts are kept parts = [p for p in message.walk()] attachments = event.get_attachments() self.assertEqual(len(parts), 5) self.assertEqual(parts[3].get_content_type(), 'image/png') self.assertEqual(parts[3]['Content-ID'].strip('<>'), attachments[0].uri()[4:]) self.assertEqual(parts[4].get_content_type(), 'text/plain') self.assertEqual(parts[4]['Content-ID'].strip('<>'), attachments[1].uri()[4:]) self.assertEqual(event.get_attachment_data(1), 'This is a text file\n') def test_024_bogus_itip_data(self): # DTSTAMP contains an invalid date/time value vevent = """BEGIN:VEVENT UID:626421779C777FBE9C9B85A80D04DDFA-A4BF5BBB9FEAA271 DTSTAMP:20120713T1254140 DTSTART;TZID=Europe/London:20120713T100000 DTEND;TZID=Europe/London:20120713T110000 SUMMARY:test DESCRIPTION:test ORGANIZER;CN="Doe, John":mailto:john.doe@example.org ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:mailt o:jane.doe@example.org ATTENDEE;ROLE=OPT-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:mailt o:user.external@example.com SEQUENCE:1 TRANSP:OPAQUE END:VEVENT """ event = event_from_ical(vevent) self.assertRaises(EventIntegrityError, event.to_message) def test_025_to_dict(self): data = event_from_string(xml_event).to_dict() self.assertIsInstance(data, dict) self.assertIsInstance(data['start'], datetime.datetime) - # self.assertIsInstance(data['end'], datetime.datetime) + self.assertIsInstance(data['end'], datetime.datetime) self.assertIsInstance(data['created'], datetime.datetime) self.assertIsInstance(data['lastmodified-date'], datetime.datetime) self.assertEqual(data['uid'], '75c740bb-b3c6-442c-8021-ecbaeb0a025e') self.assertEqual(data['summary'], 'test') self.assertEqual(data['location'], 'Room 101') self.assertEqual(data['description'], 'test') self.assertEqual(data['priority'], 5) self.assertEqual(data['status'], 'CANCELLED') self.assertEqual(data['sequence'], 1) self.assertEqual(data['transparency'], False) self.assertEqual(data['X-GWSHOW-AS'], 'BUSY') self.assertIsInstance(data['organizer'], dict) self.assertEqual(data['organizer']['email'], 'john@example.org') self.assertEqual(len(data['attendee']), 2) self.assertIsInstance(data['attendee'][0], dict) self.assertEqual(len(data['attach']), 1) self.assertIsInstance(data['attach'][0], dict) self.assertEqual(data['attach'][0]['fmttype'], 'text/html') self.assertIsInstance(data['rrule'], dict) self.assertEqual(data['rrule']['freq'], 'DAILY') self.assertEqual(data['rrule']['interval'], 1) self.assertEqual(data['rrule']['wkst'], 'MO') self.assertIsInstance(data['rrule']['until'], datetime.date) self.assertIsInstance(data['alarm'], list) self.assertEqual(len(data['alarm']), 2) self.assertEqual(data['alarm'][0]['action'], 'DISPLAY') self.assertEqual(data['alarm'][1]['action'], 'EMAIL') self.assertEqual(data['alarm'][1]['trigger']['value'], '-P1D') self.assertEqual(len(data['alarm'][1]['attendee']), 1) def test_026_compute_diff(self): e1 = event_from_string(xml_event) e2 = event_from_string(xml_event) e2.set_summary("test2") e2.set_end(e1.get_end() + datetime.timedelta(hours=3)) e2.set_sequence(e1.get_sequence() + 1) e2.set_attendee_participant_status("jane@example.org", "DECLINED") e2.set_lastmodified() diff = compute_diff(e1.to_dict(), e2.to_dict(), True) - self.assertEqual(len(diff), 4, "Diff: (length: %d):\r\n%r\r\n%r" % (len(diff), diff, e2.__str__())) + self.assertEqual(len(diff), 5, "Diff: (length: %d):\r\n%r\r\n%r" % (len(diff), diff, e2.__str__())) ps = self._find_prop_in_list(diff, 'summary') self.assertIsInstance(ps, OrderedDict) self.assertEqual(ps['new'], "test2") pa = self._find_prop_in_list(diff, 'attendee') self.assertIsInstance(pa, OrderedDict) self.assertEqual(pa['index'], 0) self.assertEqual(pa['new'], dict(partstat='DECLINED')) def test_026_property_to_string(self): data = event_from_string(xml_event).to_dict() self.assertEqual(property_to_string('sequence', data['sequence']), "1") self.assertEqual(property_to_string('start', data['start']), "2013-08-13 10:00 (BST)") self.assertEqual(property_to_string('organizer', data['organizer']), "Doe, John") self.assertEqual(property_to_string('attendee', data['attendee'][0]), "jane@example.org, Accepted") self.assertEqual(property_to_string('rrule', data['rrule']), "Every 1 day(s) until 2015-07-25") self.assertEqual(property_to_string('exdate', data['exdate'][0]), "2014-07-19") self.assertEqual(property_to_string('alarm', data['alarm'][0]), "Display message 2 hour(s) before") self.assertEqual(property_to_string('attach', data['attach'][0]), "noname.1395223627.5555") def test_027_merge_attendee_data(self): event = event_from_string(xml_event) jane = event.get_attendee("jane@example.org") jane.set_participant_status('TENTATIVE') jack = Attendee("jack@example.org", name="Jack", role='OPT-PARTICIPANT') some = event.set_attendee_participant_status("somebody@else.com", 'ACCEPTED') # update jane + add jack event.update_attendees([jane, jack]) self.assertEqual(len(event.get_attendees()), 3) self.assertEqual(event.get_attendee("jane@example.org").get_participant_status(), kolabformat.PartTentative) self.assertEqual(event.get_attendee("somebody@else.com").get_participant_status(), kolabformat.PartAccepted) # test write + read event = event_from_string(str(event)) exception = event.get_exceptions()[0] self.assertEqual(len(exception.get_attendees()), 2) self.assertEqual(event.get_attendee("jane@example.org").get_participant_status(), kolabformat.PartTentative) self.assertEqual(event.get_attendee("jack@example.org").get_name(), "Jack") self.assertRaises(ValueError, exception.get_attendee, "somebody@else.com") # not addded to exception def test_028_rdate(self): event = event_from_ical(ical_event_rdate) self.assertTrue(event.is_recurring()) self.assertEqual(len(event.get_recurrence_dates()), 2) self.assertIsInstance(event.get_recurrence_dates()[0], datetime.datetime) rdates = event.get_recurrence_dates() self.assertEqual(str(rdates[0]), "2014-05-30 11:00:00+02:00") self.assertEqual(str(rdates[1]), "2014-06-20 11:00:00+02:00") dt = datetime.datetime(2014, 8, 15, 10, 0, 0, tzinfo=pytz.timezone("Europe/Zurich")) event.add_recurrence_date(dt) rdates = event.get_recurrence_dates() self.assertEqual(str(rdates[2]), "2014-08-15 10:00:00+02:00") itip = event.as_string_itip() rdates = [] for line in itip.split("\n"): if re.match('^RDATE', line): rdates.append(line.strip().split(':')[1]) self.assertEqual("TZID=Europe/Zurich", line.split(':')[0].split(';')[1]) self.assertEqual(rdates, ["20140530T110000", "20140620T110000", "20140815T100000"]) def _find_prop_in_list(self, diff, name): for prop in diff: if prop['property'] == name: return prop return None if __name__ == '__main__': unittest.main() diff --git a/tests/unit/test-017-diff.py b/tests/unit/test-017-diff.py index 46e0a77..4adbea1 100644 --- a/tests/unit/test-017-diff.py +++ b/tests/unit/test-017-diff.py @@ -1,207 +1,208 @@ import unittest from pykolab.xml import Todo from pykolab.xml.utils import compute_diff from pykolab.xml.utils import order_proplists xml_todo_01 = """ Roundcube-libkolab-1.1 Libkolabxml-1.1 2.0 3.1.0 E49000485B9EE3299A8870AD6A3E75E5-A4BF5BBB9FEAA271 2015-03-25T10:32:18Z 2015-03-25T16:09:11Z 0 Old attachments image/png silhouette.png cid:silhouette.1427297477.7514.png text/plain notes.txt cid:notes.1427298885.9012.txt image/gif landspeeder-lego-icon.gif cid:landspeeder-lego-icon.1427299751.8542.gif """ xml_todo_02 = """ Roundcube-libkolab-1.1 Libkolabxml-1.1 2.0 3.1.0 E49000485B9EE3299A8870AD6A3E75E5-A4BF5BBB9FEAA271 2015-03-25T10:32:18Z 2015-03-25T16:09:53Z 1 New attachments Removed attachment text/plain notes.txt cid:notes.1427298885.9012.txt image/gif landspeeder-lego-icon.gif cid:landspeeder-lego-icon.1427299751.8542.gif """ class TestComputeDiff(unittest.TestCase): def test_000_order_proplists(self): one = { "uri": "cid:one", "label": "one.txt" } two = { "uri": "cid:two", "label": "two.png" } three = { "foo": "three" } four = { "foo": "four" } (aa, bb) = order_proplists([one, two, four], [three, two, one, four]) self.assertEqual(len(aa), 3) self.assertEqual(len(bb), 4) self.assertEqual(aa[0], bb[0]) self.assertEqual(aa[1], bb[1]) (aa, bb) = order_proplists([four, three, one, two], [two, one]) self.assertEqual(len(aa), 4) self.assertEqual(len(bb), 2) self.assertEqual(aa[0], bb[0]) self.assertEqual(aa[1], bb[1]) def test_000_order_proplists2(self): a1 = {'code': '4567', 'locality': 'Worktown', 'country': 'Switzerland', 'region': '', 'label': '', 'street': 'Workstreet 22', 'type': 'work'} a2 = {'code': '55550', 'locality': 'San Francisco', 'country': 'USA', 'region': 'CA', 'label': '', 'street': 'O-steet', 'type': 'office'} a3 = {'code': '6666', 'locality': 'Workcity', 'country': 'Switzerland', 'region': 'ZH', 'label': '', 'street': 'Workstreet 22', 'type': 'work'} a4 = dict(a2) (aa, bb) = order_proplists([a1, a2], [a3, a4]) self.assertEqual(aa[1], bb[1]) def test_001_attachments(self): old = Todo(from_string=xml_todo_01) new = Todo(from_string=xml_todo_02) diff = compute_diff(old.to_dict(), new.to_dict()) self.assertEqual(len(diff), 5) self.assertEqual(diff[0]['property'], 'sequence') self.assertEqual(diff[0]['old'], 0) self.assertEqual(diff[0]['new'], 1) - self.assertEqual(diff[1]['property'], 'description') - self.assertEqual(diff[1]['old'], '') + self.assertEqual(diff[1]['property'], 'summary') + self.assertEqual(diff[1]['old'], 'Old attachments') + self.assertEqual(diff[1]['new'], 'New attachments') - self.assertEqual(diff[2]['property'], 'summary') - self.assertEqual(diff[2]['old'], 'Old attachments') - self.assertEqual(diff[2]['new'], 'New attachments') + self.assertEqual(diff[2]['property'], 'attach') + self.assertEqual(diff[2]['new'], None) + self.assertEqual(diff[2]['old']['uri'], "cid:silhouette.1427297477.7514.png") - self.assertEqual(diff[3]['property'], 'attach') - self.assertEqual(diff[3]['new'], None) - self.assertEqual(diff[3]['old']['uri'], "cid:silhouette.1427297477.7514.png") + self.assertEqual(diff[3]['property'], 'lastmodified-date') + + self.assertEqual(diff[4]['property'], 'description') + self.assertEqual(diff[4]['old'], '') - self.assertEqual(diff[4]['property'], 'lastmodified-date') if __name__ == '__main__': unittest.main()