aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Test message when removing autojoin for non existent bookmark

Browse Source
This commit is contained in:
James Booth 2014-02-02 01:05:52 +00:00
parent 9d957e5f93
commit 95c48a0f47
6 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/autocomplete.c
View File

@ -133,7 +133,7 @@ autocomplete_get_list(Autocomplete ac)
} }
gboolean gboolean
autocomplete_contains(Autocomplete ac, char *value) autocomplete_contains(Autocomplete ac, const char *value)
{ {
GSList *curr = ac->items; GSList *curr = ac->items;

2
src/tools/autocomplete.h
View File

@ -57,5 +57,5 @@ char * autocomplete_param_no_with_func(char *input, int *size, char *command,
void autocomplete_reset(Autocomplete ac); void autocomplete_reset(Autocomplete ac);
gboolean autocomplete_contains(Autocomplete ac, char *value); gboolean autocomplete_contains(Autocomplete ac, const char *value);
#endif #endif

12
src/xmpp/bookmark.c
View File

@ -61,6 +61,10 @@ bookmark_request(void)
static gboolean static gboolean
_bookmark_add(const char *jid, const char *nick, gboolean autojoin) _bookmark_add(const char *jid, const char *nick, gboolean autojoin)
{ {
gboolean added = TRUE;
if (autocomplete_contains(bookmark_ac, jid)) {
added = FALSE;
}
/* TODO: send request */ /* TODO: send request */
/* TODO: manage bookmark_list */ /* TODO: manage bookmark_list */
@ -68,12 +72,16 @@ _bookmark_add(const char *jid, const char *nick, gboolean autojoin)
autocomplete_remove(bookmark_ac, jid); autocomplete_remove(bookmark_ac, jid);
autocomplete_add(bookmark_ac, jid); autocomplete_add(bookmark_ac, jid);
return FALSE; return added;
} }
static gboolean static gboolean
_bookmark_remove(const char *jid, gboolean autojoin) _bookmark_remove(const char *jid, gboolean autojoin)
{ {
gboolean removed = FALSE;
if (autocomplete_contains(bookmark_ac, jid)) {
removed = TRUE;
}
/* TODO: manage bookmark_list */ /* TODO: manage bookmark_list */
if (autojoin) { if (autojoin) {
/* TODO: just set autojoin=0 */ /* TODO: just set autojoin=0 */
@ -82,7 +90,7 @@ _bookmark_remove(const char *jid, gboolean autojoin)
autocomplete_remove(bookmark_ac, jid); autocomplete_remove(bookmark_ac, jid);
} }
return FALSE; return removed;
} }
static const GList * static const GList *

19
tests/test_cmd_bookmark.c
View File

@ -366,3 +366,22 @@ void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state)
free(help); free(help);
} }
void cmd_bookmark_remove_autojoin_shows_message_when_no_bookmark(void **state)
{
mock_bookmark_remove();
mock_cons_show();
char *jid = "room@conf.server";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "remove", jid, "autojoin", NULL };
mock_connection_status(JABBER_CONNECTED);
expect_and_return_bookmark_remove(jid, TRUE, FALSE);
expect_cons_show("No bookmark exists for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
free(help);
}

1
tests/test_cmd_bookmark.h
View File

@ -17,3 +17,4 @@ void cmd_bookmark_remove_removes_bookmark(void **state);
void cmd_bookmark_remove_removes_autojoin(void **state); void cmd_bookmark_remove_removes_autojoin(void **state);
void cmd_bookmark_add_shows_message_when_upated(void **state); void cmd_bookmark_add_shows_message_when_upated(void **state);
void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state); void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state);
void cmd_bookmark_remove_autojoin_shows_message_when_no_bookmark(void **state);

1
tests/testsuite.c
View File

@ -458,6 +458,7 @@ int main(int argc, char* argv[]) {
unit_test(cmd_bookmark_remove_removes_autojoin), unit_test(cmd_bookmark_remove_removes_autojoin),
unit_test(cmd_bookmark_add_shows_message_when_upated), unit_test(cmd_bookmark_add_shows_message_when_upated),
unit_test(cmd_bookmark_remove_shows_message_when_no_bookmark), unit_test(cmd_bookmark_remove_shows_message_when_no_bookmark),
unit_test(cmd_bookmark_remove_autojoin_shows_message_when_no_bookmark),
}; };