diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | tests/test_cmd_rooms.c | 24 | ||||
| -rw-r--r-- | tests/testsuite.c | 4 | ||||
| -rw-r--r-- | tests/xmpp/stub_xmpp.c | 7 |
4 files changed, 19 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index bab60ecc..4678c2ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,6 +72,7 @@ tests_sources = \ tests/test_cmd_connect.c tests/test_cmd_connect.h \ tests/test_cmd_join.c tests/test_cmd_join.h \ tests/test_cmd_otr.c tests/test_cmd_otr.h \ + tests/test_cmd_rooms.c tests/test_cmd_rooms.h \ tests/test_autocomplete.c tests/test_autocomplete.h \ tests/testsuite.c diff --git a/tests/test_cmd_rooms.c b/tests/test_cmd_rooms.c index c2b357a6..9b99a34a 100644 --- a/tests/test_cmd_rooms.c +++ b/tests/test_cmd_rooms.c @@ -7,22 +7,19 @@ #include <glib.h> #include "xmpp/xmpp.h" -#include "xmpp/mock_xmpp.h" #include "ui/ui.h" -#include "ui/mock_ui.h" +#include "ui/stub_ui.h" #include "config/accounts.h" -#include "config/mock_accounts.h" - #include "command/commands.h" static void test_with_connection_status(jabber_conn_status_t status) { - mock_cons_show(); CommandHelp *help = malloc(sizeof(CommandHelp)); - mock_connection_status(status); + will_return(jabber_get_connection_status, status); + expect_cons_show("You are not currently connected."); gboolean result = cmd_rooms(NULL, *help); @@ -58,7 +55,6 @@ void cmd_rooms_shows_message_when_undefined(void **state) void cmd_rooms_uses_account_default_when_no_arg(void **state) { - mock_accounts_get_account(); CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { NULL }; ProfAccount *account = malloc(sizeof(ProfAccount)); @@ -76,12 +72,12 @@ void cmd_rooms_uses_account_default_when_no_arg(void **state) account->otr_always = NULL; account->muc_service = strdup("default_conf_server"); - mock_connection_status(JABBER_CONNECTED); - mock_connection_account_name("account_name"); - - accounts_get_account_return(account); + will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(jabber_get_account_name, "account_name"); + expect_any(accounts_get_account, name); + will_return(accounts_get_account, account); - expect_room_list_request("default_conf_server"); + expect_string(iq_room_list_request, conferencejid, "default_conf_server"); gboolean result = cmd_rooms(args, *help); @@ -95,9 +91,9 @@ void cmd_rooms_arg_used_when_passed(void **state) CommandHelp *help = malloc(sizeof(CommandHelp)); gchar *args[] = { "conf_server_arg" }; - mock_connection_status(JABBER_CONNECTED); + will_return(jabber_get_connection_status, JABBER_CONNECTED); - expect_room_list_request("conf_server_arg"); + expect_string(iq_room_list_request, conferencejid, "conf_server_arg"); gboolean result = cmd_rooms(args, *help); diff --git a/tests/testsuite.c b/tests/testsuite.c index 57c031d8..2e912d99 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -230,7 +230,7 @@ int main(int argc, char* argv[]) { unit_test(cmd_connect_shows_usage_when_port_provided_twice), unit_test(cmd_connect_shows_usage_when_invalid_first_property), unit_test(cmd_connect_shows_usage_when_invalid_second_property), -/* + unit_test(cmd_rooms_shows_message_when_disconnected), unit_test(cmd_rooms_shows_message_when_disconnecting), unit_test(cmd_rooms_shows_message_when_connecting), @@ -238,7 +238,7 @@ int main(int argc, char* argv[]) { unit_test(cmd_rooms_shows_message_when_undefined), unit_test(cmd_rooms_uses_account_default_when_no_arg), unit_test(cmd_rooms_arg_used_when_passed), -*/ + 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), diff --git a/tests/xmpp/stub_xmpp.c b/tests/xmpp/stub_xmpp.c index d562cfb6..06a45e8c 100644 --- a/tests/xmpp/stub_xmpp.c +++ b/tests/xmpp/stub_xmpp.c @@ -120,7 +120,12 @@ gboolean presence_sub_request_exists(const char * const bare_jid) // iq functions void iq_send_software_version(const char * const fulljid) {} -void iq_room_list_request(gchar *conferencejid) {} + +void iq_room_list_request(gchar *conferencejid) +{ + check_expected(conferencejid); +} + void iq_disco_info_request(gchar *jid) {} void iq_disco_items_request(gchar *jid) {} void iq_set_autoping(int seconds) {} |