From 3a12cdbd131e5bb98f192c077faa6bdda8fd95c7 Mon Sep 17 00:00:00 2001
From: Dann Martens <me@dannmartens.com>
Date: Thu, 13 Jan 2011 08:40:53 +0100
Subject: Introduced new XEP-0009 into develop.

---
 tests/test_stanza_xep_0009.py | 55 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 tests/test_stanza_xep_0009.py

(limited to 'tests')

diff --git a/tests/test_stanza_xep_0009.py b/tests/test_stanza_xep_0009.py
new file mode 100644
index 00000000..f6ab7ed0
--- /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.old_0009 import py2xml
+from sleekxmpp.plugins.xep_0009.stanza.RPC import RPCQuery, MethodCall, \
+    MethodResponse
+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)        
+        
\ No newline at end of file
-- 
cgit v1.2.3


From aa1996eba60229f5c843f8d4aae8421a80b41981 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Mon, 7 Feb 2011 10:18:15 -0500
Subject: Fixed failing tests from new XEP-0009 plugin

---
 tests/test_stanza_xep_0009.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/test_stanza_xep_0009.py b/tests/test_stanza_xep_0009.py
index f6ab7ed0..6186dd90 100644
--- a/tests/test_stanza_xep_0009.py
+++ b/tests/test_stanza_xep_0009.py
@@ -6,9 +6,9 @@
     See the file LICENSE for copying permission.
 """
 
-from sleekxmpp.plugins.old_0009 import py2xml
 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
@@ -52,4 +52,4 @@ class TestJabberRPC(SleekTest):
         """, use_values=False)
         
 suite = unittest.TestLoader().loadTestsFromTestCase(TestJabberRPC)        
-        
\ No newline at end of file
+        
-- 
cgit v1.2.3


From 30da68f47bb35e67739063bea47679b9a777b16b Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Tue, 8 Feb 2011 21:09:49 -0500
Subject: Update XEP-0060 test.

---
 tests/test_stanza_xep_0060.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

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>
-- 
cgit v1.2.3


From 0d326383799a7d7bb69fec9dcd1eaf9e1a64eab8 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Fri, 11 Feb 2011 15:20:26 -0500
Subject: XMPPError exceptions can keep a stanza's contents.

This allows exceptions to include the original
content of a stanza in the error response by including
the parameter clear=False when raising the exception.
---
 tests/test_stream_exceptions.py | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'tests')

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."""
 
-- 
cgit v1.2.3