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

(limited to 'tests/test_stanza_presence.py')

diff --git a/tests/test_stanza_presence.py b/tests/test_stanza_presence.py
index 6a5a8b6e..8d043d5d 100644
--- a/tests/test_stanza_presence.py
+++ b/tests/test_stanza_presence.py
@@ -8,26 +8,26 @@ class TestPresenceStanzas(SleekTest):
         """Regression check presence['type'] = 'dnd' show value working"""
         p = self.Presence()
         p['type'] = 'dnd'
-        self.check_presence(p, "<presence><show>dnd</show></presence>")
+        self.check(p, "<presence><show>dnd</show></presence>")
 
     def testPresenceType(self):
         """Test manipulating presence['type']"""
         p = self.Presence()
         p['type'] = 'available'
-        self.check_presence(p, "<presence />")
+        self.check(p, "<presence />")
         self.failUnless(p['type'] == 'available',
             "Incorrect presence['type'] for type 'available': %s" % p['type'])
 
         for showtype in ['away', 'chat', 'dnd', 'xa']:
             p['type'] = showtype
-            self.check_presence(p, """
+            self.check(p, """
               <presence><show>%s</show></presence>
             """ % showtype)
             self.failUnless(p['type'] == showtype,
                 "Incorrect presence['type'] for type '%s'" % showtype)
 
         p['type'] = None
-        self.check_presence(p, "<presence />")
+        self.check(p, "<presence />")
 
     def testPresenceUnsolicitedOffline(self):
         """
@@ -56,7 +56,7 @@ class TestPresenceStanzas(SleekTest):
         """Test presence/nick/nick stanza."""
         p = self.Presence()
         p['nick']['nick'] = 'A nickname!'
-        self.check_presence(p, """
+        self.check(p, """
           <presence>
             <nick xmlns="http://jabber.org/nick/nick">A nickname!</nick>
           </presence>
-- 
cgit v1.2.3


From 69d430dd75f526984fd6ea6f9db294731698712c Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Wed, 27 Oct 2010 08:09:50 -0400
Subject: Cleaned up names.

---
 tests/test_stanza_presence.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/test_stanza_presence.py')

diff --git a/tests/test_stanza_presence.py b/tests/test_stanza_presence.py
index 8d043d5d..b8600b6a 100644
--- a/tests/test_stanza_presence.py
+++ b/tests/test_stanza_presence.py
@@ -49,7 +49,8 @@ class TestPresenceStanzas(SleekTest):
 
         self.failUnless(happened == [],
             "changed_status event triggered for extra unavailable presence")
-        self.failUnless(c.roster == {},
+        roster = c.roster['crap@wherever']
+        self.failUnless(roster['bill@chadmore.com'].resources == {},
             "Roster updated for superfulous unavailable presence")
 
     def testNickPlugin(self):
-- 
cgit v1.2.3