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

Show message on /bookmark remove when bookmark does not exist

Browse Source
This commit is contained in:
James Booth
2014-02-02 00:59:32 +00:00
parent 92b85bb7f1
commit 9d957e5f93
10 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/xmpp/mock_xmpp.c
View File

@@ -73,11 +73,12 @@ _mock_bookmark_add(const char *jid, const char *nick, gboolean autojoin)
return (gboolean)mock();
}
static void
static gboolean
_mock_bookmark_remove(const char *jid, gboolean autojoin)
{
check_expected(jid);
check_expected(autojoin);
return (gboolean)mock();
}
void
@@ -210,8 +211,11 @@ expect_and_return_bookmark_add(char *expected_jid, char *expected_nick,
}
void
expect_bookmark_remove(char *expected_jid, gboolean expected_autojoin)
expect_and_return_bookmark_remove(char *expected_jid, gboolean expected_autojoin,
gboolean removed)
{
expect_string(_mock_bookmark_remove, jid, expected_jid);
expect_value(_mock_bookmark_remove, autojoin, expected_autojoin);
will_return(_mock_bookmark_remove, removed);
}

3
tests/xmpp/mock_xmpp.h
View File

@@ -28,6 +28,7 @@ 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);
void expect_and_return_bookmark_remove(char *expected_jid, gboolean expected_autojoin,
gboolean removed);
#endif