Added mock_accounts and fixed tests

1 files changed, 126 insertions, 144 deletions

diff --git a/tests/test_cmd_account.c b/tests/test_cmd_account.c
index b2650d8e..6d7a6d85 100644
--- a/tests/test_cmd_account.c
+++ b/tests/test_cmd_account.c
@@ -12,6 +12,9 @@
 #include "ui/ui.h"
 #include "ui/mock_ui.h"
 
+#include "config/accounts.h"
+#include "config/mock_accounts.h"
+
 #include "command/commands.h"
 
 void cmd_account_shows_usage_when_not_connected_and_no_args(void **state)
@@ -34,6 +37,8 @@ void cmd_account_shows_usage_when_not_connected_and_no_args(void **state)
 void cmd_account_shows_account_when_connected_and_no_args(void **state)
 {
     mock_cons_show_account();
+    mock_accounts_get_account();
+    stub_accounts_free_account();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     ProfAccount *account = malloc(sizeof(ProfAccount));
     gchar *args[] = { NULL };
@@ -41,13 +46,10 @@ void cmd_account_shows_account_when_connected_and_no_args(void **state)
     mock_connection_status(JABBER_CONNECTED);
     mock_connection_account_name("account_name");
 
-    expect_any(accounts_get_account, name);
-    will_return(accounts_get_account, account);
+    accounts_get_account_return(account);
 
     expect_cons_show_account(account);
 
-    expect_any(accounts_free_account, account);
-
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -58,6 +60,7 @@ void cmd_account_shows_account_when_connected_and_no_args(void **state)
 void cmd_account_list_shows_accounts(void **state)
 {
     mock_cons_show_account_list();
+    mock_accounts_get_list();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "list", NULL };
 
@@ -67,7 +70,7 @@ void cmd_account_list_shows_accounts(void **state)
     accounts[2] = strdup("account3");
     accounts[3] = NULL;
 
-    will_return(accounts_get_list, accounts);
+    accounts_get_list_return(accounts);
 
     expect_cons_show_account_list(accounts);
 
@@ -95,11 +98,11 @@ void cmd_account_show_shows_usage_when_no_arg(void **state)
 void cmd_account_show_shows_message_when_account_does_not_exist(void **state)
 {
     mock_cons_show();
+    mock_accounts_get_account();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "show", "account_name", NULL };
 
-    expect_any(accounts_get_account, name);
-    will_return(accounts_get_account, NULL);
+    accounts_get_account_return(NULL);
 
     expect_cons_show("No such account.");
     expect_cons_show("");
@@ -113,17 +116,16 @@ void cmd_account_show_shows_message_when_account_does_not_exist(void **state)
 void cmd_account_show_shows_account_when_exists(void **state)
 {
     mock_cons_show_account();
+    mock_accounts_get_account();
+    stub_accounts_free_account();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "show", "account_name", NULL };
     ProfAccount *account = malloc(sizeof(ProfAccount));
 
-    expect_any(accounts_get_account, name);
-    will_return(accounts_get_account, account);
+    accounts_get_account_return(account);
 
     expect_cons_show_account(account);
 
-    expect_any(accounts_free_account, account);
-
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -148,10 +150,11 @@ void cmd_account_add_shows_usage_when_no_arg(void **state)
 void cmd_account_add_adds_account(void **state)
 {
     stub_cons_show();
+    mock_accounts_add();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "add", "new_account", NULL };
 
-    expect_string(accounts_add, jid, "new_account");
+    accounts_add_expect_account_name("new_account");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -162,11 +165,10 @@ void cmd_account_add_adds_account(void **state)
 void cmd_account_add_shows_message(void **state)
 {
     mock_cons_show();
+    stub_accounts_add();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "add", "new_account", NULL };
 
-    expect_any(accounts_add, jid);
-
     expect_cons_show("Account created.");;
     expect_cons_show("");
 
@@ -194,11 +196,11 @@ void cmd_account_enable_shows_usage_when_no_arg(void **state)
 void cmd_account_enable_enables_account(void **state)
 {
     stub_cons_show();
+    mock_accounts_enable();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "enable", "account_name", NULL };
 
-    expect_string(accounts_enable, name, "account_name");
-    will_return(accounts_enable, TRUE);
+    accounts_enable_expect("account_name");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -209,11 +211,11 @@ void cmd_account_enable_enables_account(void **state)
 void cmd_account_enable_shows_message_when_enabled(void **state)
 {
     mock_cons_show();
+    mock_accounts_enable();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "enable", "account_name", NULL };
 
-    expect_any(accounts_enable, name);
-    will_return(accounts_enable, TRUE);
+    accounts_enable_return(TRUE);
 
     expect_cons_show("Account enabled.");
     expect_cons_show("");
@@ -227,11 +229,11 @@ void cmd_account_enable_shows_message_when_enabled(void **state)
 void cmd_account_enable_shows_message_when_account_doesnt_exist(void **state)
 {
     mock_cons_show();
+    mock_accounts_enable();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "enable", "account_name", NULL };
 
-    expect_any(accounts_enable, name);
-    will_return(accounts_enable, FALSE);
+    accounts_enable_return(FALSE);
 
     expect_cons_show("No such account: account_name");
     expect_cons_show("");
@@ -260,11 +262,11 @@ void cmd_account_disable_shows_usage_when_no_arg(void **state)
 void cmd_account_disable_disables_account(void **state)
 {
     stub_cons_show();
+    mock_accounts_disable();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "disable", "account_name", NULL };
 
-    expect_string(accounts_disable, name, "account_name");
-    will_return(accounts_disable, TRUE);
+    accounts_disable_expect("account_name");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -275,11 +277,11 @@ void cmd_account_disable_disables_account(void **state)
 void cmd_account_disable_shows_message_when_disabled(void **state)
 {
     mock_cons_show();
+    mock_accounts_disable();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "disable", "account_name", NULL };
 
-    expect_any(accounts_disable, name);
-    will_return(accounts_disable, TRUE);
+    accounts_disable_return(TRUE);
 
     expect_cons_show("Account disabled.");
     expect_cons_show("");
@@ -293,11 +295,11 @@ void cmd_account_disable_shows_message_when_disabled(void **state)
 void cmd_account_disable_shows_message_when_account_doesnt_exist(void **state)
 {
     mock_cons_show();
+    mock_accounts_disable();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "disable", "account_name", NULL };
 
-    expect_any(accounts_disable, name);
-    will_return(accounts_disable, FALSE);
+    accounts_disable_return(FALSE);
 
     expect_cons_show("No such account: account_name");
     expect_cons_show("");
@@ -341,12 +343,11 @@ void cmd_account_rename_shows_usage_when_one_arg(void **state)
 void cmd_account_rename_renames_account(void **state)
 {
     stub_cons_show();
+    mock_accounts_rename();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "rename", "original_name", "new_name", NULL };
 
-    expect_string(accounts_rename, account_name, "original_name");
-    expect_string(accounts_rename, new_name, "new_name");
-    will_return(accounts_rename, TRUE);
+    accounts_rename_expect("original_name", "new_name");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -357,12 +358,11 @@ void cmd_account_rename_renames_account(void **state)
 void cmd_account_rename_shows_message_when_renamed(void **state)
 {
     mock_cons_show();
+    mock_accounts_rename();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "rename", "original_name", "new_name", NULL };
 
-    expect_any(accounts_rename, account_name);
-    expect_any(accounts_rename, new_name);
-    will_return(accounts_rename, TRUE);
+    accounts_rename_return(TRUE);
 
     expect_cons_show("Account renamed.");
     expect_cons_show("");
@@ -376,12 +376,11 @@ void cmd_account_rename_shows_message_when_renamed(void **state)
 void cmd_account_rename_shows_message_when_not_renamed(void **state)
 {
     mock_cons_show();
+    mock_accounts_rename();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "rename", "original_name", "new_name", NULL };
 
-    expect_any(accounts_rename, account_name);
-    expect_any(accounts_rename, new_name);
-    will_return(accounts_rename, FALSE);
+    accounts_rename_return(FALSE);
 
     expect_cons_show("Either account original_name doesn't exist, or account new_name already exists.");
     expect_cons_show("");
@@ -440,11 +439,11 @@ void cmd_account_set_shows_usage_when_two_args(void **state)
 void cmd_account_set_checks_account_exists(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "a_property", "a_value", NULL };
 
-    expect_string(accounts_account_exists, account_name, "a_account");
-    will_return(accounts_account_exists, FALSE);
+    accounts_account_exists_expect("a_account");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -455,11 +454,11 @@ void cmd_account_set_checks_account_exists(void **state)
 void cmd_account_set_shows_message_when_account_doesnt_exist(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "a_property", "a_value", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, FALSE);
+    accounts_account_exists_return(FALSE);
 
     expect_cons_show("Account a_account doesn't exist");
     expect_cons_show("");
@@ -473,11 +472,11 @@ void cmd_account_set_shows_message_when_account_doesnt_exist(void **state)
 void cmd_account_set_jid_shows_message_for_malformed_jid(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "jid", "@malformed", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Malformed jid: @malformed");
 
@@ -490,20 +489,18 @@ void cmd_account_set_jid_shows_message_for_malformed_jid(void **state)
 void cmd_account_set_jid_sets_barejid(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_jid();
+    stub_accounts_set_resource();
     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);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_jid, account_name, "a_account");
-    expect_string(accounts_set_jid, value, "a_local@a_domain");
+    accounts_set_jid_expect("a_account", "a_local@a_domain");
 
     expect_cons_show("Updated jid for account a_account: a_local@a_domain");
 
-    expect_any(accounts_set_resource, account_name);
-    expect_any(accounts_set_resource, value);
-
     expect_cons_show_calls(2);
 
     gboolean result = cmd_account(args, *help);
@@ -515,19 +512,17 @@ void cmd_account_set_jid_sets_barejid(void **state)
 void cmd_account_set_jid_sets_resource(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
+    stub_accounts_set_jid();
+    mock_accounts_set_resource();
     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);
-    will_return(accounts_account_exists, TRUE);
-
-    expect_any(accounts_set_jid, account_name);
-    expect_any(accounts_set_jid, value);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show_calls(1);
 
-    expect_string(accounts_set_resource, account_name, "a_account");
-    expect_string(accounts_set_resource, value, "a_resource");
+    accounts_set_resource_expect("a_account", "a_resource");
 
     expect_cons_show("Updated resource for account a_account: a_resource");
     expect_cons_show("");
@@ -541,14 +536,14 @@ void cmd_account_set_jid_sets_resource(void **state)
 void cmd_account_set_server_sets_server(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_server();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "server", "a_server", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_server, account_name, "a_account");
-    expect_string(accounts_set_server, value, "a_server");
+    accounts_set_server_expect("a_account", "a_server");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -559,14 +554,12 @@ void cmd_account_set_server_sets_server(void **state)
 void cmd_account_set_server_shows_message(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
+    stub_accounts_set_server();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "server", "a_server", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
-
-    expect_any(accounts_set_server, account_name);
-    expect_any(accounts_set_server, value);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Updated server for account a_account: a_server");
     expect_cons_show("");
@@ -580,14 +573,14 @@ void cmd_account_set_server_shows_message(void **state)
 void cmd_account_set_resource_sets_resource(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_resource();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "resource", "a_resource", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_resource, account_name, "a_account");
-    expect_string(accounts_set_resource, value, "a_resource");
+    accounts_set_resource_expect("a_account", "a_resource");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -598,14 +591,12 @@ void cmd_account_set_resource_sets_resource(void **state)
 void cmd_account_set_resource_shows_message(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
+    stub_accounts_set_resource();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "resource", "a_resource", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
-
-    expect_any(accounts_set_resource, account_name);
-    expect_any(accounts_set_resource, value);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Updated resource for account a_account: a_resource");
     expect_cons_show("");
@@ -619,14 +610,14 @@ void cmd_account_set_resource_shows_message(void **state)
 void cmd_account_set_password_sets_password(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_password();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "password", "a_password", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_password, account_name, "a_account");
-    expect_string(accounts_set_password, value, "a_password");
+    accounts_set_password_expect("a_account", "a_password");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -637,14 +628,12 @@ void cmd_account_set_password_sets_password(void **state)
 void cmd_account_set_password_shows_message(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
+    stub_accounts_set_password();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "password", "a_password", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
-
-    expect_any(accounts_set_password, account_name);
-    expect_any(accounts_set_password, value);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Updated password for account a_account");
     expect_cons_show("");
@@ -658,14 +647,14 @@ void cmd_account_set_password_shows_message(void **state)
 void cmd_account_set_muc_sets_muc(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_muc_service();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "muc", "a_muc", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_muc_service, account_name, "a_account");
-    expect_string(accounts_set_muc_service, value, "a_muc");
+    accounts_set_muc_service_expect("a_account", "a_muc");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -676,14 +665,12 @@ void cmd_account_set_muc_sets_muc(void **state)
 void cmd_account_set_muc_shows_message(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
+    stub_accounts_set_muc_service();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "muc", "a_muc", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
-
-    expect_any(accounts_set_muc_service, account_name);
-    expect_any(accounts_set_muc_service, value);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Updated muc service for account a_account: a_muc");
     expect_cons_show("");
@@ -697,14 +684,14 @@ void cmd_account_set_muc_shows_message(void **state)
 void cmd_account_set_nick_sets_nick(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_muc_nick();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "nick", "a_nick", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_muc_nick, account_name, "a_account");
-    expect_string(accounts_set_muc_nick, value, "a_nick");
+    accounts_set_muc_nick_expect("a_account", "a_nick");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -715,14 +702,12 @@ void cmd_account_set_nick_sets_nick(void **state)
 void cmd_account_set_nick_shows_message(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
+    stub_accounts_set_muc_nick();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "nick", "a_nick", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
-
-    expect_any(accounts_set_muc_nick, account_name);
-    expect_any(accounts_set_muc_nick, value);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Updated muc nick for account a_account: a_nick");
     expect_cons_show("");
@@ -736,11 +721,12 @@ void cmd_account_set_nick_shows_message(void **state)
 void cmd_account_set_status_shows_message_when_invalid_status(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
+    stub_accounts_set_login_presence();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "status", "bad_status", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Invalid status: bad_status");
     expect_cons_show("");
@@ -754,14 +740,14 @@ void cmd_account_set_status_shows_message_when_invalid_status(void **state)
 void cmd_account_set_status_sets_status_when_valid(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_login_presence();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "status", "away", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_login_presence, account_name, "a_account");
-    expect_string(accounts_set_login_presence, value, "away");
+    accounts_set_login_presence_expect("a_account", "away");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -772,14 +758,14 @@ void cmd_account_set_status_sets_status_when_valid(void **state)
 void cmd_account_set_status_sets_status_when_last(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_login_presence();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "status", "last", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_login_presence, account_name, "a_account");
-    expect_string(accounts_set_login_presence, value, "last");
+    accounts_set_login_presence_expect("a_account", "last");
 
     gboolean result = cmd_account(args, *help);
     assert_true(result);
@@ -790,14 +776,12 @@ void cmd_account_set_status_sets_status_when_last(void **state)
 void cmd_account_set_status_shows_message_when_set_valid(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
+    stub_accounts_set_login_presence();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "status", "away", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
-
-    expect_any(accounts_set_login_presence, account_name);
-    expect_any(accounts_set_login_presence, value);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Updated login status for account a_account: away");
     expect_cons_show("");
@@ -811,14 +795,12 @@ void cmd_account_set_status_shows_message_when_set_valid(void **state)
 void cmd_account_set_status_shows_message_when_set_last(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
+    stub_accounts_set_login_presence();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "status", "last", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
-
-    expect_any(accounts_set_login_presence, account_name);
-    expect_any(accounts_set_login_presence, value);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Updated login status for account a_account: last");
     expect_cons_show("");
@@ -832,11 +814,11 @@ void cmd_account_set_status_shows_message_when_set_last(void **state)
 void cmd_account_set_invalid_presence_string_priority_shows_message(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "blah", "10", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Invalid property: blah");
     expect_cons_show("");
@@ -850,11 +832,11 @@ void cmd_account_set_invalid_presence_string_priority_shows_message(void **state
 void cmd_account_set_last_priority_shows_message(void **state)
 {
     mock_cons_show();
+    mock_accounts_account_exists();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "last", "10", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
     expect_cons_show("Invalid property: last");
     expect_cons_show("");
@@ -868,14 +850,14 @@ void cmd_account_set_last_priority_shows_message(void **state)
 void cmd_account_set_online_priority_sets_preference(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_priorities();
     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);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_priority_online, account_name, "a_account");
-    expect_value(accounts_set_priority_online, value, 10);
+    accounts_set_priority_online_expect("a_account", 10);
 
     mock_connection_status(JABBER_DISCONNECTED);
 
@@ -888,14 +870,14 @@ void cmd_account_set_online_priority_sets_preference(void **state)
 void cmd_account_set_chat_priority_sets_preference(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_priorities();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "chat", "10", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_priority_chat, account_name, "a_account");
-    expect_value(accounts_set_priority_chat, value, 10);
+    accounts_set_priority_chat_expect("a_account", 10);
 
     mock_connection_status(JABBER_DISCONNECTED);
 
@@ -908,14 +890,14 @@ void cmd_account_set_chat_priority_sets_preference(void **state)
 void cmd_account_set_away_priority_sets_preference(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_priorities();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "away", "10", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_priority_away, account_name, "a_account");
-    expect_value(accounts_set_priority_away, value, 10);
+    accounts_set_priority_away_expect("a_account", 10);
 
     mock_connection_status(JABBER_DISCONNECTED);
 
@@ -928,14 +910,14 @@ void cmd_account_set_away_priority_sets_preference(void **state)
 void cmd_account_set_xa_priority_sets_preference(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_priorities();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "xa", "10", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_priority_xa, account_name, "a_account");
-    expect_value(accounts_set_priority_xa, value, 10);
+    accounts_set_priority_xa_expect("a_account", 10);
 
     mock_connection_status(JABBER_DISCONNECTED);
 
@@ -948,14 +930,14 @@ void cmd_account_set_xa_priority_sets_preference(void **state)
 void cmd_account_set_dnd_priority_sets_preference(void **state)
 {
     stub_cons_show();
+    mock_accounts_account_exists();
+    mock_accounts_set_priorities();
     CommandHelp *help = malloc(sizeof(CommandHelp));
     gchar *args[] = { "set", "a_account", "dnd", "10", NULL };
 
-    expect_any(accounts_account_exists, account_name);
-    will_return(accounts_account_exists, TRUE);
+    accounts_account_exists_return(TRUE);
 
-    expect_string(accounts_set_priority_dnd, account_name, "a_account");
-    expect_value(accounts_set_priority_dnd, value, 10);
+    accounts_set_priority_dnd_expect("a_account", 10);
 
     mock_connection_status(JABBER_DISCONNECTED);