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_stream_presence.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests/test_stream_presence.py')

diff --git a/tests/test_stream_presence.py b/tests/test_stream_presence.py
index ca67f1df..1d5caa98 100644
--- a/tests/test_stream_presence.py
+++ b/tests/test_stream_presence.py
@@ -29,7 +29,7 @@ class TestStreamPresence(SleekTest):
         self.xmpp.add_event_handler('got_offline', got_offline)
         self.xmpp.add_event_handler('presence_unavailable', unavailable)
 
-        self.stream_recv("""
+        self.recv("""
           <presence type="unavailable" from="otheruser@localhost" />
         """)
 
@@ -54,7 +54,7 @@ class TestStreamPresence(SleekTest):
         #
         # We use the stream to initialize the roster to make
         # the test independent of the roster implementation.
-        self.stream_recv("""
+        self.recv("""
           <iq type="set">
             <query xmlns="jabber:iq:roster">
               <item jid="otheruser@localhost"
@@ -67,12 +67,12 @@ class TestStreamPresence(SleekTest):
         """)
 
         # Contact comes online.
-        self.stream_recv("""
+        self.recv("""
           <presence from="otheruser@localhost/foobar" />
         """)
 
         # Contact goes offline, should trigger got_offline.
-        self.stream_recv("""
+        self.recv("""
           <presence from="otheruser@localhost/foobar"
                     type="unavailable" />
         """)
@@ -98,7 +98,7 @@ class TestStreamPresence(SleekTest):
         self.xmpp.add_event_handler('presence_available', presence_available)
         self.xmpp.add_event_handler('got_online', got_online)
 
-        self.stream_recv("""
+        self.recv("""
           <presence from="user@localhost" />
         """)
 
@@ -135,15 +135,15 @@ class TestStreamPresence(SleekTest):
         self.xmpp.auto_authorize = True
         self.xmpp.auto_subscribe = True
 
-        self.stream_recv("""
+        self.recv("""
           <presence from="user@localhost" type="subscribe" />
         """)
 
-        self.stream_send_presence("""
+        self.send("""
           <presence to="user@localhost" type="subscribed" />
         """)
 
-        self.stream_send_presence("""
+        self.send("""
           <presence to="user@localhost" type="subscribe" />
         """)
 
@@ -172,11 +172,11 @@ class TestStreamPresence(SleekTest):
         # With this setting we should reject all subscriptions.
         self.xmpp.auto_authorize = False
 
-        self.stream_recv("""
+        self.recv("""
           <presence from="user@localhost" type="subscribe" />
         """)
 
-        self.stream_send_presence("""
+        self.send("""
           <presence to="user@localhost" type="unsubscribed" />
         """)
 
-- 
cgit v1.2.3