diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/config/stub_accounts.c | 14 | ||||
| -rw-r--r-- | tests/test_cmd_account.c | 52 | ||||
| -rw-r--r-- | tests/testsuite.c | 3 | ||||
| -rw-r--r-- | tests/ui/stub_ui.c | 9 |
4 files changed, 35 insertions, 43 deletions
diff --git a/tests/config/stub_accounts.c b/tests/config/stub_accounts.c index fe76f40c..78f0c44e 100644 --- a/tests/config/stub_accounts.c +++ b/tests/config/stub_accounts.c @@ -21,7 +21,14 @@ char * accounts_find_enabled(char *prefix) void accounts_reset_all_search(void) {} void accounts_reset_enabled_search(void) {} -void accounts_add(const char *jid, const char *altdomain, const int port) {} + +void accounts_add(const char *jid, const char *altdomain, const int port) +{ + check_expected(jid); + check_expected(altdomain); + check_expected(port); +} + int accounts_remove(const char *jid) { return 0; @@ -29,7 +36,7 @@ int accounts_remove(const char *jid) gchar** accounts_get_list(void) { - return NULL; + return (gchar **)mock(); } ProfAccount* accounts_get_account(const char * const name) @@ -39,7 +46,8 @@ ProfAccount* accounts_get_account(const char * const name) gboolean accounts_enable(const char * const name) { - return FALSE; + check_expected(name); + return (gboolean)mock(); } gboolean accounts_disable(const char * const name) diff --git a/tests/test_cmd_account.c b/tests/test_cmd_account.c index d1b90585..a76d50d3 100644 --- a/tests/test_cmd_account.c +++ b/tests/test_cmd_account.c @@ -50,11 +50,9 @@ void cmd_account_shows_account_when_connected_and_no_args(void **state) free(help); } -/* + 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 }; @@ -64,9 +62,9 @@ void cmd_account_list_shows_accounts(void **state) accounts[2] = strdup("account3"); accounts[3] = NULL; - accounts_get_list_return(accounts); + will_return(accounts_get_list, accounts); - expect_cons_show_account_list(accounts); + expect_memory(cons_show_account_list, accounts, accounts, sizeof(accounts)); gboolean result = cmd_account(args, *help); assert_true(result); @@ -76,7 +74,6 @@ void cmd_account_list_shows_accounts(void **state) void cmd_account_show_shows_usage_when_no_arg(void **state) { - mock_cons_show(); CommandHelp *help = malloc(sizeof(CommandHelp)); help->usage = "some usage"; gchar *args[] = { "show", NULL }; @@ -91,12 +88,10 @@ 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 }; - accounts_get_account_return(NULL); + will_return(accounts_get_account, NULL); expect_cons_show("No such account."); expect_cons_show(""); @@ -109,16 +104,14 @@ 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(); CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "show", "account_name", NULL }; ProfAccount *account = account_new("jabber_org", "me@jabber.org", NULL, TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); - accounts_get_account_return(account); + will_return(accounts_get_account, account); - expect_cons_show_account(account); + expect_memory(cons_show_account, account, account, sizeof(account)); gboolean result = cmd_account(args, *help); assert_true(result); @@ -128,7 +121,6 @@ void cmd_account_show_shows_account_when_exists(void **state) void cmd_account_add_shows_usage_when_no_arg(void **state) { - mock_cons_show(); CommandHelp *help = malloc(sizeof(CommandHelp)); help->usage = "some usage"; gchar *args[] = { "add", NULL }; @@ -143,27 +135,13 @@ 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 }; - - accounts_add_expect_account_name("new_account"); - - gboolean result = cmd_account(args, *help); - assert_true(result); - - free(help); -} - -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_cons_show("Account created.");; + expect_string(accounts_add, jid, "new_account"); + expect_value(accounts_add, altdomain, NULL); + expect_value(accounts_add, port, 0); + expect_cons_show("Account created."); expect_cons_show(""); gboolean result = cmd_account(args, *help); @@ -174,7 +152,6 @@ void cmd_account_add_shows_message(void **state) void cmd_account_enable_shows_usage_when_no_arg(void **state) { - mock_cons_show(); CommandHelp *help = malloc(sizeof(CommandHelp)); help->usage = "some usage"; gchar *args[] = { "enable", NULL }; @@ -189,12 +166,14 @@ 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 }; - accounts_enable_expect("account_name"); + will_return(accounts_enable, TRUE); + + expect_string(accounts_enable, name, "account_name"); + expect_cons_show("Account enabled."); + expect_cons_show(""); gboolean result = cmd_account(args, *help); assert_true(result); @@ -202,6 +181,7 @@ void cmd_account_enable_enables_account(void **state) free(help); } +/* void cmd_account_enable_shows_message_when_enabled(void **state) { mock_cons_show(); diff --git a/tests/testsuite.c b/tests/testsuite.c index 2fce6be1..419a426f 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -241,16 +241,15 @@ int main(int argc, char* argv[]) { */ unit_test(cmd_account_shows_usage_when_not_connected_and_no_args), unit_test(cmd_account_shows_account_when_connected_and_no_args), -/* unit_test(cmd_account_list_shows_accounts), unit_test(cmd_account_show_shows_usage_when_no_arg), unit_test(cmd_account_show_shows_message_when_account_does_not_exist), unit_test(cmd_account_show_shows_account_when_exists), unit_test(cmd_account_add_shows_usage_when_no_arg), unit_test(cmd_account_add_adds_account), - unit_test(cmd_account_add_shows_message), unit_test(cmd_account_enable_shows_usage_when_no_arg), unit_test(cmd_account_enable_enables_account), +/* unit_test(cmd_account_enable_shows_message_when_enabled), unit_test(cmd_account_enable_shows_message_when_account_doesnt_exist), unit_test(cmd_account_disable_shows_usage_when_no_arg), diff --git a/tests/ui/stub_ui.c b/tests/ui/stub_ui.c index 444de129..4b65fa39 100644 --- a/tests/ui/stub_ui.c +++ b/tests/ui/stub_ui.c @@ -298,7 +298,7 @@ void cons_show_otr_prefs(void) {} void cons_show_account(ProfAccount *account) { - check_expected(account); + check_expected(account); } void cons_debug(const char * const msg, ...) {} @@ -318,7 +318,12 @@ void cons_show_login_success(ProfAccount *account) {} void cons_show_software_version(const char * const jid, const char * const presence, const char * const name, const char * const version, const char * const os) {} -void cons_show_account_list(gchar **accounts) {} + +void cons_show_account_list(gchar **accounts) +{ + check_expected(accounts); +} + void cons_show_room_list(GSList *room, const char * const conference_node) {} void cons_show_bookmarks(const GList *list) {} void cons_show_disco_items(GSList *items, const char * const jid) {} |