Changeset 72:d48789c4c484

Timestamp:

07/21/2009 20:00:12 (12 months ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

convert_revision:

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

Message:

Add a jid attribute to XMPPClient that is updated with the current JID.

Author: ralphm.
Fixes #18.

Location:

wokkel

Files:

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

wokkel/client.py

@@ -80 +80 @@
 
 
+
 class XMPPClient(StreamManager, service.Service):
     """
@@ -86 +87 @@
 
     def __init__(self, jid, password, host=None, port=5222):
+        self.jid = jid
         self.domain = jid.host
         self.host = host
@@ -94 +96 @@
         StreamManager.__init__(self, factory)
 
+
     def startService(self):
         service.Service.startService(self)
 
         self._connection = self._getConnection()
+
 
     def stopService(self):
@@ -104 +108 @@
         self.factory.stopTrying()
         self._connection.disconnect()
+
+
+    def _authd(self, xs):
+        """
+        Called when the stream has been initialized.
+
+        Save the JID that we were assigned by the server, as the resource might
+        differ from the JID we asked for. This is stored on the authenticator
+        by its constituent initializers.
+        """
+        self.jid = self.factory.authenticator.jid
+        StreamManager._authd(self, xs)
+
 
     def initializationFailed(self, reason):
@@ -115 +132 @@
         reason.raiseException()
 
+
     def _getConnection(self):
         if self.host:
@@ -122 +140 @@
             c.connect()
             return c
+
 
 

wokkel/test/test_client.py

@@ -21 +21 @@
 from wokkel import client
 from wokkel.test.test_compat import BootstrapMixinTest
+
+class XMPPClientTest(unittest.TestCase):
+    """
+    Tests for L{client.XMPPClient}.
+    """
+
+    def setUp(self):
+        self.client = client.XMPPClient(JID('user@example.org'), 'secret')
+
+
+    def test_jid(self):
+        """
+        Make sure the JID we pass is stored on the client.
+        """
+        self.assertEquals(JID('user@example.org'), self.client.jid)
+
+
+    def test_jidWhenInitialized(self):
+        """
+        Make sure that upon login, the JID is updated from the authenticator.
+        """
+        xs = self.client.factory.buildProtocol(None)
+        self.client.factory.authenticator.jid = JID('user@example.org/test')
+        xs.dispatch(xs, xmlstream.STREAM_AUTHD_EVENT)
+        self.assertEquals(JID('user@example.org/test'), self.client.jid)
+
+
 
 class DeferredClientFactoryTest(BootstrapMixinTest):