Changeset 42:93675ba90f36 for wokkel

Timestamp:

Oct 24, 2008, 2:40:48 PM (14 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

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

Message:

Change clientCreator to use the JID passed to the factory correctly.

Author: ralphm
Fixes #37.

Location:

wokkel

Files:

• client.py (modified) (1 diff)
• test/test_client.py (modified) (3 diffs)

wokkel/client.py

@@ -182 +182 @@
 
 def clientCreator(factory):
-    domain = factory.authenticator.jid.host
+    domain = factory.jid.host
     c = SRVConnector(reactor, 'xmpp-client', domain, factory)
     c.connect()

wokkel/test/test_client.py

@@ -6 +6 @@
 """
 
+from twisted.internet import defer
+from twisted.trial import unittest
 from twisted.words.protocols.jabber import xmlstream
 from twisted.words.protocols.jabber.client import XMPPAuthenticator
@@ -12 +14 @@
 from twisted.words.protocols.jabber.xmlstream import INIT_FAILED_EVENT
 
-from wokkel.client import DeferredClientFactory
+from wokkel import client
 from wokkel.test.test_compat import BootstrapMixinTest
 
 class DeferredClientFactoryTest(BootstrapMixinTest):
-
+    """
+    Tests for L{client.DeferredClientFactory}.
+    """
 
     def setUp(self):
-        self.factory = DeferredClientFactory(JID('user@example.org'), 'secret')
+        self.factory = client.DeferredClientFactory(JID('user@example.org'),
+                                                    'secret')
 
 
@@ -71 +76 @@
         self.assertFailure(self.factory.deferred, TestException)
         return self.factory.deferred
+
+
+
+class ClientCreatorTest(unittest.TestCase):
+    """
+    Tests for L{client.clientCreator}.
+    """
+
+    def test_call(self):
+        """
+        The factory is passed to an SRVConnector and a connection initiated.
+        """
+
+        d1 = defer.Deferred()
+        factory = client.DeferredClientFactory(JID('user@example.org'),
+                                               'secret')
+
+        def cb(connector):
+            self.assertEqual('xmpp-client', connector.service)
+            self.assertEqual('example.org', connector.domain)
+            self.assertEqual(factory, connector.factory)
+
+        def connect(connector):
+            d1.callback(connector)
+
+        d1.addCallback(cb)
+        self.patch(client.SRVConnector, 'connect', connect)
+
+        d2 = client.clientCreator(factory)
+        self.assertEqual(factory.deferred, d2)
+
+        return d1