Changeset 131:d72d60360630 for wokkel/test/test_muc.py

Timestamp:

Jun 14, 2009, 8:42:38 PM (13 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

wokkel-muc-client-support-24

Message:

More renames, argument consistency.

File:

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

wokkel/test/test_muc.py

@@ -227 +227 @@
         self._createRoom()
         # add user to room
-        u = muc.User(self.room_jid.resource)
+        user = muc.User(self.room_jid.resource)
 
         room = self.protocol._getRoom(self.room_jid)
-        room.addUser(u)
+        room.addUser(user)
 
         def userPresence(room, user):
@@ -250 +250 @@
 
 
-        d = self.protocol.ban(self.room_jid, banned, self.user_jid, reason='Spam')
+        d = self.protocol.ban(self.room_jid, banned, reason='Spam',
+                              sender=self.user_jid)
         d.addCallback(cb)
 
@@ -268 +269 @@
         Kick an entity from a room.
         """
-        kicked = JID('kick@jabber.org/TroubleMakger')
+        nick = 'TroubleMakger'
+
         def cb(kicked):
             self.failUnless(kicked, 'Did not kick user')
 
-
-        d = self.protocol.kick(self.room_jid, kicked, self.user_jid, reason='Spam')
+        d = self.protocol.kick(self.room_jid, nick, reason='Spam',
+                               sender=self.user_jid)
         d.addCallback(cb)
 
@@ -331 +333 @@
         msg.addElement('thread', None, thread)
 
-        archive.append(msg)
+        archive.append({'stanza': msg, 'timestamp': '2002-10-13T23:58:37Z'})
 
         msg = domish.Element((None, 'message'))
@@ -339 +341 @@
         msg.addElement('thread', None, thread)
 
-        archive.append(msg)
+        archive.append({'stanza': msg, 'timestamp': '2002-10-13T23:58:43Z'})
 
         self.protocol.history(self.room_jid, archive)
@@ -405 +407 @@
         Client requesting voice for a room.
         """
-        self.protocol.voice(self.room_jid.userhost())
+        self.protocol.voice(self.room_jid)
 
         m = self.stub.output[-1]
@@ -488 +490 @@
 
         """
-        give_voice = JID('voice@jabber.org/TroubleMakger')
+        nick = 'TroubleMakger'
         def cb(give_voice):
             self.failUnless(give_voice, 'Did not give voice user')
 
 
-        d = self.protocol.grantVoice(self.user_jid, self.room_jid, give_voice)
+        d = self.protocol.grantVoice(self.room_jid, nick, sender=self.user_jid)
         d.addCallback(cb)
 
@@ -512 +514 @@
         """
         self._createRoom()
-        r = self.protocol._getRoom(self.room_jid)
-        u = muc.User(self.room_jid.resource)
-        r.addUser(u)
+        room = self.protocol._getRoom(self.room_jid)
+        user = muc.User(self.room_jid.resource)
+        room.addUser(user)
 
         def cb(room):
             self.assertEquals(self.test_room, room.roomIdentifier)
-            u = room.getUser(self.room_jid.resource)
-            self.failUnless(u is not None, 'User not found')
-            self.failUnless(u.status == 'testing MUC', 'Wrong status')
-            self.failUnless(u.show == 'xa', 'Wrong show')
+            user = room.getUser(self.room_jid.resource)
+            self.failUnless(user is not None, 'User not found')
+            self.failUnless(user.status == 'testing MUC', 'Wrong status')
+            self.failUnless(user.show == 'xa', 'Wrong show')
 
         d = self.protocol.status(self.room_jid, 'xa', 'testing MUC')