Changeset 132:1b19c49d30c2 for wokkel/test/test_muc.py

Timestamp:

Aug 21, 2009, 2:46:18 PM (13 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

wokkel-muc-client-support-24

Message:

More renames.

File:

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

wokkel/test/test_muc.py

@@ -88 +88 @@
 
         def userPresence(room, user):
-            self.failUnless(room.roomIdentifier==self.test_room, 'Wrong room name')
-            self.failUnless(room.inRoster(user), 'User not in roster')
+            self.assertEqual(self.test_room, room.roomIdentifier,
+                             'Wrong room name')
+            self.assertTrue(room.inRoster(user), 'User not in roster')
 
 
@@ -122 +123 @@
 
         def cb(room):
-            self.assertEquals(self.test_room, room.roomIdentifier)
+            self.assertEqual(self.test_room, room.roomIdentifier)
 
         d = self.protocol.join(self.test_srv, self.test_room, self.test_nick)
@@ -468 +469 @@
 
         def cb(room):
-            self.assertEquals(self.test_room, room.roomIdentifier)
-            self.assertEquals(test_nick, room.nick)
+            self.assertEqual(self.test_room, room.roomIdentifier)
+            self.assertEqual(test_nick, room.nick)
 
         d = self.protocol.nick(self.room_jid, test_nick)
@@ -519 +520 @@
 
         def cb(room):
-            self.assertEquals(self.test_room, room.roomIdentifier)
+            self.assertEqual(self.test_room, room.roomIdentifier)
             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')
+            self.assertNotIdentical(None, user, 'User not found')
+            self.assertEqual('testing MUC', user.status, 'Wrong status')
+            self.assertEqual('xa', user.show, 'Wrong show')
 
         d = self.protocol.status(self.room_jid, 'xa', 'testing MUC')
@@ -530 +531 @@
         prs = self.stub.output[-1]
 
-        self.failUnless(prs.name=='presence', "Need to be presence")
-        self.failUnless(getattr(prs, 'x', None), 'No muc x element')
+        self.assertEqual('presence', prs.name, "Need to be presence")
+        self.assertTrue(getattr(prs, 'x', None), 'No muc x element')
 
         # send back user presence, they joined
@@ -546 +547 @@
             self.assertEqual(1, len(members))
             user = members[0]
-            self.assertEquals(JID(u'hag66@shakespeare.lit'), user.entity)
-            self.assertEquals(u'thirdwitch', user.nick)
-            self.assertEquals(u'participant', user.role)
+            self.assertEqual(JID(u'hag66@shakespeare.lit'), user.entity)
+            self.assertEqual(u'thirdwitch', user.nick)
+            self.assertEqual(u'participant', user.role)
 
         self._createRoom()
@@ -558 +559 @@
         query = iq.query
         self.assertNotIdentical(None, query)
-        self.assertEquals(NS_MUC_ADMIN, query.uri)
+        self.assertEqual(NS_MUC_ADMIN, query.uri)
 
         response = toResponse(iq, 'result')