source: ralphm-patches/component_multiple.patch @ 2:ec684efc6a7b

wokkel/component.py

@@ -85 +85 @@
     Instead of opening a socket to connect to a router, like L{Component},
     components of this type connect to a router in the same process. This
     allows for one-process XMPP servers.
+
+    @ivar domains: Domains (as C{str}) this component will handle traffic for.
+    @type domains: L{set}
     """
 
-    def __init__(self, router, domain):
+    def __init__(self, router, domain=None):
         XMPPHandlerCollection.__init__(self)
-        self.router = router
-        self.domain = domain
+
+        self._router = router
+        self.domains = set()
+        if domain:
+            self.domains.add(domain)
 
         self.xmlstream = None
 
@@ -100 +106 @@
         """
         service.Service.startService(self)
 
-        self.pipe = XmlPipe()
-        self.xmlstream = self.pipe.source
-        self.router.addRoute(self.domain, self.pipe.sink)
+        self._pipe = XmlPipe()
+        self.xmlstream = self._pipe.source
+
+        for domain in self.domains:
+            self._router.addRoute(domain, self._pipe.sink)
 
         for e in self:
             e.makeConnection(self.xmlstream)
@@ -115 +123 @@
         """
         service.Service.stopService(self)
 
-        self.router.removeRoute(self.domain, self.pipe.sink)
-        self.pipe = None
+        for domain in self.domains:
+            self._router.removeRoute(domain, self._pipe.sink)
+
+        self._pipe = None
         self.xmlstream = None
 
         for e in self:

wokkel/test/test_component.py

@@ -41 +41 @@
         verifyObject(IXMPPHandlerCollection, self.component)
 
 
-    def test_startService(self):
+
+    def test_startServiceRunning(self):
         """
-        Starting the service creates a new route and hooks up handlers.
+        Starting the service makes it running.
         """
+        self.assertFalse(self.component.running)
+        self.component.startService()
+        self.assertTrue(self.component.running)
 
+
+    def test_startServiceAddRoute(self):
+        """
+        Starting the service creates a new route.
+        """
+        self.component.startService()
+        self.assertIn('component', self.router.routes)
+
+
+    def test_startServiceNoDomain(self):
+        self.component = component.InternalComponent(self.router)
+        self.component.startService()
+
+
+    def test_startServiceAddMultipleRoutes(self):
+        """
+        Starting the service creates a new route.
+        """
+        self.component.domains.add('component2')
+        self.component.startService()
+        self.assertIn('component', self.router.routes)
+        self.assertIn('component2', self.router.routes)
+
+
+    def test_startServiceHandlerDispatch(self):
+        """
+        Starting the service hooks up handlers.
+        """
         events = []
 
         class TestHandler(XMPPHandler):
@@ -56 +88 @@
 
         TestHandler().setHandlerParent(self.component)
 
-        self.assertFalse(self.component.running)
-
         self.component.startService()
-
-        self.assertTrue(self.component.running)
-        self.assertIn('component', self.router.routes)
-
         self.assertEquals([], events)
         self.component.xmlstream.dispatch(None, '//event/test')
         self.assertEquals([None], events)
 
 
-    def test_stopService(self):
+    def test_stopServiceNotRunning(self):
         """
-        Stopping the service removes the route and disconnects handlers.
+        Stopping the service makes it not running.
         """
+        self.component.startService()
+        self.component.stopService()
+        self.assertFalse(self.component.running)
 
+
+    def test_stopServiceRemoveRoute(self):
+        """
+        Stopping the service removes routes.
+        """
+        self.component.startService()
+        self.component.stopService()
+        self.assertNotIn('component', self.router.routes)
+
+
+    def test_stopServiceNoDomain(self):
+        self.component = component.InternalComponent(self.router)
+        self.component.startService()
+        self.component.stopService()
+
+
+    def test_startServiceRemoveMultipleRoutes(self):
+        """
+        Starting the service creates a new route.
+        """
+        self.component.domains.add('component2')
+        self.component.startService()
+        self.component.stopService()
+        self.assertNotIn('component', self.router.routes)
+        self.assertNotIn('component2', self.router.routes)
+
+
+    def test_stopServiceHandlerDispatch(self):
+        """
+        Stopping the service disconnects handlers.
+        """
         events = []
 
         class TestHandler(XMPPHandler):
@@ -84 +144 @@
 
         self.component.startService()
         self.component.stopService()
-
-        self.assertFalse(self.component.running)
         self.assertEquals(1, len(events))
-        self.assertNotIn('component', self.router.routes)
 
 
     def test_addHandler(self):