diff options
-rw-r--r-- | src/command/commands.c | 2 | ||||
-rw-r--r-- | src/ui/core.c | 7 | ||||
-rw-r--r-- | src/ui/ui.h | 1 | ||||
-rw-r--r-- | tests/test_cmd_connect.c | 4 | ||||
-rw-r--r-- | tests/ui/mock_ui.c | 11 | ||||
-rw-r--r-- | tests/ui/mock_ui.h | 4 |
6 files changed, 5 insertions, 24 deletions
diff --git a/src/command/commands.c b/src/command/commands.c index 2dcb4a0e..a7deb17a 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -65,7 +65,7 @@ cmd_connect(gchar **args, struct cmd_help_t help) jabber_conn_status_t conn_status = jabber_get_connection_status(); if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) { - ui_already_connected(); + cons_show("You are either connected already, or a login is in process."); result = TRUE; } else { char *user = args[0]; diff --git a/src/ui/core.c b/src/ui/core.c index b3b4eadb..3cb05fe8 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -545,12 +545,6 @@ _ui_unknown_command(const char * const input) } static void -_ui_already_connected(void) -{ - cons_show("You are either connected already, or a login is in process."); -} - -static void _ui_disconnected(void) { wins_lost_connection(); @@ -1928,5 +1922,4 @@ ui_init_module(void) ui_replace_input = _ui_replace_input; ui_invalid_command_usage = _ui_invalid_command_usage; ui_unknown_command = _ui_unknown_command; - ui_already_connected = _ui_already_connected; } diff --git a/src/ui/ui.h b/src/ui/ui.h index 7543e6a8..fc689305 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -161,7 +161,6 @@ void (*ui_replace_input)(char *input, const char * const new_input, int *size); void (*ui_invalid_command_usage)(const char * const usage, void (**setting_func)(void)); void (*ui_unknown_command)(const char * const input); -void (*ui_already_connected)(void); // console window actions void (*cons_show)(const char * const msg, ...); diff --git a/tests/test_cmd_connect.c b/tests/test_cmd_connect.c index 76493115..33f49164 100644 --- a/tests/test_cmd_connect.c +++ b/tests/test_cmd_connect.c @@ -19,11 +19,13 @@ static void test_with_connection_status(jabber_conn_status_t status) { - stub_ui_already_connected(); + mock_cons_show(); CommandHelp *help = malloc(sizeof(CommandHelp)); mock_connection_status(status); + expect_cons_show("You are either connected already, or a login is in process."); + gboolean result = cmd_connect(NULL, *help); assert_true(result); diff --git a/tests/ui/mock_ui.c b/tests/ui/mock_ui.c index 0e01be25..94f8e3c3 100644 --- a/tests/ui/mock_ui.c +++ b/tests/ui/mock_ui.c @@ -83,11 +83,6 @@ char * _stub_ui_ask_password(void) } static -void _stub_ui_already_connected(void) -{ -} - -static win_type_t _mock_ui_current_win_type(void) { return (win_type_t)mock(); @@ -264,12 +259,6 @@ stub_cons_show(void) } void -stub_ui_already_connected(void) -{ - ui_already_connected = _stub_ui_already_connected; -} - -void stub_ui_handle_recipient_not_found(void) { ui_handle_recipient_not_found = _stub_ui_handle_recipient_not_found; diff --git a/tests/ui/mock_ui.h b/tests/ui/mock_ui.h index 70c9f3b3..5b984615 100644 --- a/tests/ui/mock_ui.h +++ b/tests/ui/mock_ui.h @@ -66,6 +66,4 @@ void cons_show_roster_expect(GSList *list); void ui_switch_win_expect_and_return(int given_i, gboolean result); -void stub_ui_already_connected(void); - -#endif \ No newline at end of file +#endif |