Changeset 40:2bcb10fb4da4 for wokkel/test/test_component.py

Timestamp:

Oct 18, 2008, 12:18:02 PM (14 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/trunk@112

Message:

Track changes to Twisted branch for the XMPP router.

File:

• wokkel/test/test_component.py (modified) (14 diffs)

wokkel/test/test_component.py

@@ -24 +24 @@
 
     def setUp(self):
-        self.router = component.RouterService()
+        self.router = component.Router()
         self.component = component.InternalComponent(self.router, 'component')
 
@@ -114 +114 @@
         message = domish.Element((None, 'message'))
 
+        self.router.route = fn
         self.component.startService()
-        self.router.routes['component'].addObserver('/message', fn)
         self.component.send(message)
 
@@ -122 +122 @@
 
 
-class RouterServiceTest(unittest.TestCase):
-    """
-    Tests for L{component.RouterService}.
+class RouterTest(unittest.TestCase):
+    """
+    Tests for L{component.Router}.
     """
 
@@ -131 +131 @@
         Test route registration and routing on incoming stanzas.
         """
-        router = component.RouterService()
+        router = component.Router()
         routed = []
         router.route = lambda element: routed.append(element)
@@ -151 +151 @@
         component1 = XmlPipe()
         component2 = XmlPipe()
-        router = component.RouterService()
+        router = component.Router()
         router.addRoute('component1.example.org', component1.sink)
         router.addRoute('component2.example.org', component2.sink)
@@ -158 +158 @@
         component2.source.addObserver('/*',
                                       lambda element: outgoing.append(element))
-        stanza = domish.Element((None, 'route'))
+        stanza = domish.Element((None, 'presence'))
         stanza['from'] = 'component1.example.org'
         stanza['to'] = 'component2.example.org'
-        stanza.addElement('presence')
         component1.source.send(stanza)
         self.assertEquals([stanza], outgoing)
@@ -176 +175 @@
         component1 = XmlPipe()
         s2s = XmlPipe()
-        router = component.RouterService()
+        router = component.Router()
         router.addRoute('component1.example.org', component1.sink)
         router.addRoute(None, s2s.sink)
@@ -182 +181 @@
         outgoing = []
         s2s.source.addObserver('/*', lambda element: outgoing.append(element))
-        stanza = domish.Element((None, 'route'))
+        stanza = domish.Element((None, 'presence'))
         stanza['from'] = 'component1.example.org'
         stanza['to'] = 'example.com'
-        stanza.addElement('presence')
         component1.source.send(stanza)
         self.assertEquals([stanza], outgoing)
@@ -211 +209 @@
 
     def test_streamStarted(self):
+        """
+        The received stream header should set several attributes.
+        """
         observers = []
 
@@ -249 +250 @@
 
     def test_streamStartedNoTo(self):
+        """
+        The received stream header should have a 'to' attribute.
+        """
         streamErrors = []
 
@@ -274 +278 @@
         self.assertEqual('1234', handshakes[-1])
 
+    def test_onElementNotHandshake(self):
+        """
+        Reject elements that are not handshakes
+        """
+        handshakes = []
+        streamErrors = []
+
+        xs = self.xmlstream
+        xs.authenticator.onHandshake = handshakes.append
+        xs.sendStreamError = streamErrors.append
+
+        element = domish.Element(('jabber:component:accept', 'message'))
+        xs.authenticator.onElement(element)
+        self.assertFalse(handshakes)
+        self.assertEquals('not-authorized', streamErrors[-1].condition)
+
+
     def test_onHandshake(self):
-        xs = self.xmlstream
+        """
+        Receiving a handshake matching the secret authenticates the stream.
+        """
+        authd = []
+
+        def authenticated(xs):
+            authd.append(xs)
+
+        xs = self.xmlstream
+        xs.addOnetimeObserver(xmlstream.STREAM_AUTHD_EVENT, authenticated)
         xs.sid = '1234'
         theHash = '32532c0f7dbf1253c095b18b18e36d38d94c1256'
         xs.authenticator.onHandshake(theHash)
         self.assertEqual('<handshake/>', self.output[-1])
+        self.assertEquals(1, len(authd))
 
 
     def test_onHandshakeWrongHash(self):
+        """
+        Receiving a bad handshake should yield a stream error.
+        """
         streamErrors = []
         authd = []
 
-        def authenticated(self, xs):
+        def authenticated(xs):
             authd.append(xs)
 
@@ -301 +335 @@
 
 
-class ComponentServerTest(unittest.TestCase):
-    """
-    Tests for L{component.ComponentServer}.
+class XMPPComponentServerFactoryTest(unittest.TestCase):
+    """
+    Tests for L{component.XMPPComponentServerFactory}.
     """
 
     def setUp(self):
-        self.router = component.RouterService()
-        self.server = component.ComponentServer(self.router)
-        self.xmlstream = self.server.factory.buildProtocol(None)
+        self.router = component.Router()
+        self.factory = component.XMPPComponentServerFactory(self.router,
+                                                            'secret')
+        self.xmlstream = self.factory.buildProtocol(None)
         self.xmlstream.thisEntity = JID('component.example.org')
 
@@ -320 +355 @@
                                 xmlstream.STREAM_CONNECTED_EVENT)
         self.assertEqual(0, self.xmlstream.serial)
-        self.assertEqual(1, self.server.serial)
+        self.assertEqual(1, self.factory.serial)
         self.assertIdentical(None, self.xmlstream.rawDataInFn)
         self.assertIdentical(None, self.xmlstream.rawDataOutFn)
@@ -329 +364 @@
         Setting logTraffic should set up raw data loggers.
         """
-        self.server.logTraffic = True
+        self.factory.logTraffic = True
         self.xmlstream.dispatch(self.xmlstream,
                                 xmlstream.STREAM_CONNECTED_EVENT)