projects / punjab-krb5-preauth / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e8ca42e)
Add and use TestCase.get_body_node helper.
authorGlenn Maynard <glenn@zewt.org>
Fri, 29 Apr 2011 06:37:35 +0000 (02:37 -0400)
committerGlenn Maynard <glenn@zewt.org>
Fri, 29 Apr 2011 06:37:35 +0000 (02:37 -0400)
This handles most of the common <body/> node setup used by each test.

tests/test_basic.py patch | blob | history
tests/xep124.py patch | blob | history

diff --git a/tests/test_basic.py b/tests/test_basic.py
index 19a3e03..569638b 100644 (file)
--- a/tests/test_basic.py
+++ b/tests/test_basic.py
@@ -86,6 +86,41 @@ class TestCase(unittest.TestCase):
         self.rid = self.rid - 1
         return self.send(ext)
 
+    def get_body_node(self, ext=None, sid=None, rid=None, useKey=False, connect=False, **kwargs):
+        self.rid = self.rid + 1
+        if sid is None:
+            sid = self.sid
+        if rid is None:
+            rid = self.rid
+        b = domish.Element(("http://jabber.org/protocol/httpbind","body"))
+        b['content']  = 'text/xml; charset=utf-8'
+        b['hold'] = '0'
+        b['wait'] = '60'
+        b['ack'] = '1'
+        b['xml:lang'] = 'en'
+        b['rid'] = str(rid)
+
+        if sid:
+            b['sid'] = str(sid)
+
+        if connect:
+            b['to'] = 'localhost'
+            b['route'] = 'xmpp:127.0.0.1:%i' % self.server_port
+            b['ver'] = '1.6'
+
+        if useKey:
+            self.key(b)
+
+        if ext is not None:
+            if isinstance(ext, domish.Element):
+                b.addChild(ext)
+            else:
+                b.addRawXml(ext)
+
+        for key, value in kwargs.iteritems():
+            b[key] = value
+        return b
+
     def send(self, ext = None, sid = None, rid = None):
         self.rid = self.rid + 1
         if sid is None:
@@ -170,27 +205,4 @@ class TestCase(unittest.TestCase):
         d.addCallback(cbStopListening)
 
         return d
-        
-    def getBodyXML(self, **kwargs):
-        """
-        Return the <body/> XML used by most tests.
-        """
-        options = {
-            'rid': self.rid,
-            'wait': 60,
-            'ack': 1
-        }
-        for key, value in kwargs.iteritems():
-            options[key] = value
-        keys = ["%s='%s'" % (key, value) for key, value in options.iteritems()]
-        return """
-        <body content='text/xml; charset=utf-8'
-            hold='1'
-            to='localhost'
-            route='xmpp:127.0.0.1:%(server_port)i'
-            ver='1.6'
-            xml:lang='en'
-            %(keys)s
-            xmlns='http://jabber.org/protocol/httpbind'/>
-        """ % { 'server_port': self.server_port, 'keys': " ".join(keys)}
 
diff --git a/tests/xep124.py b/tests/xep124.py
index b1703d8..606945f 100644 (file)
--- a/tests/xep124.py
+++ b/tests/xep124.py
@@ -249,7 +249,7 @@ class XEP0124TestCase(test_basic.TestCase):
             self.server_protocol.triggerInvalidXML()
             return self.send().addCallbacks(_failStreamError, _testStreamError)
 
-        return self.proxy.connect(self.getBodyXML()).addCallback(_testSessionCreate)
+        return self.proxy.connect(self.get_body_node(connect=True)).addCallback(_testSessionCreate)
 
     def testFeaturesError(self):
         """
XMPP-BOSH with Kerberos5 prebinding using SPNEGO