david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Return accounts and legacyjids in get_user_roster ad-hoc command

Browse Source 
darcs-hash:20070928180551-86b55-f04f01afdd848508ffdb48d9da4ee18e4918994c.gz
This commit is contained in:
David Rousselie
2007-09-28 20:05:51 +02:00
parent 51f63ace3a
commit 8eaf1cf0c9
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/jcl/jabber/command.py
View File

@@ -713,6 +713,10 @@ class JCLCommandManager(CommandManager):
query = x_form.newChild(None, "query", None) query = x_form.newChild(None, "query", None)
roster_ns = query.newNs("jabber:iq:roster", None) roster_ns = query.newNs("jabber:iq:roster", None)
query.setNs(roster_ns) query.setNs(roster_ns)
for _account in account.get_accounts(user_jid):
item = query.newChild(None, "item", None)
item.setProp("jid", _account.jid)
item.setProp("name", _account.name)
for legacy_jid in account.get_legacy_jids(user_jid): for legacy_jid in account.get_legacy_jids(user_jid):
item = query.newChild(None, "item", None) item = query.newChild(None, "item", None)
item.setProp("jid", legacy_jid.jid) item.setProp("jid", legacy_jid.jid)

30
src/jcl/jabber/tests/command.py
View File

@@ -1498,32 +1498,32 @@ class JCLCommandManager_TestCase(JCLTestCase):
name="account11", name="account11",
jid="account11@jcl.test.com") jid="account11@jcl.test.com")
ljid111 = LegacyJID(legacy_address="test111@test.com", ljid111 = LegacyJID(legacy_address="test111@test.com",
jid="test111%test.com@test.com", jid="test111%test.com@jcl.test.com",
account=account11) account=account11)
ljid112 = LegacyJID(legacy_address="test112@test.com", ljid112 = LegacyJID(legacy_address="test112@test.com",
jid="test112%test.com@test.com", jid="test112%test.com@jcl.test.com",
account=account11) account=account11)
account12 = Example2Account(user=user1, account12 = Example2Account(user=user1,
name="account12", name="account12",
jid="account12@jcl.test.com") jid="account12@jcl.test.com")
ljid121 = LegacyJID(legacy_address="test121@test.com", ljid121 = LegacyJID(legacy_address="test121@test.com",
jid="test121%test.com@test.com", jid="test121%test.com@jcl.test.com",
account=account12) account=account12)
user2 = User(jid="test2@test.com") user2 = User(jid="test2@test.com")
account21 = ExampleAccount(user=user2, account21 = ExampleAccount(user=user2,
name="account21", name="account21",
jid="account21@jcl.test.com") jid="account21@jcl.test.com")
ljid211 = LegacyJID(legacy_address="test211@test.com", ljid211 = LegacyJID(legacy_address="test211@test.com",
jid="test211%test.com@test.com", jid="test211%test.com@jcl.test.com",
account=account21) account=account21)
ljid212 = LegacyJID(legacy_address="test212@test.com", ljid212 = LegacyJID(legacy_address="test212@test.com",
jid="test212%test.com@test.com", jid="test212%test.com@jcl.test.com",
account=account21) account=account21)
account22 = ExampleAccount(user=user2, account22 = ExampleAccount(user=user2,
name="account11", name="account11",
jid="account11@jcl.test.com") jid="account11@jcl.test.com")
ljid221 = LegacyJID(legacy_address="test221@test.com", ljid221 = LegacyJID(legacy_address="test221@test.com",
jid="test221%test.com@test.com", jid="test221%test.com@jcl.test.com",
account=account22) account=account22)
model.db_disconnect() model.db_disconnect()
info_query = Iq(stanza_type="set", info_query = Iq(stanza_type="set",
@@ -1582,13 +1582,17 @@ class JCLCommandManager_TestCase(JCLTestCase):
{"c": "http://jabber.org/protocol/commands", {"c": "http://jabber.org/protocol/commands",
"data": "jabber:x:data", "data": "jabber:x:data",
"roster": "jabber:iq:roster"}) "roster": "jabber:iq:roster"})
self.assertEquals(len(items), 3) self.assertEquals(len(items), 5)
self.assertEquals(items[0].prop("jid"), "test111%test.com@test.com") self.assertEquals(items[0].prop("jid"), "account11@jcl.test.com")
self.assertEquals(items[0].prop("name"), "test111@test.com") self.assertEquals(items[0].prop("name"), "account11")
self.assertEquals(items[1].prop("jid"), "test112%test.com@test.com") self.assertEquals(items[1].prop("jid"), "account12@jcl.test.com")
self.assertEquals(items[1].prop("name"), "test112@test.com") self.assertEquals(items[1].prop("name"), "account12")
self.assertEquals(items[2].prop("jid"), "test121%test.com@test.com") self.assertEquals(items[2].prop("jid"), "test111%test.com@jcl.test.com")
self.assertEquals(items[2].prop("name"), "test121@test.com") self.assertEquals(items[2].prop("name"), "test111@test.com")
self.assertEquals(items[3].prop("jid"), "test112%test.com@jcl.test.com")
self.assertEquals(items[3].prop("name"), "test112@test.com")
self.assertEquals(items[4].prop("jid"), "test121%test.com@jcl.test.com")
self.assertEquals(items[4].prop("name"), "test121@test.com")
def test_execute_get_user_lastlogin(self): def test_execute_get_user_lastlogin(self):
self.comp.account_manager.account_classes = (ExampleAccount, self.comp.account_manager.account_classes = (ExampleAccount,