summaryrefslogtreecommitdiff
path: root/tests/test_jid.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-11-17 02:00:20 -0500
committerLance Stout <lancestout@gmail.com>2010-11-17 02:01:12 -0500
commit26aca2b789f62123819041229ba40ab10268f49e (patch)
tree20388fb0559ed85f7143eb3b8a669142cdc43f6b /tests/test_jid.py
parent4f69a03bb1a8caab7899bd04f97b7975a78f2f34 (diff)
parent5424ede413393db5b835686e8544a9b703fb113b (diff)
downloadslixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.gz
slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.bz2
slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.xz
slixmpp-26aca2b789f62123819041229ba40ab10268f49e.zip
Merge branch 'roster' of github.com:fritzy/SleekXMPP into roster
Conflicts: sleekxmpp/basexmpp.py sleekxmpp/roster.py sleekxmpp/test/sleektest.py tests/test_stream_presence.py tests/test_stream_roster.py
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',
'',