4 files changed, 51 insertions, 1 deletions
diff --git a/tests/config/mock_accounts.c b/tests/config/mock_accounts.c
index 345e5978..294d2662 100644
--- a/tests/config/mock_accounts.c
+++ b/tests/config/mock_accounts.c
@@ -107,7 +107,12 @@ void accounts_set_resource(const char * const account_name, const char * const v
     check_expected(value);
 }
 
-void accounts_set_password(const char * const account_name, const char * const value) {}
+void accounts_set_password(const char * const account_name, const char * const value)
+{
+    check_expected(account_name);
+    check_expected(value);
+}
+
 void accounts_set_muc_service(const char * const account_name, const char * const value) {}
 void accounts_set_muc_nick(const char * const account_name, const char * const value) {}
 void accounts_set_last_presence(const char * const account_name, const char * const value) {}
diff --git a/tests/test_cmd_account.c b/tests/test_cmd_account.c
index 0b267659..5deece35 100644
--- a/tests/test_cmd_account.c
+++ b/tests/test_cmd_account.c
@@ -602,3 +602,44 @@ void cmd_account_set_resource_shows_message(void **state)
 
     free(help);
 }
+
+void cmd_account_set_password_sets_password(void **state)
+{
+    CommandHelp *help = malloc(sizeof(CommandHelp));
+    help->usage = "some usage";
+    gchar *args[] = { "set", "a_account", "password", "a_password", NULL };
+
+    expect_any(accounts_account_exists, account_name);
+    will_return(accounts_account_exists, TRUE);
+
+    expect_string(accounts_set_password, account_name, "a_account");
+    expect_string(accounts_set_password, value, "a_password");
+
+    expect_any_count(cons_show, output, 2);
+    
+    gboolean result = cmd_account(args, *help);
+    assert_true(result);
+
+    free(help);
+}
+
+void cmd_account_set_password_shows_message(void **state)
+{
+    CommandHelp *help = malloc(sizeof(CommandHelp));
+    help->usage = "some usage";
+    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);
+
+    expect_string(cons_show, output, "Updated password for account a_account");
+    expect_string(cons_show, output, "");
+    
+    gboolean result = cmd_account(args, *help);
+    assert_true(result);
+
+    free(help);
+}
diff --git a/tests/test_cmd_account.h b/tests/test_cmd_account.h
index 412f5774..0355a73c 100644
--- a/tests/test_cmd_account.h
+++ b/tests/test_cmd_account.h
@@ -32,3 +32,5 @@ void cmd_account_set_server_sets_server(void **state);
 void cmd_account_set_server_shows_message(void **state);
 void cmd_account_set_resource_sets_resource(void **state);
 void cmd_account_set_resource_shows_message(void **state);
+void cmd_account_set_password_sets_password(void **state);
+void cmd_account_set_password_shows_message(void **state);
diff --git a/tests/testsuite.c b/tests/testsuite.c
index 9fc62c71..6bff4361 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -215,6 +215,8 @@ int main(int argc, char* argv[]) {
         unit_test(cmd_account_set_server_shows_message),
         unit_test(cmd_account_set_resource_sets_resource),
         unit_test(cmd_account_set_resource_shows_message),
+        unit_test(cmd_account_set_password_sets_password),
+        unit_test(cmd_account_set_password_shows_message),
     };
     return run_tests(tests);
 }