devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into pgp

Browse Source
This commit is contained in:
James Booth
2015-05-01 00:55:58 +01:00
parent 0bd642edf8 0118178080
commit cade9e7c4c
8 changed files with 76 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
tests/test_server_events.c
View File

@@ -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();

10
tests/testsuite.c
View File

@@ -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),