Changeset 165:76a61f5aa343 for wokkel/test/test_subprotocols.py

Timestamp:

Jan 22, 2012, 2:51:25 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Cleanups leading up to Wokkel 0.7.0.

As we now depend on Twisted 10.0.0 or higher, the following classes and
interfaces were deprecated:

• wokkel.compat.BootstrapMixin?
• wokkel.compat.XmlStreamServerFactory?
• wokkel.iwokkel.IXMPPHandler
• wokkel.iwokkel.IXMPPHandlerCollection
• wokkel.subprotocols.XMPPHandlerCollection

This also resolves all Pyflakes warnings, changes links for www.xmpp.org to
xmpp.org and fixes the copyright notice in LICENSE to include 2012.

File:

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

wokkel/test/test_subprotocols.py

@@ -14 +14 @@
 from twisted.python import failure
 from twisted.words.xish import domish
-from twisted.words.protocols.jabber import error, xmlstream
-
-from wokkel import generic, iwokkel, subprotocols
+from twisted.words.protocols.jabber import error, ijabber, xmlstream
+
+from wokkel import generic, subprotocols
+
+class DeprecationTest(unittest.TestCase):
+    """
+    Deprecation test for L{wokkel.subprotocols}.
+    """
+
+    def lookForDeprecationWarning(self, testmethod, attributeName, newName):
+        """
+        Importing C{testmethod} emits a deprecation warning.
+        """
+        warningsShown = self.flushWarnings([testmethod])
+        self.assertEqual(len(warningsShown), 1)
+        self.assertIdentical(warningsShown[0]['category'], DeprecationWarning)
+        self.assertEqual(
+            warningsShown[0]['message'],
+            "wokkel.subprotocols." + attributeName + " "
+            "was deprecated in Wokkel 0.7.0: Use " + newName + " instead.")
+
+
+    def test_xmppHandlerCollection(self):
+        """
+        L{subprotocols.XMPPHandlerCollection} is deprecated.
+        """
+        from wokkel.subprotocols import XMPPHandlerCollection
+        XMPPHandlerCollection
+        self.lookForDeprecationWarning(
+                self.test_xmppHandlerCollection,
+                "XMPPHandlerCollection",
+                "twisted.words.protocols.jabber.xmlstream."
+                    "XMPPHandlerCollection")
+
+
 
 class DummyFactory(object):
@@ -88 +120 @@
     def test_interface(self):
         """
-        L{xmlstream.XMPPHandler} implements L{iwokkel.IXMPPHandler}.
-        """
-        verifyObject(iwokkel.IXMPPHandler, subprotocols.XMPPHandler())
+        L{xmlstream.XMPPHandler} implements L{ijabber.IXMPPHandler}.
+        """
+        verifyObject(ijabber.IXMPPHandler, subprotocols.XMPPHandler())
 
 
@@ -155 +187 @@
         self.assertIdentical(request, handler.parent.requests[-1])
         return d
-
-
-
-class XMPPHandlerCollectionTest(unittest.TestCase):
-    """
-    Tests for L{subprotocols.XMPPHandlerCollection}.
-    """
-
-    def setUp(self):
-        self.collection = subprotocols.XMPPHandlerCollection()
-
-
-    def test_interface(self):
-        """
-        L{subprotocols.StreamManager} implements L{iwokkel.IXMPPHandlerCollection}.
-        """
-        verifyObject(iwokkel.IXMPPHandlerCollection, self.collection)
-
-
-    def test_addHandler(self):
-        """
-        Test the addition of a protocol handler.
-        """
-        handler = DummyXMPPHandler()
-        handler.setHandlerParent(self.collection)
-        self.assertIn(handler, self.collection)
-        self.assertIdentical(self.collection, handler.parent)
-
-
-    def test_removeHandler(self):
-        """
-        Test removal of a protocol handler.
-        """
-        handler = DummyXMPPHandler()
-        handler.setHandlerParent(self.collection)
-        handler.disownHandlerParent(self.collection)
-        self.assertNotIn(handler, self.collection)
-        self.assertIdentical(None, handler.parent)
 
 
@@ -319 +313 @@
         handler = FailureReasonXMPPHandler()
         handler.setHandlerParent(sm)
-        xs = xmlstream.XmlStream(xmlstream.Authenticator())
+        xmlstream.XmlStream(xmlstream.Authenticator())
         sm._disconnected(failure.Failure(Exception("no reason")))
         self.assertEquals(True, handler.gotFailureReason)