From 92b85bb7f121dd5ad852b9c0702e9fccc4ef6d18 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 2 Feb 2014 00:49:02 +0000 Subject: Added message when bookmark updated --- tests/xmpp/mock_xmpp.c | 8 ++++++-- tests/xmpp/mock_xmpp.h | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'tests/xmpp') diff --git a/tests/xmpp/mock_xmpp.c b/tests/xmpp/mock_xmpp.c index 80b1a3e7..b670959c 100644 --- a/tests/xmpp/mock_xmpp.c +++ b/tests/xmpp/mock_xmpp.c @@ -64,12 +64,13 @@ _mock_bookmark_get_list(void) return (GList *)mock(); } -static void +static gboolean _mock_bookmark_add(const char *jid, const char *nick, gboolean autojoin) { check_expected(jid); check_expected(nick); check_expected(autojoin); + return (gboolean)mock(); } static void @@ -194,7 +195,8 @@ presence_update_expect(resource_presence_t presence, char *msg, int idle) } void -expect_bookmark_add(char *expected_jid, char *expected_nick, gboolean expected_autojoin) +expect_and_return_bookmark_add(char *expected_jid, char *expected_nick, + gboolean expected_autojoin, gboolean added) { expect_string(_mock_bookmark_add, jid, expected_jid); if (expected_nick != NULL) { @@ -203,6 +205,8 @@ expect_bookmark_add(char *expected_jid, char *expected_nick, gboolean expected_a expect_any(_mock_bookmark_add, nick); } expect_value(_mock_bookmark_add, autojoin, expected_autojoin); + + will_return(_mock_bookmark_add, added); } void diff --git a/tests/xmpp/mock_xmpp.h b/tests/xmpp/mock_xmpp.h index 12862d51..6e00a824 100644 --- a/tests/xmpp/mock_xmpp.h +++ b/tests/xmpp/mock_xmpp.h @@ -24,7 +24,8 @@ void presence_update_expect(resource_presence_t presence, char *msg, int idle); void bookmark_get_list_returns(GList *bookmarks); void mock_bookmark_add(void); -void expect_bookmark_add(char *expected_jid, char *expected_nick, gboolean expected_autojoin); +void expect_and_return_bookmark_add(char *expected_jid, char *expected_nick, + gboolean expected_autojoin, gboolean added); void mock_bookmark_remove(void); void expect_bookmark_remove(char *expected_jid, gboolean expected_autojoin); -- cgit 1.4.1-2-gfad0