Changeset 108:50e3c368f2f3 for wokkel/test/test_muc.py

Timestamp:

Sep 30, 2008, 7:08:45 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@69

Message:

add basic errors and disco stuff, still need iq and message parts re #24

File:

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

wokkel/test/test_muc.py

@@ -14 +14 @@
 from twisted.words.protocols.jabber.jid import JID
 
-from wokkel import data_form, iwokkel, muc, shim
+from wokkel import data_form, iwokkel, muc, shim, disco
 from wokkel.generic import parseXml
 from wokkel.test.helpers import XmlStreamStub
@@ -58 +58 @@
 
 
-    def test_presence(self):
-        """Test receiving room presence 
+
+    def test_discoServerSupport(self):
+        """Test for disco support from a server.
         """
-        p = muc.UserPresence()
+        test_srv = 'shakespeare.lit'
 
-        def userPresence(prs):
-            self.failUnless(len(prs.children)==1, 'Not enough children')
-            self.failUnless(getattr(prs,'x',None), 'No x element')
+        def cb(query):
+            # check namespace
+            self.failUnless(query.uri==disco.NS_INFO, 'Wrong namespace')
             
 
-        d, self.protocol.userPresence = calledAsync(userPresence)
-        self.stub.send(p)
+        d = self.protocol.disco(test_srv)
+        d.addCallback(cb)
+
+        iq = self.stub.output[-1]
+        
+        # send back a response
+        response = toResponse(iq, 'result')
+        response.addElement('query', disco.NS_INFO)
+        # need to add information to response
+        response.query.addChild(disco.DiscoFeature(muc.NS))
+        response.query.addChild(disco.DiscoIdentity(category='conference',
+                                                    name='Macbeth Chat Service',
+                                                    type='text'))
+        
+        self.stub.send(response)
         return d
+        
 
+        
     def test_joinRoom(self):
         """Test joining a room
@@ -79 +95 @@
         test_nick = 'Nick'
 
-        # p = muc.BasicPresenc(to=)
-
         def cb(room):
             self.assertEquals(test_room, room.name)
 
-        d = self.protocol.joinRoom(test_srv, test_room, test_nick)
+        d = self.protocol.join(test_srv, test_room, test_nick)
         d.addCallback(cb)
+
+        prs = self.stub.output[-1]
+        self.failUnless(prs.name=='presence', "Need to be presence")
+        self.failUnless(getattr(prs, 'x', None), 'No muc x element')
+
+        # send back user presence, they joined        
+        response = muc.UserPresence(frm=test_room+'@'+test_srv+'/'+test_nick)
+        self.stub.send(response)
+        return d
+
+
+    def test_joinRoomForbidden(self):
+        """Test joining a room and getting an error
+        """
+        test_room = 'test'
+        test_srv  = 'conference.example.org'
+        test_nick = 'Nick'
+
+        # p = muc.BasicPresenc(to=)
+
+        def cb(error):
+            self.failUnless(isinstance(error.value,muc.PresenceError), 'Wrong type')
+            self.failUnless(error.value['type']=='error', 'Not an error returned')
+            
+            
+        d = self.protocol.join(test_srv, test_room, test_nick)
+        d.addBoth(cb)
 
         prs = self.stub.output[-1]
@@ -92 +133 @@
         # send back user presence, they joined
         
-        response = muc.UserPresence()
-        print response.toXml()
+        response = muc.PresenceError(error=muc.MUCError('auth',
+                                                        'forbidden'
+                                                        ),
+                                     frm=test_room+'@'+test_srv+'/'+test_nick)
         self.stub.send(response)
-        return d
-
-class MucServiceTest(unittest.TestCase):
-    """
-    Tests for L{muc.MUCService}.
-    """
-
-    def setUp(self):
-        self.service = muc.MUCService()
-
-    def handleRequest(self, xml):
-        """
-        Find a handler and call it directly
-        """
-        handler = None
-        iq = parseXml(xml)
-        for queryString, method in self.service.iqHandlers.iteritems():
-            if xpath.internQuery(queryString).matches(iq):
-                handler = getattr(self.service, method)
-
-        if handler:
-            d = defer.maybeDeferred(handler, iq)
-        else:
-            d = defer.fail(NotImplementedError())
-
-        return d
-
-
-    def test_interface(self):
-        """
-        Do instances of L{muc.MucService} provide L{iwokkel.IMucService}?
-        """
-        verify.verifyObject(iwokkel.IMUCService, self.service)
-
-
+        return d