Build iTip response and notification messages with unicode strings (#3926) + adjust tests

4 files changed, 24 insertions, 5 deletions

diff --git a/tests/functional/resource_func.py b/tests/functional/resource_func.py
index ac80360..a7e4d90 100644
--- a/tests/functional/resource_func.py
+++ b/tests/functional/resource_func.py
@@ -15,7 +15,8 @@ def resource_add(type, cn, members=None, owner=None, **kw):
         'cn': cn,
         'kolabtargetfolder': "shared/Resources/" + cn + "@example.org",
         'uniquemember': members,
-        'owner': owner
+        'owner': owner,
+        'ou': 'ou=resources,dc=example,dc=org'
     }
 
     resource_details.update(kw)
diff --git a/tests/functional/test_wallace/test_005_resource_invitation.py b/tests/functional/test_wallace/test_005_resource_invitation.py
index 4e69f2f..885f4ba 100644
--- a/tests/functional/test_wallace/test_005_resource_invitation.py
+++ b/tests/functional/test_wallace/test_005_resource_invitation.py
@@ -574,7 +574,7 @@ class TestResourceInvitation(unittest.TestCase):
     def test_010_invalid_bookings(self):
         self.purge_mailbox(self.john['mailbox'])
 
-        itip_other = itip_invitation.replace("mailto:%s", "mailto:some-other-resource@example.org\nDESCRIPTION: Sent to %s")
+        itip_other = itip_invitation.replace("mailto:%s", "mailto:some-other-resource@example.org\nCOMMENT: Sent to %s")
         self.send_itip_invitation(self.audi['mail'], datetime.datetime(2014,3,22, 8,0,0), template=itip_other)
 
         time.sleep(1)
diff --git a/tests/unit/test-011-itip.py b/tests/unit/test-011-itip.py
index cb1b760..e5edee5 100644
--- a/tests/unit/test-011-itip.py
+++ b/tests/unit/test-011-itip.py
@@ -465,5 +465,13 @@ class TestITip(unittest.TestCase):
         self.assertEqual(message.get('Subject'), _("Invitation for %(summary)s was %(status)s") % { 'summary':'test', 'status':_accepted })
 
         text = str(message.get_payload(0));
-        self.assertIn('SUMMARY=test', text)
-        self.assertIn('STATUS=' + _accepted, text)
+        self.assertIn('SUMMARY=3Dtest', text)
+        self.assertIn('STATUS=3D' + _accepted, text)
+
+    def test_004_send_reply_unicode(self):
+        itip_events = itip.events_from_message(message_from_string(itip_non_multipart.replace('SUMMARY:test', "SUMMARY:With äöü")))
+        itip.send_reply("resource-collection-car@example.org", itip_events, "SUMMARY=%(summary)s; STATUS=%(status)s; NAME=%(name)s;")
+
+        self.assertEqual(len(self.smtplog), 1)
+        self.assertIn("Subject: =?utf-8?q?Invitation_for_With_=C3=A4=C3=B6=C3=BC_was_Accepted?=", self.smtplog[0][2])
+        self.assertIn('SUMMARY=3DWith =C3=A4=C3=B6=C3=BC', self.smtplog[0][2])
diff --git a/tests/unit/test-012-wallace_invitationpolicy.py b/tests/unit/test-012-wallace_invitationpolicy.py
index 3366950..20e139d 100644
--- a/tests/unit/test-012-wallace_invitationpolicy.py
+++ b/tests/unit/test-012-wallace_invitationpolicy.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import os
 import pykolab
 import logging
@@ -160,4 +162,12 @@ class TestWallaceInvitationpolicy(unittest.TestCase):
         self.assertFalse( MIP.is_auto_reply({ 'kolabinvitationpolicy':accept_some },  'sam@example.org', 'event'))
         self.assertFalse( MIP.is_auto_reply({ 'kolabinvitationpolicy':accept_avail }, 'user@domain.com', 'event'))
         self.assertTrue(  MIP.is_auto_reply({ 'kolabinvitationpolicy':accept_avail }, 'john@example.org', 'event'))
-        
\ No newline at end of file
+
+    def test_006_send_update_notification(self):
+        itips = pykolab.itip.events_from_message(message_from_string(itip_multipart.replace('SUMMARY:test', 'SUMMARY:with äöü')))
+        MIP.send_update_notification(itips[0]['xml'], { 'mail': 'sender@example.org' }, old=None, reply=True)
+
+        self.assertEqual(len(self.smtplog), 1)
+        self.assertIn("Subject: =?utf-8?", self.smtplog[0][2])
+        self.assertIn("The event 'with =C3=A4=C3=B6=C3=BC' at", self.smtplog[0][2])
+