about summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-05-01 00:55:40 +0100
committerJames Booth <boothj5@gmail.com>2015-05-01 00:55:40 +0100
commit01181780801a46ecc6996be5b75b2245c1c1b953 (patch)
treed9ed50b0274323a0c2954a4066aae406fa9efd3a /tests
parente11e55e31abced2f4e7fa332298485562adaf1ef (diff)
downloadprofani-tty-01181780801a46ecc6996be5b75b2245c1c1b953.tar.gz
Removed server event delegation functions
Diffstat (limited to 'tests')
-rw-r--r--tests/test_server_events.c76
-rw-r--r--tests/testsuite.c10
2 files changed, 0 insertions, 86 deletions
diff --git a/tests/test_server_events.c b/tests/test_server_events.c
index ffff74f9..d87dc217 100644
--- a/tests/test_server_events.c
+++ b/tests/test_server_events.c
@@ -101,82 +101,6 @@ void console_shows_dnd_presence_when_set_all(void **state)
     roster_clear();
 }
 
-void handle_message_error_when_no_recipient(void **state)
-{
-    char *err_msg = "Some error.";
-    char *from = NULL;
-    char *type = "cancel";
-
-    expect_string(ui_handle_error, err_msg, err_msg);
-
-    sv_ev_message_error(from, type, err_msg);
-}
-
-void handle_message_error_when_recipient_cancel(void **state)
-{
-    char *err_msg = "Some error.";
-    char *from = "bob@server.com";
-    char *type = "cancel";
-
-    prefs_set_boolean(PREF_STATES, FALSE);
-    chat_sessions_init();
-
-    sv_ev_message_error(from, type, err_msg);
-}
-
-void handle_message_error_when_recipient_cancel_disables_chat_session(void **state)
-{
-    char *err_msg = "Some error.";
-    char *barejid = "bob@server.com";
-    char *resource = "resource";
-    char *type = "cancel";
-
-    prefs_set_boolean(PREF_STATES, TRUE);
-    chat_sessions_init();
-    chat_session_recipient_active(barejid, resource, FALSE);
-
-    sv_ev_message_error(barejid, type, err_msg);
-    ChatSession *session = chat_session_get(barejid);
-
-    assert_null(session);
-    chat_sessions_clear();
-}
-
-void handle_message_error_when_recipient_and_no_type(void **state)
-{
-    char *err_msg = "Some error.";
-    char *from = "bob@server.com";
-    char *type = NULL;
-
-    expect_string(ui_handle_recipient_error, recipient, from);
-    expect_string(ui_handle_recipient_error, err_msg, err_msg);
-
-    sv_ev_message_error(from, type, err_msg);
-}
-
-void handle_presence_error_when_no_recipient(void **state)
-{
-    char *err_msg = "Some error.";
-    char *from = NULL;
-    char *type = NULL;
-
-    expect_string(ui_handle_error, err_msg, err_msg);
-
-    sv_ev_presence_error(from, type, err_msg);
-}
-
-void handle_presence_error_when_from_recipient(void **state)
-{
-    char *err_msg = "Some error.";
-    char *from = "bob@server.com";
-    char *type = NULL;
-
-    expect_string(ui_handle_recipient_error, recipient, from);
-    expect_string(ui_handle_recipient_error, err_msg, err_msg);
-
-    sv_ev_presence_error(from, type, err_msg);
-}
-
 void handle_offline_removes_chat_session(void **state)
 {
     chat_sessions_init();
diff --git a/tests/testsuite.c b/tests/testsuite.c
index b4ce1c0a..91fd54e3 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -443,16 +443,6 @@ int main(int argc, char* argv[]) {
         unit_test_setup_teardown(console_shows_dnd_presence_when_set_all,
             load_preferences,
             close_preferences),
-        unit_test(handle_message_error_when_no_recipient),
-        unit_test_setup_teardown(handle_message_error_when_recipient_cancel,
-            load_preferences,
-            close_preferences),
-        unit_test_setup_teardown(handle_message_error_when_recipient_cancel_disables_chat_session,
-            load_preferences,
-            close_preferences),
-        unit_test(handle_message_error_when_recipient_and_no_type),
-        unit_test(handle_presence_error_when_no_recipient),
-        unit_test(handle_presence_error_when_from_recipient),
         unit_test(handle_offline_removes_chat_session),
         unit_test(lost_connection_clears_chat_sessions),