Changeset 136:6b8d21adfec2

Timestamp:

Aug 3, 2011, 8:53:25 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

wokkel-muc-client-support-24

Message:

Minor test cleanups for consistency.

File:

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

wokkel/test/test_muc.py

@@ -131 +131 @@
 
         def cb(room):
-            self.assertEqual(self.test_room, room.roomIdentifier)
+            self.assertEquals(self.test_room, room.roomIdentifier)
 
         d = self.protocol.join(self.test_srv, self.test_room, self.test_nick)
@@ -344 +344 @@
 
         def historyReceived(room, user, body, stamp, frm=None):
-            self.assertTrue(body=='test', "wrong message body")
+            self.assertEquals('test', body, "wrong message body")
             self.assertTrue(stamp, 'Does not have a history stamp')
 
@@ -381 +381 @@
             m = self.stub.output.pop()
             # check for delay element
-            self.assertTrue(m.name=='message', 'Wrong stanza')
+            self.assertEquals('message', m.name, 'Wrong stanza')
             self.assertTrue(xpath.matches("/message/delay", m), 'Invalid history stanza')
 
@@ -423 +423 @@
         def cb(iq):
             # check for a result
-            self.assertTrue(iq['type']=='result', 'We did not get a result')
+            self.assertEquals('result', iq['type'], 'We did not get a result')
 
         d = self.protocol.register(self.room_jid)
@@ -456 +456 @@
 
         def cb(iq):
-            self.assertTrue(iq['type']=='result', 'Not a result')
+            self.assertEquals('result', iq['type'], 'Not a result')
 
 
@@ -483 +483 @@
 
         def cb(destroyed):
-            self.assertTrue(destroyed==True, 'Room not destroyed.')
+            self.assertTrue(destroyed, 'Room not destroyed.')
 
         d = self.protocol.destroy(self.room_jid)
@@ -561 +561 @@
 
         def cb(room):
-            self.assertEqual(self.test_room, room.roomIdentifier)
+            self.assertEquals(self.test_room, room.roomIdentifier)
             user = room.getUser(self.room_jid.resource)
             self.assertNotIdentical(None, user, 'User not found')
-            self.assertEqual('testing MUC', user.status, 'Wrong status')
-            self.assertEqual('xa', user.show, 'Wrong show')
+            self.assertEquals('testing MUC', user.status, 'Wrong status')
+            self.assertEquals('xa', user.show, 'Wrong show')
 
         d = self.protocol.status(self.room_jid, 'xa', 'testing MUC')
@@ -572 +572 @@
         prs = self.stub.output[-1]
 
-        self.assertEqual('presence', prs.name, "Need to be presence")
+        self.assertEquals('presence', prs.name, "Need to be presence")
         self.assertTrue(getattr(prs, 'x', None), 'No muc x element')
 
@@ -592 +592 @@
         def cb(room):
             members = room.members
-            self.assertEqual(1, len(members))
+            self.assertEquals(1, len(members))
             user = members[0]
-            self.assertEqual(JID(u'hag66@shakespeare.lit'), user.entity)
-            self.assertEqual(u'thirdwitch', user.nick)
-            self.assertEqual(u'participant', user.role)
+            self.assertEquals(JID(u'hag66@shakespeare.lit'), user.entity)
+            self.assertEquals(u'thirdwitch', user.nick)
+            self.assertEquals(u'participant', user.role)
 
         self._createRoom()
@@ -606 +606 @@
         query = iq.query
         self.assertNotIdentical(None, query)
-        self.assertEqual(NS_MUC_ADMIN, query.uri)
+        self.assertEquals(NS_MUC_ADMIN, query.uri)
 
         response = toResponse(iq, 'result')