Changeset 113:cb4051e2f51a for wokkel/test/test_muc.py

Timestamp:

Oct 7, 2008, 11:47:13 PM (14 years ago)

Author:

Christopher Zorn <tofu@…>

Branch:

wokkel-muc-client-support-24

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/branches/wokkel-muc-client-support-24@83

Message:

some documentation and additions to the interface, also some more abstraction and tests

File:

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

wokkel/test/test_muc.py

@@ -57 +57 @@
         self.user_jid = JID('test@jabber.org/Testing')
 
+    def _createRoom(self):
+        # create a room
+        self.current_room = muc.Room(self.test_room, self.test_srv, self.test_nick)
+        self.protocol._setRoom(self.current_room)
+
+
     def test_interface(self):
         """
@@ -64 +70 @@
 
 
-    def test_presence(self):
-        """Test receiving room presence
+    def test_userJoinedRoom(self):
+        """Test receiving a user joined event.
         """
         p = muc.UserPresence()
+        p['to'] = self.user_jid.full()
+        p['from'] = self.room_jid.full()
+
+        # create a room
+        self._createRoom()
+
+        def userPresence(room, user):
+            self.failUnless(room.name==self.test_room, 'Wrong room name')
+            self.failUnless(room.inRoster(user), 'User not in roster')
+                           
         
-        def userPresence(prs):
-            self.failUnless(len(prs.children)==1, 'Not enough children')
-            self.failUnless(getattr(prs,'x',None), 'No x element')
-                   
-        
-        d, self.protocol.receivedUserPresence = calledAsync(userPresence)
+        d, self.protocol.userJoinedRoom = calledAsync(userPresence)
         self.stub.send(p)
         return d
@@ -83 +94 @@
         """
         m = muc.GroupChat('test@test.com',body='test')
-        
-        def groupChat(elem):
-            self.failUnless(elem.name=='message','Wrong stanza')
-            self.failUnless(elem['type'] == 'groupchat', 'Wrong attribute')
+        m['from'] = self.room_jid.full()
+
+        self._createRoom()
+
+        def groupChat(room, user, message):
+            self.failUnless(message=='test', "Wrong group chat message")
+            self.failUnless(room.name==self.test_room, 'Wrong room name')
                            
         
@@ -230 +244 @@
         return d
 
-        self.fail('Not Implemented')
         
 
@@ -248 +261 @@
         """
         m = muc.HistoryMessage(self.room_jid.userhost(), self.protocol._makeTimeStamp(), body='test')
-        
-        def roomHistory(h):
-            self.failUnless(getattr(h,'delay',None), 'No delay element')
+        m['from'] = self.room_jid.full()
+        
+        self._createRoom()
+
+        def roomHistory(room, user, body, stamp, frm=None):
+            self.failUnless(body=='test', "wrong message body")
+            self.failUnless(stamp, 'Does not have a history stamp')