diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_cmd_otr.c | 2 | ||||
-rw-r--r-- | tests/test_server_events.c | 7 | ||||
-rw-r--r-- | tests/xmpp/stub_xmpp.c | 7 |
3 files changed, 6 insertions, 10 deletions
diff --git a/tests/test_cmd_otr.c b/tests/test_cmd_otr.c index 3cd9dd59..7d0adc1a 100644 --- a/tests/test_cmd_otr.c +++ b/tests/test_cmd_otr.c @@ -552,9 +552,7 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void **state) will_return(otr_start_query, query_message); expect_string(message_send_chat, barejid, chatwin->barejid); - expect_value(message_send_chat, resource, NULL); expect_string(message_send_chat, msg, query_message); - expect_any(message_send_chat, send_state); gboolean result = cmd_otr(args, *help); assert_true(result); diff --git a/tests/test_server_events.c b/tests/test_server_events.c index 435493a2..0b5cfd09 100644 --- a/tests/test_server_events.c +++ b/tests/test_server_events.c @@ -130,19 +130,20 @@ void handle_message_error_when_recipient_cancel_disables_chat_session(void **sta { char *err_msg = "Some error."; char *from = "bob@server.com"; + char *resource = "resource"; char *type = "cancel"; prefs_set_boolean(PREF_STATES, TRUE); chat_sessions_init(); - chat_session_on_incoming_message(from, TRUE); + chat_session_on_incoming_message(from, resource, TRUE); expect_any(ui_handle_recipient_not_found, recipient); expect_any(ui_handle_recipient_not_found, err_msg); handle_message_error(from, type, err_msg); - gboolean chat_session_supported = chat_session_on_message_send(from); + gboolean session_exists = chat_session_exists(from); - assert_false(chat_session_supported); + assert_false(session_exists); chat_sessions_clear(); } diff --git a/tests/xmpp/stub_xmpp.c b/tests/xmpp/stub_xmpp.c index 580a6c61..a6058058 100644 --- a/tests/xmpp/stub_xmpp.c +++ b/tests/xmpp/stub_xmpp.c @@ -58,13 +58,10 @@ GList * jabber_get_available_resources(void) } // message functions -void message_send_chat(const char * const barejid, const char * const resource, const char * const msg, - gboolean send_state) +void message_send_chat(const char * const barejid, const char * const msg) { check_expected(barejid); - check_expected(resource); check_expected(msg); - check_expected(send_state); } void message_send_private(const char * const fulljid, const char * const msg) {} @@ -218,4 +215,4 @@ void roster_send_add_new(const char * const barejid, const char * const name) void roster_send_remove(const char * const barejid) { check_expected(barejid); -} \ No newline at end of file +} |