summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-02-14 16:18:44 -0500
committerLance Stout <lancestout@gmail.com>2011-02-14 16:18:44 -0500
commita278f79bdbdb842193092a9e0176ecb8b1867762 (patch)
treec55be3e45f61133c01969be201d3a6476dbe5762 /tests
parent606c369173e7a31d793540d90e425a78c2a81253 (diff)
parentd709f8db657aa1d1314082d842dd29e2546739c4 (diff)
downloadslixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.gz
slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.bz2
slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.xz
slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.zip
Merge branch 'develop' into roster
Conflicts: sleekxmpp/clientxmpp.py
Diffstat (limited to 'tests')
-rw-r--r--tests/test_stanza_xep_0009.py55
-rw-r--r--tests/test_stanza_xep_0060.py2
-rw-r--r--tests/test_stream_exceptions.py37
3 files changed, 93 insertions, 1 deletions
diff --git a/tests/test_stanza_xep_0009.py b/tests/test_stanza_xep_0009.py
new file mode 100644
index 00000000..6186dd90
--- /dev/null
+++ b/tests/test_stanza_xep_0009.py
@@ -0,0 +1,55 @@
+"""
+ SleekXMPP: The Sleek XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
+ This file is part of SleekXMPP.
+
+ See the file LICENSE for copying permission.
+"""
+
+from sleekxmpp.plugins.xep_0009.stanza.RPC import RPCQuery, MethodCall, \
+ MethodResponse
+from sleekxmpp.plugins.xep_0009.binding import py2xml
+from sleekxmpp.stanza.iq import Iq
+from sleekxmpp.test.sleektest import SleekTest
+from sleekxmpp.xmlstream.stanzabase import register_stanza_plugin
+import unittest
+
+
+
+class TestJabberRPC(SleekTest):
+
+ def setUp(self):
+ register_stanza_plugin(Iq, RPCQuery)
+ register_stanza_plugin(RPCQuery, MethodCall)
+ register_stanza_plugin(RPCQuery, MethodResponse)
+
+ def testMethodCall(self):
+ iq = self.Iq()
+ iq['rpc_query']['method_call']['method_name'] = 'system.exit'
+ iq['rpc_query']['method_call']['params'] = py2xml(*())
+ self.check(iq, """
+ <iq>
+ <query xmlns="jabber:iq:rpc">
+ <methodCall>
+ <methodName>system.exit</methodName>
+ <params />
+ </methodCall>
+ </query>
+ </iq>
+ """, use_values=False)
+
+ def testMethodResponse(self):
+ iq = self.Iq()
+ iq['rpc_query']['method_response']['params'] = py2xml(*())
+ self.check(iq, """
+ <iq>
+ <query xmlns="jabber:iq:rpc">
+ <methodResponse>
+ <params />
+ </methodResponse>
+ </query>
+ </iq>
+ """, use_values=False)
+
+suite = unittest.TestLoader().loadTestsFromTestCase(TestJabberRPC)
+
diff --git a/tests/test_stanza_xep_0060.py b/tests/test_stanza_xep_0060.py
index 5d455236..8e6e820d 100644
--- a/tests/test_stanza_xep_0060.py
+++ b/tests/test_stanza_xep_0060.py
@@ -181,7 +181,7 @@ class TestPubsubStanzas(SleekTest):
<pubsub xmlns="http://jabber.org/protocol/pubsub">
<subscribe node="cheese" jid="fritzy@netflint.net/sleekxmpp">
<options node="cheese" jid="fritzy@netflint.net/sleekxmpp">
- <x xmlns="jabber:x:data" type="form">
+ <x xmlns="jabber:x:data" type="submit">
<field var="pubsub#title" type="text-single">
<value>this thing is awesome</value>
</field>
diff --git a/tests/test_stream_exceptions.py b/tests/test_stream_exceptions.py
index e1b70d39..a4598a10 100644
--- a/tests/test_stream_exceptions.py
+++ b/tests/test_stream_exceptions.py
@@ -1,5 +1,7 @@
import sys
import sleekxmpp
+from sleekxmpp.xmlstream.matcher import MatchXPath
+from sleekxmpp.xmlstream.handler import Callback
from sleekxmpp.exceptions import XMPPError
from sleekxmpp.test import *
@@ -46,6 +48,41 @@ class TestStreamExceptions(SleekTest):
</message>
""", use_values=False)
+ def testIqErrorException(self):
+ """Test using error exceptions with Iq stanzas."""
+
+ def handle_iq(iq):
+ raise XMPPError(condition='feature-not-implemented',
+ text="We don't do things that way here.",
+ etype='cancel',
+ clear=False)
+
+ self.stream_start()
+ self.xmpp.register_handler(
+ Callback(
+ 'Test Iq',
+ MatchXPath('{%s}iq/{test}query' % self.xmpp.default_ns),
+ handle_iq))
+
+ self.recv("""
+ <iq type="get" id="0">
+ <query xmlns="test" />
+ </iq>
+ """)
+
+ self.send("""
+ <iq type="error" id="0">
+ <query xmlns="test" />
+ <error type="cancel">
+ <feature-not-implemented
+ xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
+ <text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">
+ We don&apos;t do things that way here.
+ </text>
+ </error>
+ </iq>
+ """, use_values=False)
+
def testThreadedXMPPErrorException(self):
"""Test raising an XMPPError exception in a threaded handler."""