Changeset 141:3a9bff4e7807 for wokkel/test/test_muc.py

Timestamp:

Aug 4, 2011, 9:38:24 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

wokkel-muc-client-support-24

Message:

Use descendants from wokkel.generic.Stanza in messages and presence.

• Use wokkel.xmppim.AvailabilityPresence as a basis for presence stanzas.
• Split wokkel.xmppim.PresenceProtocol and Base MUCClient on BasePresenceProtocol
• Add new wokkel.xmppim.Message as the basis for message stanzas.
• `receivedGroupChat
• Change order of parameters for invite, as reason is optional.
• Use datetimes everywhere where timestamps are needed.

File:

• wokkel/test/test_muc.py (modified) (6 diffs)

wokkel/test/test_muc.py

@@ -5 +5 @@
 Tests for L{wokkel.muc}
 """
+
+from datetime import datetime
+from dateutil.tz import tzutc
 
 from zope.interface import verify
@@ -116 +119 @@
 
         def groupChat(room, user, message):
-            self.assertEquals('test', message, "Wrong group chat message")
+            self.assertEquals('test', message.body, "Wrong group chat message")
             self.assertEquals(self.test_room, room.roomIdentifier,
                               'Wrong room name')
@@ -343 +346 @@
 
 
-        def historyReceived(room, user, body, stamp, frm=None):
-            self.assertEquals('test', body, "wrong message body")
-            self.assertTrue(stamp, 'Does not have a history stamp')
+        def historyReceived(room, user, message):
+            self.assertEquals('test', message.body, "wrong message body")
+            stamp = datetime(2002, 10, 13, 23, 58, 37, tzinfo=tzutc())
+            self.assertEquals(stamp, message.delay.stamp,
+                             'Does not have a history stamp')
 
         d, self.protocol.receivedHistory = calledAsync(historyReceived)
@@ -365 +370 @@
         msg.addElement('thread', None, thread)
 
-        archive.append({'stanza': msg, 'timestamp': '2002-10-13T23:58:37Z'})
+        archive.append({'stanza': msg,
+                        'timestamp': datetime(2002, 10, 13, 23, 58, 37,
+                                              tzinfo=tzutc())})
 
         msg = domish.Element((None, 'message'))
@@ -373 +380 @@
         msg.addElement('thread', None, thread)
 
-        archive.append({'stanza': msg, 'timestamp': '2002-10-13T23:58:43Z'})
+        archive.append({'stanza': msg,
+                        'timestamp': datetime(2002, 10, 13, 23, 58, 43,
+                                              tzinfo=tzutc())})
 
         self.protocol.history(self.room_jid, archive)
@@ -392 +401 @@
         invitee = JID('test@jabber.org')
 
-        self.protocol.invite(bareRoomJID, 'This is a test', invitee)
+        self.protocol.invite(bareRoomJID, invitee, 'This is a test')
 
         msg = self.stub.output[-1]