From 36790dc26bbd4d00702a75469980e7c9fbf1282d Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 6 Jan 2015 21:56:14 +0000 Subject: [PATCH] Fixed tests --- tests/helpers.c | 2 ++ tests/test_server_events.c | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/helpers.c b/tests/helpers.c index bc0b8009..10310886 100644 --- a/tests/helpers.c +++ b/tests/helpers.c @@ -75,12 +75,14 @@ void close_preferences(void **state) void init_chat_sessions(void **state) { + load_preferences(NULL); chat_sessions_init(); } void close_chat_sessions(void **state) { chat_sessions_clear(); + close_preferences(NULL); } static GCompareFunc cmp_func; diff --git a/tests/test_server_events.c b/tests/test_server_events.c index 0b5cfd09..fcf6fb1c 100644 --- a/tests/test_server_events.c +++ b/tests/test_server_events.c @@ -120,9 +120,6 @@ void handle_message_error_when_recipient_cancel(void **state) prefs_set_boolean(PREF_STATES, FALSE); chat_sessions_init(); - expect_string(ui_handle_recipient_not_found, recipient, from); - expect_string(ui_handle_recipient_not_found, err_msg, err_msg); - handle_message_error(from, type, err_msg); } @@ -137,9 +134,6 @@ void handle_message_error_when_recipient_cancel_disables_chat_session(void **sta chat_sessions_init(); 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 session_exists = chat_session_exists(from);