Fixed tests for new command format

1 files changed, 71 insertions, 254 deletions

diff --git a/tests/unittests/test_cmd_account.c b/tests/unittests/test_cmd_account.c
index 51213eb5..effce3ac 100644
--- a/tests/unittests/test_cmd_account.c
+++ b/tests/unittests/test_cmd_account.c
@@ -15,26 +15,23 @@
 
 #include "command/commands.h"
 
+#define CMD_ACCOUNT "/account"
+
 void cmd_account_shows_usage_when_not_connected_and_no_args(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { NULL };
 
     will_return(jabber_get_connection_status, JABBER_DISCONNECTED);
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 
 void cmd_account_shows_account_when_connected_and_no_args(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     ProfAccount *account = account_new("jabber_org", "me@jabber.org", NULL, NULL,
         TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
     gchar *args[] = { NULL };
@@ -46,15 +43,12 @@ void cmd_account_shows_account_when_connected_and_no_args(void **state)
 
     expect_memory(cons_show_account, account, account, sizeof(ProfAccount));
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_list_shows_accounts(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "list", NULL };
 
     gchar **accounts = malloc(sizeof(gchar *) * 4);
@@ -67,29 +61,22 @@ void cmd_account_list_shows_accounts(void **state)
 
     expect_memory(cons_show_account_list, accounts, accounts, sizeof(accounts));
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_show_shows_usage_when_no_arg(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "show", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_show_shows_message_when_account_does_not_exist(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "show", "account_name", NULL };
 
     expect_any(accounts_get_account, name);
@@ -98,15 +85,12 @@ void cmd_account_show_shows_message_when_account_does_not_exist(void **state)
     expect_cons_show("No such account.");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_show_shows_account_when_exists(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "show", "account_name", NULL };
     ProfAccount *account = account_new("jabber_org", "me@jabber.org", NULL, NULL,
         TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -116,29 +100,22 @@ void cmd_account_show_shows_account_when_exists(void **state)
 
     expect_memory(cons_show_account, account, account, sizeof(account));
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_add_shows_usage_when_no_arg(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "add", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_add_adds_account(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "add", "new_account", NULL };
 
     expect_string(accounts_add, jid, "new_account");
@@ -147,29 +124,22 @@ void cmd_account_add_adds_account(void **state)
     expect_cons_show("Account created.");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_enable_shows_usage_when_no_arg(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "enable", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_enable_enables_account(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "enable", "account_name", NULL };
 
     expect_string(accounts_enable, name, "account_name");
@@ -178,15 +148,12 @@ void cmd_account_enable_enables_account(void **state)
     expect_cons_show("Account enabled.");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_enable_shows_message_when_account_doesnt_exist(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "enable", "account_name", NULL };
 
     expect_any(accounts_enable, name);
@@ -195,29 +162,22 @@ void cmd_account_enable_shows_message_when_account_doesnt_exist(void **state)
     expect_cons_show("No such account: account_name");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_disable_shows_usage_when_no_arg(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "disable", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_disable_disables_account(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "disable", "account_name", NULL };
 
     expect_string(accounts_disable, name, "account_name");
@@ -226,15 +186,12 @@ void cmd_account_disable_disables_account(void **state)
     expect_cons_show("Account disabled.");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_disable_shows_message_when_account_doesnt_exist(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "disable", "account_name", NULL };
 
     expect_any(accounts_disable, name);
@@ -243,43 +200,32 @@ void cmd_account_disable_shows_message_when_account_doesnt_exist(void **state)
     expect_cons_show("No such account: account_name");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_rename_shows_usage_when_no_args(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "rename", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_rename_shows_usage_when_one_arg(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "rename", "original_name", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_rename_renames_account(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "rename", "original_name", "new_name", NULL };
 
     expect_string(accounts_rename, account_name, "original_name");
@@ -289,15 +235,12 @@ void cmd_account_rename_renames_account(void **state)
     expect_cons_show("Account renamed.");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_rename_shows_message_when_not_renamed(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "rename", "original_name", "new_name", NULL };
 
     expect_any(accounts_rename, account_name);
@@ -307,57 +250,42 @@ void cmd_account_rename_shows_message_when_not_renamed(void **state)
     expect_cons_show("Either account original_name doesn't exist, or account new_name already exists.");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_shows_usage_when_no_args(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "set", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_shows_usage_when_one_arg(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "set", "a_account", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_shows_usage_when_two_args(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "set", "a_account", "a_property", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_shows_message_when_account_doesnt_exist(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "a_property", "a_value", NULL };
 
     expect_string(accounts_account_exists, account_name, "a_account");
@@ -366,15 +294,12 @@ void cmd_account_set_shows_message_when_account_doesnt_exist(void **state)
     expect_cons_show("Account a_account doesn't exist");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_jid_shows_message_for_malformed_jid(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "jid", "@malformed", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -382,15 +307,12 @@ void cmd_account_set_jid_shows_message_for_malformed_jid(void **state)
 
     expect_cons_show("Malformed jid: @malformed");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_jid_sets_barejid(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "jid", "a_local@a_domain", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -402,15 +324,12 @@ void cmd_account_set_jid_sets_barejid(void **state)
     expect_cons_show("Updated jid for account a_account: a_local@a_domain");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_jid_sets_resource(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "jid", "a_local@a_domain/a_resource", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -427,15 +346,12 @@ void cmd_account_set_jid_sets_resource(void **state)
     expect_cons_show("Updated resource for account a_account: a_resource");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_server_sets_server(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "server", "a_server", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -447,15 +363,12 @@ void cmd_account_set_server_sets_server(void **state)
     expect_cons_show("Updated server for account a_account: a_server");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_resource_sets_resource(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "resource", "a_resource", NULL };
 
     will_return(jabber_get_connection_status, JABBER_DISCONNECTED);
@@ -469,15 +382,12 @@ void cmd_account_set_resource_sets_resource(void **state)
     expect_cons_show("Updated resource for account a_account: a_resource");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_resource_sets_resource_with_online_message(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "resource", "a_resource", NULL };
 
     will_return(jabber_get_connection_status, JABBER_CONNECTED);
@@ -491,15 +401,12 @@ void cmd_account_set_resource_sets_resource_with_online_message(void **state)
     expect_cons_show("Updated resource for account a_account: a_resource, you will need to reconnect to pick up the change.");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_password_sets_password(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "password", "a_password", NULL };
     ProfAccount *account = account_new("a_account", NULL, NULL, NULL,
     TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -517,20 +424,16 @@ void cmd_account_set_password_sets_password(void **state)
     expect_cons_show("Updated password for account a_account");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_eval_password_sets_eval_password(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "eval_password", "a_password", NULL };
     ProfAccount *account = account_new("a_account", NULL, NULL, NULL,
     TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-
     expect_any(accounts_account_exists, account_name);
     will_return(accounts_account_exists, TRUE);
 
@@ -543,19 +446,15 @@ void cmd_account_set_eval_password_sets_eval_password(void **state)
     expect_cons_show("Updated eval_password for account a_account");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_password_when_eval_password_set(void **state) {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "password", "a_password", NULL };
     ProfAccount *account = account_new("a_account", NULL, NULL, "a_password",
     TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-
     expect_any(accounts_account_exists, account_name);
     will_return(accounts_account_exists, TRUE);
 
@@ -564,19 +463,15 @@ void cmd_account_set_password_when_eval_password_set(void **state) {
 
     expect_cons_show("Cannot set password when eval_password is set.");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_eval_password_when_password_set(void **state) {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "eval_password", "a_password", NULL };
     ProfAccount *account = account_new("a_account", NULL, "a_password", NULL,
     TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-
     expect_any(accounts_account_exists, account_name);
     will_return(accounts_account_exists, TRUE);
 
@@ -585,15 +480,12 @@ void cmd_account_set_eval_password_when_password_set(void **state) {
 
     expect_cons_show("Cannot set eval_password when password is set.");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_muc_sets_muc(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "muc", "a_muc", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -605,15 +497,12 @@ void cmd_account_set_muc_sets_muc(void **state)
     expect_cons_show("Updated muc service for account a_account: a_muc");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_nick_sets_nick(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "nick", "a_nick", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -625,29 +514,22 @@ void cmd_account_set_nick_sets_nick(void **state)
     expect_cons_show("Updated muc nick for account a_account: a_nick");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_show_message_for_missing_otr_policy(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "Some usage";
     gchar *args[] = { "set", "a_account", "otr", NULL };
 
-    expect_cons_show("Usage: Some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_show_message_for_invalid_otr_policy(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "otr", "bad_otr_policy", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -655,15 +537,12 @@ void cmd_account_show_message_for_invalid_otr_policy(void **state)
 
     expect_cons_show("OTR policy must be one of: manual, opportunistic or always.");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_otr_sets_otr(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "otr", "opportunistic", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -675,15 +554,12 @@ void cmd_account_set_otr_sets_otr(void **state)
     expect_cons_show("Updated OTR policy for account a_account: opportunistic");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_status_shows_message_when_invalid_status(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "status", "bad_status", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -692,15 +568,12 @@ void cmd_account_set_status_shows_message_when_invalid_status(void **state)
     expect_cons_show("Invalid status: bad_status");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_status_sets_status_when_valid(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "status", "away", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -712,15 +585,12 @@ void cmd_account_set_status_sets_status_when_valid(void **state)
     expect_cons_show("Updated login status for account a_account: away");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_status_sets_status_when_last(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "status", "last", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -732,15 +602,12 @@ void cmd_account_set_status_sets_status_when_last(void **state)
     expect_cons_show("Updated login status for account a_account: last");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_invalid_presence_string_priority_shows_message(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "blah", "10", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -749,15 +616,12 @@ void cmd_account_set_invalid_presence_string_priority_shows_message(void **state
     expect_cons_show("Invalid property: blah");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_last_priority_shows_message(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "last", "10", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -766,15 +630,12 @@ void cmd_account_set_last_priority_shows_message(void **state)
     expect_cons_show("Invalid property: last");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_online_priority_sets_preference(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "online", "10", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -788,15 +649,12 @@ void cmd_account_set_online_priority_sets_preference(void **state)
     expect_cons_show("Updated online priority for account a_account: 10");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_chat_priority_sets_preference(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "chat", "10", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -810,15 +668,12 @@ void cmd_account_set_chat_priority_sets_preference(void **state)
     expect_cons_show("Updated chat priority for account a_account: 10");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_away_priority_sets_preference(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "away", "10", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -832,15 +687,12 @@ void cmd_account_set_away_priority_sets_preference(void **state)
     expect_cons_show("Updated away priority for account a_account: 10");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_xa_priority_sets_preference(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "xa", "10", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -854,15 +706,12 @@ void cmd_account_set_xa_priority_sets_preference(void **state)
     expect_cons_show("Updated xa priority for account a_account: 10");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_dnd_priority_sets_preference(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "dnd", "10", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -876,15 +725,12 @@ void cmd_account_set_dnd_priority_sets_preference(void **state)
     expect_cons_show("Updated dnd priority for account a_account: 10");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_priority_too_low_shows_message(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "online", "-150", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -892,15 +738,12 @@ void cmd_account_set_priority_too_low_shows_message(void **state)
 
     expect_cons_show("Value -150 out of range. Must be in -128..127.");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_priority_too_high_shows_message(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "online", "150", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -908,15 +751,12 @@ void cmd_account_set_priority_too_high_shows_message(void **state)
 
     expect_cons_show("Value 150 out of range. Must be in -128..127.");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_priority_when_not_number_shows_message(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "online", "abc", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -924,15 +764,12 @@ void cmd_account_set_priority_when_not_number_shows_message(void **state)
 
     expect_cons_show("Could not convert \"abc\" to a number.");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_priority_when_empty_shows_message(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "online", "", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -940,18 +777,14 @@ void cmd_account_set_priority_when_empty_shows_message(void **state)
 
     expect_cons_show("Could not convert \"\" to a number.");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_set_priority_updates_presence_when_account_connected_with_presence(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "online", "10", NULL };
 
-
     expect_any(accounts_account_exists, account_name);
     will_return(accounts_account_exists, TRUE);
 
@@ -984,43 +817,32 @@ void cmd_account_set_priority_updates_presence_when_account_connected_with_prese
     expect_cons_show("Updated online priority for account a_account: 10");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_clear_shows_usage_when_no_args(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "clear", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_clear_shows_usage_when_one_arg(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
-    help->usage = "some usage";
     gchar *args[] = { "clear", "a_account", NULL };
 
-    expect_cons_show("Usage: some usage");
+    expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT);
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_clear_shows_message_when_account_doesnt_exist(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "clear", "a_account", "a_property", NULL };
 
     expect_string(accounts_account_exists, account_name, "a_account");
@@ -1029,15 +851,12 @@ void cmd_account_clear_shows_message_when_account_doesnt_exist(void **state)
     expect_cons_show("Account a_account doesn't exist");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }
 
 void cmd_account_clear_shows_message_when_invalid_property(void **state)
 {
-    CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "clear", "a_account", "badproperty", NULL };
 
     expect_any(accounts_account_exists, account_name);
@@ -1046,8 +865,6 @@ void cmd_account_clear_shows_message_when_invalid_property(void **state)
     expect_cons_show("Invalid property: badproperty");
     expect_cons_show("");
 
-    gboolean result = cmd_account(NULL, args, *help);
+    gboolean result = cmd_account(NULL, CMD_ACCOUNT, args);
     assert_true(result);
-
-    free(help);
 }