summaryrefslogtreecommitdiff
path: root/tests/test_jid.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-11-05 14:45:58 -0400
committerLance Stout <lancestout@gmail.com>2010-11-05 21:18:48 -0400
commitd0c506f93010f62cd447ce29f98ab991f521ec99 (patch)
tree80c994852cc04d4680c5db9c7e3abca77810e44e /tests/test_jid.py
parent7351fe1a0226298419e3d174d7b156daad91c131 (diff)
downloadslixmpp-d0c506f93010f62cd447ce29f98ab991f521ec99.tar.gz
slixmpp-d0c506f93010f62cd447ce29f98ab991f521ec99.tar.bz2
slixmpp-d0c506f93010f62cd447ce29f98ab991f521ec99.tar.xz
slixmpp-d0c506f93010f62cd447ce29f98ab991f521ec99.zip
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.
Diffstat (limited to 'tests/test_jid.py')
-rw-r--r--tests/test_jid.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/test_jid.py b/tests/test_jid.py
index 6ec6e02b..99402999 100644
--- a/tests/test_jid.py
+++ b/tests/test_jid.py
@@ -8,7 +8,7 @@ class TestJIDClass(SleekTest):
def testJIDFromFull(self):
"""Test using JID of the form 'user@server/resource/with/slashes'."""
- self.check_JID(JID('user@someserver/some/resource'),
+ self.check_jid(JID('user@someserver/some/resource'),
'user',
'someserver',
'some/resource',
@@ -22,7 +22,7 @@ class TestJIDClass(SleekTest):
j.user = 'user'
j.domain = 'someserver'
j.resource = 'some/resource'
- self.check_JID(j,
+ self.check_jid(j,
'user',
'someserver',
'some/resource',
@@ -34,15 +34,15 @@ class TestJIDClass(SleekTest):
"""Test changing JID using aliases for domain."""
j = JID('user@someserver/resource')
j.server = 'anotherserver'
- self.check_JID(j, domain='anotherserver')
+ self.check_jid(j, domain='anotherserver')
j.host = 'yetanother'
- self.check_JID(j, domain='yetanother')
+ self.check_jid(j, domain='yetanother')
def testJIDSetFullWithUser(self):
"""Test setting the full JID with a user portion."""
j = JID('user@domain/resource')
j.full = 'otheruser@otherdomain/otherresource'
- self.check_JID(j,
+ self.check_jid(j,
'otheruser',
'otherdomain',
'otherresource',
@@ -57,7 +57,7 @@ class TestJIDClass(SleekTest):
"""
j = JID('user@domain/resource')
j.full = 'otherdomain/otherresource'
- self.check_JID(j,
+ self.check_jid(j,
'',
'otherdomain',
'otherresource',
@@ -72,7 +72,7 @@ class TestJIDClass(SleekTest):
"""
j = JID('user@domain/resource')
j.full = 'otherdomain'
- self.check_JID(j,
+ self.check_jid(j,
'',
'otherdomain',
'',
@@ -84,7 +84,7 @@ class TestJIDClass(SleekTest):
"""Test setting the bare JID with a user."""
j = JID('user@domain/resource')
j.bare = 'otheruser@otherdomain'
- self.check_JID(j,
+ self.check_jid(j,
'otheruser',
'otherdomain',
'resource',
@@ -96,7 +96,7 @@ class TestJIDClass(SleekTest):
"""Test setting the bare JID without a user."""
j = JID('user@domain/resource')
j.bare = 'otherdomain'
- self.check_JID(j,
+ self.check_jid(j,
'',
'otherdomain',
'resource',
@@ -106,7 +106,7 @@ class TestJIDClass(SleekTest):
def testJIDNoResource(self):
"""Test using JID of the form 'user@domain'."""
- self.check_JID(JID('user@someserver'),
+ self.check_jid(JID('user@someserver'),
'user',
'someserver',
'',
@@ -116,7 +116,7 @@ class TestJIDClass(SleekTest):
def testJIDNoUser(self):
"""Test JID of the form 'component.domain.tld'."""
- self.check_JID(JID('component.someserver'),
+ self.check_jid(JID('component.someserver'),
'',
'component.someserver',
'',