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

Refactored all window recipients and types

Browse Source 
Tests need fixing
This commit is contained in:
James Booth
2014-12-20 00:52:35 +00:00
parent 0146e62576
commit ea267e2017
17 changed files with 630 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test_cmd_otr.c
View File

@@ -458,8 +458,6 @@ void cmd_otr_theirfp_shows_fingerprint(void **state)
mock_connection_status(JABBER_CONNECTED);
mock_current_win_type(WIN_CHAT);
ui_current_win_is_otr_returns(TRUE);
mock_ui_current_recipient();
ui_current_recipient_returns(recipient);
mock_ui_current_print_formatted_line();
GString *message = g_string_new(recipient);
@@ -554,10 +552,9 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void **state)
mock_current_win_type(WIN_CHAT);
ui_current_win_is_otr_returns(FALSE);
otr_key_loaded_returns(TRUE);
ui_current_recipient_returns(recipient);
otr_start_query_returns(query_message);
message_send_expect(query_message, recipient);
message_send_chat_expect(query_message, recipient);
gboolean result = cmd_otr(args, *help);
assert_true(result);

18
tests/ui/mock_ui.c
View File

@@ -93,12 +93,6 @@ win_type_t _mock_ui_current_win_type(void)
return (win_type_t)mock();
}
static
char * _mock_ui_current_recipeint(void)
{
return mock_ptr_type(char *);
}
static
void _mock_ui_handle_error(const char * const err_msg)
{
@@ -247,12 +241,6 @@ mock_ui_ask_password(void)
ui_ask_password = _mock_ui_ask_password;
}
void
mock_ui_current_recipient(void)
{
ui_current_recipient = _mock_ui_current_recipeint;
}
void
stub_ui_ask_password(void)
{
@@ -406,12 +394,6 @@ mock_current_win_type(win_type_t type)
will_return(_mock_ui_current_win_type, type);
}
void
ui_current_recipient_returns(char *jid)
{
will_return(_mock_ui_current_recipeint, jid);
}
void
ui_current_print_formatted_line_expect(char show_char, int attrs, char *message)
{

10
tests/xmpp/mock_xmpp.c
View File

@@ -82,10 +82,10 @@ _mock_bookmark_remove(const char *jid)
}
static void
_mock_message_send(const char * const msg, const char * const recipient)
_mock_message_send_chat(const char * const recipient, const char * const msg)
{
check_expected(msg);
check_expected(recipient);
check_expected(msg);
}
static void
@@ -289,11 +289,11 @@ expect_and_return_bookmark_remove(char *expected_jid, gboolean removed)
}
void
message_send_expect(char *message, char *recipient)
message_send_chat_expect(char *recipient, char *message)
{
message_send = _mock_message_send;
expect_string(_mock_message_send, msg, message);
message_send_chat = _mock_message_send_chat;
expect_string(_mock_message_send, recipient, recipient);
expect_string(_mock_message_send, msg, message);
}
void

2
tests/xmpp/mock_xmpp.h
View File

@@ -30,7 +30,7 @@ void expect_and_return_bookmark_add(char *expected_jid, char *expected_nick,
void mock_bookmark_remove(void);
void expect_and_return_bookmark_remove(char *expected_jid, gboolean removed);
void message_send_expect(char *message, char *recipient);
void message_send_chat_expect(char *message, char *recipient);
void mock_presence_join_room(void);
void presence_join_room_expect(char *room, char *nick, char *passwd);