Refactored all window recipients and types

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

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

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