Added tests for setting presence priorities

src/command/commands.c

@@ -259,10 +259,15 @@ cmd_account(gchar **args, struct cmd_help_t help)
                                     accounts_set_priority_dnd(account_name, intval);
                                     break;
                             }
+
                             jabber_conn_status_t conn_status = jabber_get_connection_status();
-                            resource_presence_t last_presence = accounts_get_last_presence(jabber_get_account_name());
-                            if (conn_status == JABBER_CONNECTED && presence_type == last_presence) {
-                                presence_update(last_presence, jabber_get_presence_message(), 0);
+                            if (conn_status == JABBER_CONNECTED) {
+                                char *connected_account = jabber_get_account_name();
+                                resource_presence_t last_presence = accounts_get_last_presence(connected_account);
+
+                                if (presence_type == last_presence) {
+                                    presence_update(last_presence, jabber_get_presence_message(), 0);
+                                }
                             }
                             cons_show("Updated %s priority for account %s: %s", property, account_name, value);
                             cons_show("");

tests/config/mock_accounts.c

@@ -143,11 +143,36 @@ resource_presence_t accounts_get_last_presence(const char * const account_name)
     return (resource_presence_t)mock();
 }
 
-void accounts_set_priority_online(const char * const account_name, const gint value) {}
-void accounts_set_priority_chat(const char * const account_name, const gint value) {}
-void accounts_set_priority_away(const char * const account_name, const gint value) {}
-void accounts_set_priority_xa(const char * const account_name, const gint value) {}
-void accounts_set_priority_dnd(const char * const account_name, const gint value) {}
+void accounts_set_priority_online(const char * const account_name, const gint value)
+{
+    check_expected(account_name);
+    check_expected(value);
+}
+
+void accounts_set_priority_chat(const char * const account_name, const gint value)
+{
+    check_expected(account_name);
+    check_expected(value);
+}
+
+void accounts_set_priority_away(const char * const account_name, const gint value)
+{
+    check_expected(account_name);
+    check_expected(value);
+}
+
+void accounts_set_priority_xa(const char * const account_name, const gint value)
+{
+    check_expected(account_name);
+    check_expected(value);
+}
+
+void accounts_set_priority_dnd(const char * const account_name, const gint value)
+{
+    check_expected(account_name);
+    check_expected(value);
+}
+
 void accounts_set_priority_all(const char * const account_name, const gint value) {}
 
 gint accounts_get_priority_for_presence_type(const char * const account_name,

tests/test_cmd_account.c

@@ -528,7 +528,7 @@ void cmd_account_set_server_sets_server(void **state)
     expect_string(accounts_set_server, value, "a_server");
 
     expect_any_count(cons_show, output, 2);
-    
+
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -548,7 +548,7 @@ void cmd_account_set_server_shows_message(void **state)
 
     expect_string(cons_show, output, "Updated server for account a_account: a_server");
     expect_string(cons_show, output, "");
-    
+
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -567,7 +567,7 @@ void cmd_account_set_resource_sets_resource(void **state)
     expect_string(accounts_set_resource, value, "a_resource");
 
     expect_any_count(cons_show, output, 2);
-    
+
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -587,7 +587,7 @@ void cmd_account_set_resource_shows_message(void **state)
 
     expect_string(cons_show, output, "Updated resource for account a_account: a_resource");
     expect_string(cons_show, output, "");
-    
+
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -606,7 +606,7 @@ void cmd_account_set_password_sets_password(void **state)
     expect_string(accounts_set_password, value, "a_password");
 
     expect_any_count(cons_show, output, 2);
-    
+
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -626,7 +626,7 @@ void cmd_account_set_password_shows_message(void **state)
 
     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);
 
@@ -645,7 +645,7 @@ void cmd_account_set_muc_sets_muc(void **state)
     expect_string(accounts_set_muc_service, value, "a_muc");
 
     expect_any_count(cons_show, output, 2);
-    
+
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -665,7 +665,7 @@ void cmd_account_set_muc_shows_message(void **state)
 
     expect_string(cons_show, output, "Updated muc service for account a_account: a_muc");
     expect_string(cons_show, output, "");
-    
+
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -684,7 +684,7 @@ void cmd_account_set_nick_sets_nick(void **state)
     expect_string(accounts_set_muc_nick, value, "a_nick");
 
     expect_any_count(cons_show, output, 2);
-    
+
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -704,7 +704,7 @@ void cmd_account_set_nick_shows_message(void **state)
 
     expect_string(cons_show, output, "Updated muc nick for account a_account: a_nick");
     expect_string(cons_show, output, "");
-    
+
     gboolean result = cmd_account(args, *help);
     assert_true(result);
 
@@ -839,3 +839,114 @@ void cmd_account_set_last_priority_shows_message(void **state)
 
     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);
+    will_return(accounts_account_exists, TRUE);
+
+    expect_string(accounts_set_priority_online, account_name, "a_account");
+    expect_value(accounts_set_priority_online, value, 10);
+
+    will_return(jabber_get_connection_status, JABBER_DISCONNECTED);
+
+    expect_any_count(cons_show, output, 2);
+
+    gboolean result = cmd_account(args, *help);
+    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);
+    will_return(accounts_account_exists, TRUE);
+
+    expect_string(accounts_set_priority_chat, account_name, "a_account");
+    expect_value(accounts_set_priority_chat, value, 10);
+
+    will_return(jabber_get_connection_status, JABBER_DISCONNECTED);
+
+    expect_any_count(cons_show, output, 2);
+
+    gboolean result = cmd_account(args, *help);
+    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);
+    will_return(accounts_account_exists, TRUE);
+
+    expect_string(accounts_set_priority_away, account_name, "a_account");
+    expect_value(accounts_set_priority_away, value, 10);
+
+    will_return(jabber_get_connection_status, JABBER_DISCONNECTED);
+
+    expect_any_count(cons_show, output, 2);
+
+    gboolean result = cmd_account(args, *help);
+    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);
+    will_return(accounts_account_exists, TRUE);
+
+    expect_string(accounts_set_priority_xa, account_name, "a_account");
+    expect_value(accounts_set_priority_xa, value, 10);
+
+    will_return(jabber_get_connection_status, JABBER_DISCONNECTED);
+
+    expect_any_count(cons_show, output, 2);
+
+    gboolean result = cmd_account(args, *help);
+    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);
+    will_return(accounts_account_exists, TRUE);
+
+    expect_string(accounts_set_priority_dnd, account_name, "a_account");
+    expect_value(accounts_set_priority_dnd, value, 10);
+
+    will_return(jabber_get_connection_status, JABBER_DISCONNECTED);
+
+    expect_any_count(cons_show, output, 2);
+
+    gboolean result = cmd_account(args, *help);
+    assert_true(result);
+
+    free(help);
+}
+
+// test message shown when set
+// test invalid priority low
+// test invalid priority high
+// test presence updated when connected as account and current presence equals setting
+

tests/test_cmd_account.h

@@ -45,3 +45,8 @@ void cmd_account_set_status_shows_message_when_set_valid(void **state);
 void cmd_account_set_status_shows_message_when_set_last(void **state);
 void cmd_account_set_invalid_presence_string_priority_shows_message(void **state);
 void cmd_account_set_last_priority_shows_message(void **state);
+void cmd_account_set_online_priority_sets_preference(void **state);
+void cmd_account_set_chat_priority_sets_preference(void **state);
+void cmd_account_set_away_priority_sets_preference(void **state);
+void cmd_account_set_xa_priority_sets_preference(void **state);
+void cmd_account_set_dnd_priority_sets_preference(void **state);

tests/testsuite.c

@@ -236,6 +236,11 @@ int main(int argc, char* argv[]) {
         unit_test(cmd_account_set_status_shows_message_when_set_last),
         unit_test(cmd_account_set_invalid_presence_string_priority_shows_message),
         unit_test(cmd_account_set_last_priority_shows_message),
+        unit_test(cmd_account_set_online_priority_sets_preference),
+        unit_test(cmd_account_set_chat_priority_sets_preference),
+        unit_test(cmd_account_set_away_priority_sets_preference),
+        unit_test(cmd_account_set_xa_priority_sets_preference),
+        unit_test(cmd_account_set_dnd_priority_sets_preference),
     };
     return run_tests(tests);
 }