From d0c506f93010f62cd447ce29f98ab991f521ec99 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Fri, 5 Nov 2010 14:45:58 -0400
Subject: Simplified SleekTest.

* check_stanza does not require stanza_class parameter. Introspection!
* check_message, check_iq, and check_presence removed -- use check
  instead.
* stream_send_stanza, stream_send_message, stream_send_iq, and
  stream_send_presence removed -- use send instead.
* Use recv instead of recv_message, recv_presence, etc.
* check_jid instead of check_JID
* stream_start may accept multi=True to return a new SleekTest instance
  for testing multiple streams at once.
---
 tests/test_stanza_xep_0033.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests/test_stanza_xep_0033.py')

diff --git a/tests/test_stanza_xep_0033.py b/tests/test_stanza_xep_0033.py
index 378946a0..ec9a5309 100644
--- a/tests/test_stanza_xep_0033.py
+++ b/tests/test_stanza_xep_0033.py
@@ -11,7 +11,7 @@ class TestAddresses(SleekTest):
         """Testing adding extended stanza address."""
         msg = self.Message()
         msg['addresses'].addAddress(atype='to', jid='to@header1.org')
-        self.check_message(msg, """
+        self.check(msg, """
         <message>
           <addresses xmlns="http://jabber.org/protocol/address">
             <address jid="to@header1.org" type="to" />
@@ -23,7 +23,7 @@ class TestAddresses(SleekTest):
         msg['addresses'].addAddress(atype='replyto',
                                     jid='replyto@header1.org',
                                     desc='Reply address')
-        self.check_message(msg, """
+        self.check(msg, """
           <message>
             <addresses xmlns="http://jabber.org/protocol/address">
               <address jid="replyto@header1.org" type="replyto" desc="Reply address" />
@@ -53,14 +53,14 @@ class TestAddresses(SleekTest):
              'jid':'cc@header2.org'},
             {'type':'bcc',
              'jid':'bcc@header2.org'}])
-        self.check_message(msg, xmlstring)
+        self.check(msg, xmlstring)
 
         msg = self.Message()
         msg['addresses']['replyto'] = [{'jid':'replyto@header1.org',
                                                 'desc':'Reply address'}]
         msg['addresses']['cc'] = [{'jid':'cc@header2.org'}]
         msg['addresses']['bcc'] = [{'jid':'bcc@header2.org'}]
-        self.check_message(msg, xmlstring)
+        self.check(msg, xmlstring)
 
     def testAddURI(self):
         """Testing adding URI attribute to extended stanza address."""
@@ -69,7 +69,7 @@ class TestAddresses(SleekTest):
         addr = msg['addresses'].addAddress(atype='to',
                                            jid='to@header1.org',
                                            node='foo')
-        self.check_message(msg, """
+        self.check(msg, """
           <message>
             <addresses xmlns="http://jabber.org/protocol/address">
               <address node="foo" jid="to@header1.org" type="to" />
@@ -78,7 +78,7 @@ class TestAddresses(SleekTest):
         """)
 
         addr['uri'] = 'mailto:to@header2.org'
-        self.check_message(msg, """
+        self.check(msg, """
           <message>
             <addresses xmlns="http://jabber.org/protocol/address">
               <address type="to" uri="mailto:to@header2.org" />
@@ -99,13 +99,13 @@ class TestAddresses(SleekTest):
 
         msg = self.Message()
         addr = msg['addresses'].addAddress(jid='to@header1.org', atype='to')
-        self.check_message(msg, xmlstring % '')
+        self.check(msg, xmlstring % '')
 
         addr['delivered'] = True
-        self.check_message(msg, xmlstring % 'delivered="true"')
+        self.check(msg, xmlstring % 'delivered="true"')
 
         addr['delivered'] = False
-        self.check_message(msg, xmlstring % '')
+        self.check(msg, xmlstring % '')
 
 
 suite = unittest.TestLoader().loadTestsFromTestCase(TestAddresses)
-- 
cgit v1.2.3