diff options
Diffstat (limited to 'tests/unittests')
| -rw-r--r-- | tests/unittests/test_cmd_account.c | 110 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_alias.c | 18 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_bookmark.c | 47 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_connect.c | 44 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_disconnect.c | 4 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_join.c | 12 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_otr.c | 75 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_rooms.c | 6 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_roster.c | 26 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_statuses.c | 26 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_sub.c | 4 | ||||
| -rw-r--r-- | tests/unittests/ui/stub_ui.c | 5 |
12 files changed, 194 insertions, 183 deletions
diff --git a/tests/unittests/test_cmd_account.c b/tests/unittests/test_cmd_account.c index bddc4c6d..a0f71bc8 100644 --- a/tests/unittests/test_cmd_account.c +++ b/tests/unittests/test_cmd_account.c @@ -25,7 +25,7 @@ void cmd_account_shows_usage_when_not_connected_and_no_args(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -46,7 +46,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -67,7 +67,7 @@ void cmd_account_list_shows_accounts(void **state) expect_memory(cons_show_account_list, accounts, accounts, sizeof(accounts)); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -81,7 +81,7 @@ void cmd_account_show_shows_usage_when_no_arg(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -98,7 +98,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -116,7 +116,7 @@ void cmd_account_show_shows_account_when_exists(void **state) expect_memory(cons_show_account, account, account, sizeof(account)); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -130,7 +130,7 @@ void cmd_account_add_shows_usage_when_no_arg(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -147,7 +147,7 @@ void cmd_account_add_adds_account(void **state) expect_cons_show("Account created."); expect_cons_show(""); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -161,7 +161,7 @@ void cmd_account_enable_shows_usage_when_no_arg(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -178,7 +178,7 @@ void cmd_account_enable_enables_account(void **state) expect_cons_show("Account enabled."); expect_cons_show(""); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -195,7 +195,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -209,7 +209,7 @@ void cmd_account_disable_shows_usage_when_no_arg(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -226,7 +226,7 @@ void cmd_account_disable_disables_account(void **state) expect_cons_show("Account disabled."); expect_cons_show(""); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -243,7 +243,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -257,7 +257,7 @@ void cmd_account_rename_shows_usage_when_no_args(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -271,7 +271,7 @@ void cmd_account_rename_shows_usage_when_one_arg(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -289,7 +289,7 @@ void cmd_account_rename_renames_account(void **state) expect_cons_show("Account renamed."); expect_cons_show(""); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -307,7 +307,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -321,7 +321,7 @@ void cmd_account_set_shows_usage_when_no_args(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -335,7 +335,7 @@ void cmd_account_set_shows_usage_when_one_arg(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -349,7 +349,7 @@ void cmd_account_set_shows_usage_when_two_args(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -366,7 +366,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -382,7 +382,7 @@ void cmd_account_set_jid_shows_message_for_malformed_jid(void **state) expect_cons_show("Malformed jid: @malformed"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -402,7 +402,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -427,7 +427,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -447,7 +447,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -467,7 +467,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -493,7 +493,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -519,7 +519,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -540,7 +540,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -561,7 +561,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -581,7 +581,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -601,7 +601,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -615,7 +615,7 @@ void cmd_account_show_message_for_missing_otr_policy(void **state) expect_cons_show("Usage: Some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -631,7 +631,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -651,7 +651,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -668,7 +668,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -688,7 +688,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -708,7 +708,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -725,7 +725,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -742,7 +742,7 @@ void cmd_account_set_last_priority_shows_message(void **state) expect_cons_show("Invalid property: last"); expect_cons_show(""); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -764,7 +764,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -786,7 +786,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -808,7 +808,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -830,7 +830,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -852,7 +852,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -868,7 +868,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -884,7 +884,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -900,7 +900,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -916,7 +916,7 @@ void cmd_account_set_priority_when_empty_shows_message(void **state) expect_cons_show("Could not convert \"\" to a number."); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -948,7 +948,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -962,7 +962,7 @@ void cmd_account_clear_shows_usage_when_no_args(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -976,7 +976,7 @@ void cmd_account_clear_shows_usage_when_one_arg(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -993,7 +993,7 @@ 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(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); @@ -1010,7 +1010,7 @@ void cmd_account_clear_shows_message_when_invalid_property(void **state) expect_cons_show("Invalid property: badproperty"); expect_cons_show(""); - gboolean result = cmd_account(args, *help); + gboolean result = cmd_account(NULL, args, *help); assert_true(result); free(help); diff --git a/tests/unittests/test_cmd_alias.c b/tests/unittests/test_cmd_alias.c index 10ab7f53..37513f8d 100644 --- a/tests/unittests/test_cmd_alias.c +++ b/tests/unittests/test_cmd_alias.c @@ -24,7 +24,7 @@ void cmd_alias_add_shows_usage_when_no_args(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_alias(args, *help); + gboolean result = cmd_alias(NULL, args, *help); assert_true(result); free(help); @@ -38,7 +38,7 @@ void cmd_alias_add_shows_usage_when_no_value(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_alias(args, *help); + gboolean result = cmd_alias(NULL, args, *help); assert_true(result); free(help); @@ -52,7 +52,7 @@ void cmd_alias_remove_shows_usage_when_no_args(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_alias(args, *help); + gboolean result = cmd_alias(NULL, args, *help); assert_true(result); free(help); @@ -66,7 +66,7 @@ void cmd_alias_show_usage_when_invalid_subcmd(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_alias(args, *help); + gboolean result = cmd_alias(NULL, args, *help); assert_true(result); free(help); @@ -79,7 +79,7 @@ void cmd_alias_add_adds_alias(void **state) expect_cons_show("Command alias added /hc -> /help commands"); - gboolean result = cmd_alias(args, *help); + gboolean result = cmd_alias(NULL, args, *help); char *returned_val = prefs_get_alias("hc"); @@ -100,7 +100,7 @@ void cmd_alias_add_shows_message_when_exists(void **state) expect_cons_show("Command or alias '/hc' already exists."); - gboolean result = cmd_alias(args, *help); + gboolean result = cmd_alias(NULL, args, *help); assert_true(result); free(help); @@ -115,7 +115,7 @@ void cmd_alias_remove_removes_alias(void **state) expect_cons_show("Command alias removed -> /hn"); - gboolean result = cmd_alias(args, *help); + gboolean result = cmd_alias(NULL, args, *help); char *returned_val = prefs_get_alias("hn"); @@ -132,7 +132,7 @@ void cmd_alias_remove_shows_message_when_no_alias(void **state) expect_cons_show("No such command alias /hn"); - gboolean result = cmd_alias(args, *help); + gboolean result = cmd_alias(NULL, args, *help); assert_true(result); free(help); @@ -152,7 +152,7 @@ void cmd_alias_list_shows_all_aliases(void **state) // write a custom checker to check the correct list is passed expect_any(cons_show_aliases, aliases); - gboolean result = cmd_alias(args, *help); + gboolean result = cmd_alias(NULL, args, *help); assert_true(result); free(help); diff --git a/tests/unittests/test_cmd_bookmark.c b/tests/unittests/test_cmd_bookmark.c index 695e7362..04326f98 100644 --- a/tests/unittests/test_cmd_bookmark.c +++ b/tests/unittests/test_cmd_bookmark.c @@ -27,7 +27,7 @@ static void test_with_connection_status(jabber_conn_status_t status) will_return(jabber_get_connection_status, status); expect_cons_show("You are not currently connected."); - gboolean result = cmd_bookmark(NULL, *help); + gboolean result = cmd_bookmark(NULL, NULL, *help); assert_true(result); free(help); @@ -63,13 +63,14 @@ void cmd_bookmark_shows_usage_when_no_args(void **state) CommandHelp *help = malloc(sizeof(CommandHelp)); help->usage = "some usage"; gchar *args[] = { NULL }; + ProfWin window; + window.type = WIN_CONSOLE; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CONSOLE); expect_cons_show("Usage: some usage"); - gboolean result = cmd_bookmark(args, *help); + gboolean result = cmd_bookmark(&window, args, *help); assert_true(result); free(help); @@ -103,6 +104,8 @@ void cmd_bookmark_list_shows_bookmarks(void **state) CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "list", NULL }; GList *bookmarks = NULL; + ProfWin window; + window.type = WIN_CONSOLE; Bookmark *bm1 = malloc(sizeof(Bookmark)); bm1->jid = strdup("room1@conf.org"); @@ -132,14 +135,13 @@ void cmd_bookmark_list_shows_bookmarks(void **state) bookmarks = g_list_append(bookmarks, bm5); will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CONSOLE); will_return(bookmark_get_list, bookmarks); // TODO - Custom list compare glist_set_cmp((GCompareFunc)_cmp_bookmark); expect_any(cons_show_bookmarks, list); - gboolean result = cmd_bookmark(args, *help); + gboolean result = cmd_bookmark(&window, args, *help); assert_true(result); free(help); @@ -151,13 +153,14 @@ void cmd_bookmark_add_shows_message_when_invalid_jid(void **state) char *jid = "room"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "add", jid, NULL }; + ProfWin window; + window.type = WIN_CONSOLE; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CONSOLE); expect_cons_show("Can't add bookmark with JID 'room'; should be 'room@domain.tld'"); - gboolean result = cmd_bookmark(args, *help); + gboolean result = cmd_bookmark(&window, args, *help); assert_true(result); free(help); @@ -168,9 +171,10 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state) char *jid = "room@conf.server"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "add", jid, NULL }; + ProfWin window; + window.type = WIN_CONSOLE; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CONSOLE); expect_string(bookmark_add, jid, jid); expect_any(bookmark_add, nick); @@ -180,7 +184,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state) expect_cons_show("Bookmark added for room@conf.server."); - gboolean result = cmd_bookmark(args, *help); + gboolean result = cmd_bookmark(&window, args, *help); assert_true(result); free(help); @@ -191,9 +195,10 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state) char *nick = "bob"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "add", jid, "nick", nick, NULL }; + ProfWin window; + window.type = WIN_CONSOLE; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CONSOLE); expect_string(bookmark_add, jid, jid); expect_string(bookmark_add, nick, nick); @@ -203,7 +208,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state) expect_cons_show("Bookmark added for room@conf.server."); - gboolean result = cmd_bookmark(args, *help); + gboolean result = cmd_bookmark(&window, args, *help); assert_true(result); free(help); @@ -214,9 +219,10 @@ void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state) char *jid = "room@conf.server"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "add", jid, "autojoin", "on", NULL }; + ProfWin window; + window.type = WIN_CONSOLE; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CONSOLE); expect_string(bookmark_add, jid, jid); expect_any(bookmark_add, nick); @@ -226,7 +232,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state) expect_cons_show("Bookmark added for room@conf.server."); - gboolean result = cmd_bookmark(args, *help); + gboolean result = cmd_bookmark(&window, args, *help); assert_true(result); free(help); @@ -238,9 +244,10 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state) char *nick = "bob"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "add", jid, "nick", nick, "autojoin", "on", NULL }; + ProfWin window; + window.type = WIN_CONSOLE; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CONSOLE); expect_string(bookmark_add, jid, jid); expect_string(bookmark_add, nick, nick); @@ -250,7 +257,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state) expect_cons_show("Bookmark added for room@conf.server."); - gboolean result = cmd_bookmark(args, *help); + gboolean result = cmd_bookmark(&window, args, *help); assert_true(result); free(help); @@ -261,16 +268,17 @@ void cmd_bookmark_remove_removes_bookmark(void **state) char *jid = "room@conf.server"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "remove", jid, NULL }; + ProfWin window; + window.type = WIN_CONSOLE; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CONSOLE); expect_string(bookmark_remove, jid, jid); will_return(bookmark_remove, TRUE); expect_cons_show("Bookmark removed for room@conf.server."); - gboolean result = cmd_bookmark(args, *help); + gboolean result = cmd_bookmark(&window, args, *help); assert_true(result); free(help); @@ -281,16 +289,17 @@ void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state) char *jid = "room@conf.server"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "remove", jid, NULL }; + ProfWin window; + window.type = WIN_CONSOLE; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CONSOLE); expect_any(bookmark_remove, jid); will_return(bookmark_remove, FALSE); expect_cons_show("No bookmark exists for room@conf.server."); - gboolean result = cmd_bookmark(args, *help); + gboolean result = cmd_bookmark(&window, args, *help); assert_true(result); free(help); diff --git a/tests/unittests/test_cmd_connect.c b/tests/unittests/test_cmd_connect.c index e2089a09..de79ef29 100644 --- a/tests/unittests/test_cmd_connect.c +++ b/tests/unittests/test_cmd_connect.c @@ -22,7 +22,7 @@ static void test_with_connection_status(jabber_conn_status_t status) expect_cons_show("You are either connected already, or a login is in process."); - gboolean result = cmd_connect(NULL, *help); + gboolean result = cmd_connect(NULL, NULL, *help); assert_true(result); free(help); @@ -59,7 +59,7 @@ void cmd_connect_shows_usage_when_no_server_value(void **state) expect_cons_show("Usage: some usage"); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -76,7 +76,7 @@ void cmd_connect_shows_usage_when_server_no_port_value(void **state) expect_cons_show("Usage: some usage"); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -93,7 +93,7 @@ void cmd_connect_shows_usage_when_no_port_value(void **state) expect_cons_show("Usage: some usage"); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -110,7 +110,7 @@ void cmd_connect_shows_usage_when_port_no_server_value(void **state) expect_cons_show("Usage: some usage"); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -126,7 +126,7 @@ void cmd_connect_shows_message_when_port_0(void **state) expect_cons_show("Value 0 out of range. Must be in 1..65535."); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -142,7 +142,7 @@ void cmd_connect_shows_message_when_port_minus1(void **state) expect_cons_show("Value -1 out of range. Must be in 1..65535."); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -158,7 +158,7 @@ void cmd_connect_shows_message_when_port_65536(void **state) expect_cons_show("Value 65536 out of range. Must be in 1..65535."); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -174,7 +174,7 @@ void cmd_connect_shows_message_when_port_contains_chars(void **state) expect_cons_show("Could not convert \"52f66\" to a number."); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -191,7 +191,7 @@ void cmd_connect_shows_usage_when_server_provided_twice(void **state) expect_cons_show("Usage: some usage"); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -208,7 +208,7 @@ void cmd_connect_shows_usage_when_port_provided_twice(void **state) expect_cons_show("Usage: some usage"); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -225,7 +225,7 @@ void cmd_connect_shows_usage_when_invalid_first_property(void **state) expect_cons_show("Usage: some usage"); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -242,7 +242,7 @@ void cmd_connect_shows_usage_when_invalid_second_property(void **state) expect_cons_show("Usage: some usage"); expect_cons_show(""); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -268,7 +268,7 @@ void cmd_connect_when_no_account(void **state) expect_value(jabber_connect_with_details, port, 0); will_return(jabber_connect_with_details, JABBER_CONNECTING); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -294,7 +294,7 @@ void cmd_connect_with_server_when_provided(void **state) expect_value(jabber_connect_with_details, port, 0); will_return(jabber_connect_with_details, JABBER_CONNECTING); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -320,7 +320,7 @@ void cmd_connect_with_port_when_provided(void **state) expect_value(jabber_connect_with_details, port, 5432); will_return(jabber_connect_with_details, JABBER_CONNECTING); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -346,7 +346,7 @@ void cmd_connect_with_server_and_port_when_provided(void **state) expect_value(jabber_connect_with_details, port, 5432); will_return(jabber_connect_with_details, JABBER_CONNECTING); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -374,7 +374,7 @@ void cmd_connect_fail_message(void **state) expect_cons_show_error("Connection attempt for user@server.org failed."); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -400,7 +400,7 @@ void cmd_connect_lowercases_argument(void **state) expect_any(jabber_connect_with_details, port); will_return(jabber_connect_with_details, JABBER_CONNECTING); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -425,7 +425,7 @@ void cmd_connect_asks_password_when_not_in_account(void **state) expect_any(jabber_connect_with_account, account); will_return(jabber_connect_with_account, JABBER_CONNECTING); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -448,7 +448,7 @@ void cmd_connect_shows_message_when_connecting_with_account(void **state) expect_any(jabber_connect_with_account, account); will_return(jabber_connect_with_account, JABBER_CONNECTING); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); @@ -471,7 +471,7 @@ void cmd_connect_connects_with_account(void **state) expect_memory(jabber_connect_with_account, account, account, sizeof(account)); will_return(jabber_connect_with_account, JABBER_CONNECTING); - gboolean result = cmd_connect(args, *help); + gboolean result = cmd_connect(NULL, args, *help); assert_true(result); free(help); diff --git a/tests/unittests/test_cmd_disconnect.c b/tests/unittests/test_cmd_disconnect.c index 68253820..957516c2 100644 --- a/tests/unittests/test_cmd_disconnect.c +++ b/tests/unittests/test_cmd_disconnect.c @@ -25,7 +25,7 @@ void clears_chat_sessions(void **state) will_return(jabber_get_fulljid, "myjid@myserver.com"); expect_any_cons_show(); - gboolean result = cmd_disconnect(NULL, *help); + gboolean result = cmd_disconnect(NULL, NULL, *help); assert_true(result); @@ -34,4 +34,4 @@ void clears_chat_sessions(void **state) assert_null(session1); assert_null(session2); free(help); -} \ No newline at end of file +} diff --git a/tests/unittests/test_cmd_join.c b/tests/unittests/test_cmd_join.c index 19824b3a..478f1c7d 100644 --- a/tests/unittests/test_cmd_join.c +++ b/tests/unittests/test_cmd_join.c @@ -24,7 +24,7 @@ static void test_with_connection_status(jabber_conn_status_t status) expect_cons_show("You are not currently connected."); - gboolean result = cmd_join(NULL, *help); + gboolean result = cmd_join(NULL, NULL, *help); assert_true(result); free(help); @@ -60,7 +60,7 @@ void cmd_join_shows_error_message_when_invalid_room_jid(void **state) expect_cons_show_error("Specified room has incorrect format."); expect_cons_show(""); - gboolean result = cmd_join(args, *help); + gboolean result = cmd_join(NULL, args, *help); assert_true(result); free(help); @@ -90,7 +90,7 @@ void cmd_join_uses_account_mucservice_when_no_service_specified(void **state) expect_string(presence_join_room, nick, nick); expect_value(presence_join_room, passwd, NULL); - gboolean result = cmd_join(args, *help); + gboolean result = cmd_join(NULL, args, *help); assert_true(result); free(help); @@ -118,7 +118,7 @@ void cmd_join_uses_supplied_nick(void **state) expect_string(presence_join_room, nick, nick); expect_value(presence_join_room, passwd, NULL); - gboolean result = cmd_join(args, *help); + gboolean result = cmd_join(NULL, args, *help); assert_true(result); free(help); @@ -146,7 +146,7 @@ void cmd_join_uses_account_nick_when_not_supplied(void **state) expect_string(presence_join_room, nick, account_nick); expect_value(presence_join_room, passwd, NULL); - gboolean result = cmd_join(args, *help); + gboolean result = cmd_join(NULL, args, *help); assert_true(result); free(help); @@ -177,7 +177,7 @@ void cmd_join_uses_password_when_supplied(void **state) expect_string(presence_join_room, nick, account_nick); expect_value(presence_join_room, passwd, password); - gboolean result = cmd_join(args, *help); + gboolean result = cmd_join(NULL, args, *help); assert_true(result); free(help); diff --git a/tests/unittests/test_cmd_otr.c b/tests/unittests/test_cmd_otr.c index 90724aed..44c09bfd 100644 --- a/tests/unittests/test_cmd_otr.c +++ b/tests/unittests/test_cmd_otr.c @@ -31,7 +31,7 @@ void cmd_otr_shows_usage_when_no_args(void **state) expect_cons_show("Usage: Some usage"); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -47,7 +47,7 @@ void cmd_otr_shows_usage_when_invalid_subcommand(void **state) expect_cons_show("Usage: Some usage"); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -61,7 +61,7 @@ void cmd_otr_log_shows_usage_when_no_args(void **state) expect_cons_show("Usage: Some usage"); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -75,7 +75,7 @@ void cmd_otr_log_shows_usage_when_invalid_subcommand(void **state) expect_cons_show("Usage: Some usage"); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -90,7 +90,7 @@ void cmd_otr_log_on_enables_logging(void **state) expect_cons_show("OTR messages will be logged as plaintext."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); char *pref_otr_log = prefs_get_string(PREF_OTR_LOG); assert_true(result); @@ -109,7 +109,7 @@ void cmd_otr_log_on_shows_warning_when_chlog_disabled(void **state) expect_cons_show("OTR messages will be logged as plaintext."); expect_cons_show("Chat logging is currently disabled, use '/chlog on' to enable."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -124,7 +124,7 @@ void cmd_otr_log_off_disables_logging(void **state) expect_cons_show("OTR message logging disabled."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); char *pref_otr_log = prefs_get_string(PREF_OTR_LOG); assert_true(result); @@ -142,7 +142,7 @@ void cmd_otr_redact_redacts_logging(void **state) expect_cons_show("OTR messages will be logged as '[redacted]'."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); char *pref_otr_log = prefs_get_string(PREF_OTR_LOG); assert_true(result); @@ -161,7 +161,7 @@ void cmd_otr_log_redact_shows_warning_when_chlog_disabled(void **state) expect_cons_show("OTR messages will be logged as '[redacted]'."); expect_cons_show("Chat logging is currently disabled, use '/chlog on' to enable."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -175,7 +175,7 @@ void cmd_otr_warn_shows_usage_when_no_args(void **state) expect_cons_show("Usage: Some usage"); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -189,7 +189,7 @@ void cmd_otr_warn_shows_usage_when_invalid_arg(void **state) expect_cons_show("Usage: Some usage"); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -203,7 +203,7 @@ void cmd_otr_warn_on_enables_unencrypted_warning(void **state) expect_cons_show("OTR warning message enabled."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); gboolean otr_warn_enabled = prefs_get_boolean(PREF_OTR_WARN); assert_true(result); @@ -220,7 +220,7 @@ void cmd_otr_warn_off_disables_unencrypted_warning(void **state) expect_cons_show("OTR warning message disabled."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); gboolean otr_warn_enabled = prefs_get_boolean(PREF_OTR_WARN); assert_true(result); @@ -241,7 +241,7 @@ void cmd_otr_libver_shows_libotr_version(void **state) expect_cons_show(message->str); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); g_string_free(message, TRUE); @@ -257,7 +257,7 @@ void cmd_otr_gen_shows_message_when_not_connected(void **state) expect_cons_show("You must be connected with an account to load OTR information."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -272,7 +272,7 @@ static void test_with_command_and_connection_status(char *command, jabber_conn_s expect_cons_show("You must be connected with an account to load OTR information."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -320,7 +320,7 @@ void cmd_otr_gen_generates_key_for_connected_account(void **state) expect_memory(otr_keygen, account, account, sizeof(ProfAccount)); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -361,7 +361,7 @@ void cmd_otr_myfp_shows_message_when_no_key(void **state) expect_ui_current_print_formatted_line('!', 0, "You have not generated or loaded a private key, use '/otr gen'"); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); @@ -381,7 +381,7 @@ void cmd_otr_myfp_shows_my_fingerprint(void **state) expect_ui_current_print_formatted_line('!', 0, message->str); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); g_string_free(message, TRUE); @@ -393,13 +393,14 @@ test_cmd_otr_theirfp_from_wintype(win_type_t wintype) { CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "theirfp", NULL }; + ProfWin window; + window.type = wintype; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, wintype); expect_ui_current_print_line("You must be in a regular chat window to view a recipient's fingerprint."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(&window, args, *help); assert_true(result); free(help); @@ -425,9 +426,10 @@ void cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void **state) char *recipient = "someuser@someserver.com"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "theirfp", NULL }; + ProfWin window; + window.type = WIN_CHAT; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CHAT); ProfChatWin *chatwin = malloc(sizeof(ProfChatWin)); chatwin->barejid = strdup(recipient); @@ -440,7 +442,7 @@ void cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void **state) expect_ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(&window, args, *help); assert_true(result); free(help); @@ -456,6 +458,8 @@ void cmd_otr_theirfp_shows_fingerprint(void **state) GString *message = g_string_new(recipient); g_string_append(message, "'s OTR fingerprint: "); g_string_append(message, fingerprint); + ProfWin window; + window.type = WIN_CHAT; ProfChatWin *chatwin = malloc(sizeof(ProfChatWin)); chatwin->barejid = strdup(recipient); @@ -468,14 +472,13 @@ void cmd_otr_theirfp_shows_fingerprint(void **state) wins_set_current_by_num(2); will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CHAT); expect_string(otr_get_their_fingerprint, recipient, chatwin->barejid); will_return(otr_get_their_fingerprint, strdup(fingerprint)); expect_ui_current_print_formatted_line('!', 0, message->str); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(&window, args, *help); assert_true(result); g_string_free(message, TRUE); @@ -488,13 +491,14 @@ test_cmd_otr_start_from_wintype(win_type_t wintype) { CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "start", NULL }; + ProfWin window; + window.type = wintype; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, wintype); expect_ui_current_print_line("You must be in a regular chat window to start an OTR session."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(&window, args, *help); assert_true(result); free(help); @@ -520,9 +524,10 @@ void cmd_otr_start_shows_message_when_already_started(void **state) char *recipient = "someone@server.org"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "start", NULL }; + ProfWin window; + window.type = WIN_CHAT; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CHAT); ProfChatWin *chatwin = malloc(sizeof(ProfChatWin)); chatwin->barejid = strdup(recipient); @@ -536,7 +541,7 @@ void cmd_otr_start_shows_message_when_already_started(void **state) expect_ui_current_print_formatted_line('!', 0, "You are already in an OTR session."); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(&window, args, *help); assert_true(result); free(help); @@ -548,9 +553,10 @@ void cmd_otr_start_shows_message_when_no_key(void **state) char *recipient = "someone@server.org"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "start", NULL }; + ProfWin window; + window.type = WIN_CHAT; will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CHAT); will_return(otr_key_loaded, FALSE); ProfChatWin *chatwin = malloc(sizeof(ProfChatWin)); @@ -565,7 +571,7 @@ void cmd_otr_start_shows_message_when_no_key(void **state) expect_ui_current_print_formatted_line('!', 0, "You have not generated or loaded a private key, use '/otr gen'"); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(&window, args, *help); assert_true(result); free(help); @@ -579,6 +585,8 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void **state) char *query_message = "?OTR?"; CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "start", NULL }; + ProfWin window; + window.type = WIN_CHAT; ProfChatWin *chatwin = malloc(sizeof(ProfChatWin)); chatwin->barejid = strdup(recipient); @@ -590,14 +598,13 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void **state) wins_set_current_by_num(2); will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(ui_current_win_type, WIN_CHAT); will_return(otr_key_loaded, TRUE); will_return(otr_start_query, query_message); expect_string(message_send_chat_encrypted, barejid, chatwin->barejid); expect_string(message_send_chat_encrypted, msg, query_message); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(&window, args, *help); assert_true(result); free(help); @@ -612,7 +619,7 @@ void cmd_otr_shows_message_when_otr_unsupported(void **state) expect_cons_show("This version of Profanity has not been built with OTR support enabled"); - gboolean result = cmd_otr(args, *help); + gboolean result = cmd_otr(NULL, args, *help); assert_true(result); free(help); diff --git a/tests/unittests/test_cmd_rooms.c b/tests/unittests/test_cmd_rooms.c index 5114bfbf..7a336561 100644 --- a/tests/unittests/test_cmd_rooms.c +++ b/tests/unittests/test_cmd_rooms.c @@ -22,7 +22,7 @@ static void test_with_connection_status(jabber_conn_status_t status) expect_cons_show("You are not currently connected."); - gboolean result = cmd_rooms(NULL, *help); + gboolean result = cmd_rooms(NULL, NULL, *help); assert_true(result); free(help); @@ -80,7 +80,7 @@ void cmd_rooms_uses_account_default_when_no_arg(void **state) expect_string(iq_room_list_request, conferencejid, "default_conf_server"); - gboolean result = cmd_rooms(args, *help); + gboolean result = cmd_rooms(NULL, args, *help); assert_true(result); @@ -96,7 +96,7 @@ void cmd_rooms_arg_used_when_passed(void **state) expect_string(iq_room_list_request, conferencejid, "conf_server_arg"); - gboolean result = cmd_rooms(args, *help); + gboolean result = cmd_rooms(NULL, args, *help); assert_true(result); diff --git a/tests/unittests/test_cmd_roster.c b/tests/unittests/test_cmd_roster.c index dc1b612e..0fd1647a 100644 --- a/tests/unittests/test_cmd_roster.c +++ b/tests/unittests/test_cmd_roster.c @@ -22,7 +22,7 @@ static void test_with_connection_status(jabber_conn_status_t status) expect_cons_show("You are not currently connected."); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -61,7 +61,7 @@ void cmd_roster_shows_roster_when_no_args(void **state) expect_memory(cons_show_roster, list, roster, sizeof(roster)); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -78,7 +78,7 @@ void cmd_roster_add_shows_message_when_no_jid(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -96,7 +96,7 @@ void cmd_roster_add_sends_roster_add_request(void **state) expect_string(roster_send_add_new, barejid, jid); expect_string(roster_send_add_new, name, nick); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -112,7 +112,7 @@ void cmd_roster_remove_shows_message_when_no_jid(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -128,7 +128,7 @@ void cmd_roster_remove_sends_roster_remove_request(void **state) expect_string(roster_send_remove, barejid, jid); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -144,7 +144,7 @@ void cmd_roster_nick_shows_message_when_no_jid(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -160,7 +160,7 @@ void cmd_roster_nick_shows_message_when_no_nick(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -178,7 +178,7 @@ void cmd_roster_nick_shows_message_when_no_contact_exists(void **state) expect_cons_show("Contact not found in roster: bob@server.org"); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -205,7 +205,7 @@ void cmd_roster_nick_sends_name_change_request(void **state) expect_cons_show("Nickname for bob@server.org set to: bobster."); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); PContact contact = roster_get_contact(jid); @@ -225,7 +225,7 @@ void cmd_roster_clearnick_shows_message_when_no_jid(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -243,7 +243,7 @@ void cmd_roster_clearnick_shows_message_when_no_contact_exists(void **state) expect_cons_show("Contact not found in roster: bob@server.org"); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); free(help); @@ -269,7 +269,7 @@ void cmd_roster_clearnick_sends_name_change_request_with_empty_nick(void **state expect_cons_show("Nickname for bob@server.org removed."); - gboolean result = cmd_roster(args, *help); + gboolean result = cmd_roster(NULL, args, *help); assert_true(result); PContact contact = roster_get_contact(jid); diff --git a/tests/unittests/test_cmd_statuses.c b/tests/unittests/test_cmd_statuses.c index ed37021a..0ecb22ae 100644 --- a/tests/unittests/test_cmd_statuses.c +++ b/tests/unittests/test_cmd_statuses.c @@ -21,7 +21,7 @@ void cmd_statuses_shows_usage_when_bad_subcmd(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); assert_true(result); free(help); @@ -35,7 +35,7 @@ void cmd_statuses_shows_usage_when_bad_console_setting(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); assert_true(result); free(help); @@ -49,7 +49,7 @@ void cmd_statuses_shows_usage_when_bad_chat_setting(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); assert_true(result); free(help); @@ -63,7 +63,7 @@ void cmd_statuses_shows_usage_when_bad_muc_setting(void **state) expect_cons_show("Usage: some usage"); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); assert_true(result); free(help); @@ -76,7 +76,7 @@ void cmd_statuses_console_sets_all(void **state) expect_cons_show("All presence updates will appear in the console."); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); char *setting = prefs_get_string(PREF_STATUSES_CONSOLE); assert_non_null(setting); @@ -93,7 +93,7 @@ void cmd_statuses_console_sets_online(void **state) expect_cons_show("Only online/offline presence updates will appear in the console."); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); char *setting = prefs_get_string(PREF_STATUSES_CONSOLE); assert_non_null(setting); @@ -110,7 +110,7 @@ void cmd_statuses_console_sets_none(void **state) expect_cons_show("Presence updates will not appear in the console."); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); char *setting = prefs_get_string(PREF_STATUSES_CONSOLE); assert_non_null(setting); @@ -127,7 +127,7 @@ void cmd_statuses_chat_sets_all(void **state) expect_cons_show("All presence updates will appear in chat windows."); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); char *setting = prefs_get_string(PREF_STATUSES_CHAT); assert_non_null(setting); @@ -144,7 +144,7 @@ void cmd_statuses_chat_sets_online(void **state) expect_cons_show("Only online/offline presence updates will appear in chat windows."); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); char *setting = prefs_get_string(PREF_STATUSES_CHAT); assert_non_null(setting); @@ -161,7 +161,7 @@ void cmd_statuses_chat_sets_none(void **state) expect_cons_show("Presence updates will not appear in chat windows."); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); char *setting = prefs_get_string(PREF_STATUSES_CHAT); assert_non_null(setting); @@ -178,7 +178,7 @@ void cmd_statuses_muc_sets_all(void **state) expect_cons_show("All presence updates will appear in chat room windows."); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); char *setting = prefs_get_string(PREF_STATUSES_MUC); assert_non_null(setting); @@ -195,7 +195,7 @@ void cmd_statuses_muc_sets_online(void **state) expect_cons_show("Only join/leave presence updates will appear in chat room windows."); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); char *setting = prefs_get_string(PREF_STATUSES_MUC); assert_non_null(setting); @@ -212,7 +212,7 @@ void cmd_statuses_muc_sets_none(void **state) expect_cons_show("Presence updates will not appear in chat room windows."); - gboolean result = cmd_statuses(args, *help); + gboolean result = cmd_statuses(NULL, args, *help); char *setting = prefs_get_string(PREF_STATUSES_MUC); assert_non_null(setting); diff --git a/tests/unittests/test_cmd_sub.c b/tests/unittests/test_cmd_sub.c index 80b85f15..55b9de60 100644 --- a/tests/unittests/test_cmd_sub.c +++ b/tests/unittests/test_cmd_sub.c @@ -22,7 +22,7 @@ void cmd_sub_shows_message_when_not_connected(void **state) expect_cons_show("You are currently not connected."); - gboolean result = cmd_sub(args, *help); + gboolean result = cmd_sub(NULL, args, *help); assert_true(result); free(help); @@ -38,7 +38,7 @@ void cmd_sub_shows_usage_when_no_arg(void **state) expect_cons_show("Usage: Some usage"); - gboolean result = cmd_sub(args, *help); + gboolean result = cmd_sub(NULL, args, *help); assert_true(result); free(help); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index c2626158..8ad3f236 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -121,11 +121,6 @@ int ui_close_read_wins(void) // current window actions void ui_clear_current(void) {} -win_type_t ui_current_win_type(void) -{ - return (win_type_t)mock(); -} - void ui_current_print_line(const char * const msg, ...) { va_list args; |