'get-disabled-users-list' ad-hoc command implementation

darcs-hash:20070812194735-86b55-00996acf2361a66f0177ef2716c3389a61620293.gz
This commit is contained in:
David Rousselie
2007-08-12 21:47:35 +02:00
parent bfbadc8e98
commit 111cd0446a
2 changed files with 197 additions and 24 deletions

View File

@@ -338,6 +338,21 @@ class JCLCommandManager(CommandManager):
result_form.as_xml(command_node) result_form.as_xml(command_node)
return result_form return result_form
def add_form_select_max(self, command_node, lang_class):
self.add_actions(command_node, [ACTION_NEXT])
result_form = Form(xmlnode_or_type="result")
result_form.add_field(field_type="hidden",
name="FORM_TYPE",
value="http://jabber.org/protocol/admin")
max_items_field = result_form.add_field(name="max_items",
field_type="list-single",
label="TODO")
for value in ["25", "50", "75", "100", "150", "200"]:
max_items_field.add_option(label=value,
values=[value])
result_form.as_xml(command_node)
return (result_form, [])
def select_user_jids_step_1(self, info_query, session_context, def select_user_jids_step_1(self, info_query, session_context,
command_node, lang_class): command_node, lang_class):
self.__logger.debug("Executing select_user_jids step 1") self.__logger.debug("Executing select_user_jids step 1")
@@ -678,20 +693,7 @@ class JCLCommandManager(CommandManager):
if num_accounts < 25: if num_accounts < 25:
return self.add_form_list_accounts(command_node, lang_class) return self.add_form_list_accounts(command_node, lang_class)
else: else:
self.add_actions(command_node, [ACTION_NEXT]) return self.add_form_select_max(command_node, lang_class)
result_form = Form(xmlnode_or_type="result")
result_form.add_field(field_type="hidden",
name="FORM_TYPE",
value="http://jabber.org/protocol/admin")
max_items_field = result_form.add_field(name="max_items",
field_type="list-single",
label="TODO")
for value in ["25", "50", "75", "100", "150", "200"]:
max_items_field.add_option(label=value,
values=[value])
result_form.as_xml(command_node)
return (result_form, [])
return []
def execute_get_registered_users_list_2(self, info_query, session_context, def execute_get_registered_users_list_2(self, info_query, session_context,
command_node, lang_class): command_node, lang_class):
@@ -699,8 +701,21 @@ class JCLCommandManager(CommandManager):
return self.add_form_list_accounts(command_node, lang_class, return self.add_form_list_accounts(command_node, lang_class,
limit=limit) limit=limit)
def execute_get_disabled_users_list(self, info_query): def execute_get_disabled_users_list_1(self, info_query, session_context,
return [] command_node, lang_class):
num_accounts = account.get_all_accounts_count()
if num_accounts < 25:
return self.add_form_list_accounts(command_node, lang_class,
filter=(Account.q.enabled == False))
else:
return self.add_form_select_max(command_node, lang_class)
def execute_get_disabled_users_list_2(self, info_query, session_context,
command_node, lang_class):
limit = int(session_context["max_items"][0])
return self.add_form_list_accounts(command_node, lang_class,
limit=limit,
filter=(Account.q.enabled == False))
def execute_get_online_users(self, info_query): def execute_get_online_users(self, info_query):
return [] return []

View File

@@ -1794,14 +1794,172 @@ class JCLCommandManager_TestCase(JCLTestCase):
self.assertEquals(values[24].content, self.assertEquals(values[24].content,
"test1@test.com (account118 ExampleAccount)") "test1@test.com (account118 ExampleAccount)")
# def test_execute_get_disabled_users_list(self): def test_execute_get_disabled_users_list(self):
# #TODO : implement command self.comp.account_manager.account_classes = (ExampleAccount,
# info_query = Iq(stanza_type="set", Example2Account)
# from_jid="user1@test.com", model.db_connect()
# to_jid="jcl.test.com") account11 = ExampleAccount(user_jid="test1@test.com",
# result = self.command_manager.execute_add_user(info_query) name="account11",
# self.assertNotEquals(result, None) jid="account11@jcl.test.com")
# self.assertEquals(len(result), 1) account11.enabled = False
account12 = Example2Account(user_jid="test1@test.com",
name="account12",
jid="account12@jcl.test.com")
account12.enabled = False
account21 = ExampleAccount(user_jid="test2@test.com",
name="account21",
jid="account21@jcl.test.com")
account22 = ExampleAccount(user_jid="test2@test.com",
name="account11",
jid="account11@jcl.test.com")
account22.enabled = False
model.db_disconnect()
info_query = Iq(stanza_type="set",
from_jid="user1@test.com",
to_jid="jcl.test.com")
command_node = info_query.set_new_content(command.COMMAND_NS, "command")
command_node.setProp("node",
"http://jabber.org/protocol/admin#get-disabled-users-list")
result = self.command_manager.apply_command_action(\
info_query,
"http://jabber.org/protocol/admin#get-disabled-users-list",
"execute")
self.assertNotEquals(result, None)
self.assertEquals(len(result), 1)
xml_command = result[0].xpath_eval("c:command",
{"c": "http://jabber.org/protocol/commands"})[0]
self.assertEquals(xml_command.prop("status"), "completed")
self.assertNotEquals(xml_command.prop("sessionid"), None)
self.__check_actions(result[0])
fields = result[0].xpath_eval("c:command/data:x/data:field",
{"c": "http://jabber.org/protocol/commands",
"data": "jabber:x:data"})
self.assertEquals(len(fields), 2)
self.assertEquals(fields[1].prop("var"), "registeredusers")
values = result[0].xpath_eval("c:command/data:x/data:field[2]/data:value",
{"c": "http://jabber.org/protocol/commands",
"data": "jabber:x:data"})
self.assertEquals(len(values), 3)
self.assertEquals(values[0].content,
"test1@test.com (account11 ExampleAccount)")
self.assertEquals(values[1].content,
"test1@test.com (account12 Example2Account)")
self.assertEquals(values[2].content,
"test2@test.com (account11 ExampleAccount)")
def test_execute_get_disabled_users_list_max(self):
self.comp.account_manager.account_classes = (ExampleAccount,
Example2Account)
model.db_connect()
for i in xrange(20):
_account = ExampleAccount(user_jid="test1@test.com",
name="account11" + str(i),
jid="account11" + str(i)
+ "@jcl.test.com")
_account.enabled = False
Example2Account(user_jid="test1@test.com",
name="account12" + str(i),
jid="account12" + str(i) + "@jcl.test.com")
_account = ExampleAccount(user_jid="test2@test.com",
name="account2" + str(i),
jid="account2" + str(i)
+ "@jcl.test.com")
_account.enabled = False
model.db_disconnect()
info_query = Iq(stanza_type="set",
from_jid="user1@test.com",
to_jid="jcl.test.com")
command_node = info_query.set_new_content(command.COMMAND_NS, "command")
command_node.setProp("node",
"http://jabber.org/protocol/admin#get-disabled-users-list")
result = self.command_manager.apply_command_action(\
info_query,
"http://jabber.org/protocol/admin#get-disabled-users-list",
"execute")
self.assertNotEquals(result, None)
self.assertEquals(len(result), 1)
xml_command = result[0].xpath_eval("c:command",
{"c": "http://jabber.org/protocol/commands"})[0]
self.assertEquals(xml_command.prop("status"), "executing")
self.assertNotEquals(xml_command.prop("sessionid"), None)
self.__check_actions(result[0], ["next"])
fields = result[0].xpath_eval("c:command/data:x/data:field",
{"c": "http://jabber.org/protocol/commands",
"data": "jabber:x:data"})
self.assertEquals(len(fields), 2)
self.assertEquals(fields[1].prop("var"), "max_items")
self.assertEquals(fields[1].prop("type"), "list-single")
options = result[0].xpath_eval("c:command/data:x/data:field[2]/data:option",
{"c": "http://jabber.org/protocol/commands",
"data": "jabber:x:data"})
self.assertEquals(len(options), 6)
self.assertEquals(options[0].prop("label"), "25")
self.assertEquals(options[0].content, "25")
self.assertEquals(options[1].prop("label"), "50")
self.assertEquals(options[1].content, "50")
self.assertEquals(options[2].prop("label"), "75")
self.assertEquals(options[2].content, "75")
self.assertEquals(options[3].prop("label"), "100")
self.assertEquals(options[3].content, "100")
self.assertEquals(options[4].prop("label"), "150")
self.assertEquals(options[4].content, "150")
self.assertEquals(options[5].prop("label"), "200")
self.assertEquals(options[5].content, "200")
# Second step
info_query = Iq(stanza_type="set",
from_jid="user1@test.com",
to_jid="jcl.test.com")
command_node = info_query.set_new_content(command.COMMAND_NS, "command")
command_node.setProp("node",
"http://jabber.org/protocol/admin#get-disabled-users-list")
session_id = xml_command.prop("sessionid")
command_node.setProp("sessionid", session_id)
command_node.setProp("action", "next")
submit_form = Form(xmlnode_or_type="submit")
submit_form.add_field(field_type="list-single",
name="max_items",
value="25")
submit_form.as_xml(command_node)
result = self.command_manager.apply_command_action(\
info_query,
"http://jabber.org/protocol/admin#get-disabled-users-list",
"execute")
self.assertNotEquals(result, None)
self.assertEquals(len(result), 1)
xml_command = result[0].xpath_eval("c:command",
{"c": "http://jabber.org/protocol/commands"})[0]
self.assertEquals(xml_command.prop("status"), "completed")
self.assertEquals(xml_command.prop("sessionid"), session_id)
self.__check_actions(result[0])
context_session = self.command_manager.sessions[session_id][1]
self.assertEquals(context_session["max_items"],
["25"])
fields = result[0].xpath_eval("c:command/data:x/data:field",
{"c": "http://jabber.org/protocol/commands",
"data": "jabber:x:data"})
self.assertEquals(len(fields), 2)
self.assertEquals(fields[0].prop("var"), "FORM_TYPE")
self.assertEquals(fields[0].prop("type"), "hidden")
self.assertEquals(fields[0].children.name, "value")
self.assertEquals(fields[0].children.content,
"http://jabber.org/protocol/admin")
self.assertEquals(fields[1].prop("var"), "registeredusers")
values = result[0].xpath_eval("c:command/data:x/data:field[2]/data:value",
{"c": "http://jabber.org/protocol/commands",
"data": "jabber:x:data"})
self.assertEquals(len(values), 25)
i = 0
while i < 12:
self.assertEquals(values[i * 2].content,
"test1@test.com (account11" + str(i)
+ " ExampleAccount)")
self.assertEquals(values[i * 2 + 1].content,
"test2@test.com (account2" + str(i)
+ " ExampleAccount)")
i += 1
self.assertEquals(values[24].content,
"test1@test.com (account1112 ExampleAccount)")
# def test_execute_get_online_users(self): # def test_execute_get_online_users(self):
# #TODO : implement command # #TODO : implement command