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

Fixed tests

Browse Source
This commit is contained in:
James Booth
2014-12-20 18:39:39 +00:00
parent ea267e2017
commit 6800bf1cad
7 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_cmd_otr.c
View File

@@ -457,14 +457,18 @@ void cmd_otr_theirfp_shows_fingerprint(void **state)
gchar *args[] = { "theirfp", NULL };
mock_connection_status(JABBER_CONNECTED);
mock_current_win_type(WIN_CHAT);
ProfChatWin *chatwin = malloc(sizeof(ProfChatWin));
chatwin->barejid = strdup(recipient);
mock_ui_get_current_chat(chatwin);
ui_current_win_is_otr_returns(TRUE);
mock_ui_current_print_formatted_line();
GString *message = g_string_new(recipient);
GString *message = g_string_new(chatwin->barejid);
g_string_append(message, "'s OTR fingerprint: ");
g_string_append(message, fingerprint);
otr_get_their_fingerprint_expect_and_return(recipient, strdup(fingerprint));
otr_get_their_fingerprint_expect_and_return(chatwin->barejid, strdup(fingerprint));
ui_current_print_formatted_line_expect('!', 0, message->str);
gboolean result = cmd_otr(args, *help);
@@ -472,6 +476,8 @@ void cmd_otr_theirfp_shows_fingerprint(void **state)
g_string_free(message, TRUE);
free(help);
free(chatwin->barejid);
free(chatwin);
}
static void
@@ -550,16 +556,22 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void **state)
gchar *args[] = { "start", NULL };
mock_connection_status(JABBER_CONNECTED);
mock_current_win_type(WIN_CHAT);
ProfChatWin *chatwin = malloc(sizeof(ProfChatWin));
chatwin->barejid = strdup(recipient);
mock_ui_get_current_chat(chatwin);
ui_current_win_is_otr_returns(FALSE);
otr_key_loaded_returns(TRUE);
otr_start_query_returns(query_message);
message_send_chat_expect(query_message, recipient);
message_send_chat_expect(chatwin->barejid, query_message);
gboolean result = cmd_otr(args, *help);
assert_true(result);
free(help);
free(chatwin->barejid);
free(chatwin);
}
#else