Changeset 46:4ee1f9c08b22 for wokkel/test/test_pubsub.py

Timestamp:

Dec 26, 2008, 2:40:11 PM (14 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

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

Message:

If provided, return NodeID in the response for Service Discovery requests.

This also renames the namespace constants to include DISCO in their name
and provides better tests and docstrings.

Author: ralphm.
Reviewer: tofu.
Fixes #7.

File:

• wokkel/test/test_pubsub.py (modified) (3 diffs)

wokkel/test/test_pubsub.py

@@ -10 +10 @@
 from twisted.trial import unittest
 from twisted.internet import defer
-from twisted.words.xish import domish, xpath
+from twisted.words.xish import domish
 from twisted.words.protocols.jabber import error
 from twisted.words.protocols.jabber.jid import JID
 
 from wokkel import data_form, iwokkel, pubsub, shim
-from wokkel.generic import parseXml
-from wokkel.test.helpers import XmlStreamStub
+from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
 
 try:
@@ -492 +491 @@
 
 
-class PubSubServiceTest(unittest.TestCase):
+class PubSubServiceTest(unittest.TestCase, TestableRequestHandlerMixin):
     """
     Tests for L{pubsub.PubSubService}.
@@ -501 +500 @@
         self.service = pubsub.PubSubService()
         self.service.send = self.stub.xmlstream.send
-
-    def handleRequest(self, xml):
-        """
-        Find a handler and call it directly
-        """
-        handler = None
-        iq = parseXml(xml)
-        for queryString, method in self.service.iqHandlers.iteritems():
-            if xpath.internQuery(queryString).matches(iq):
-                handler = getattr(self.service, method)
-
-        if handler:
-            d = defer.maybeDeferred(handler, iq)
-        else:
-            d = defer.fail(NotImplementedError())
-
-        return d
-
 
     def test_interface(self):