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

Refactored bookmarks to use option parser, allow bookmarking rooms with passwords

Browse Source
This commit is contained in:
James Booth
2014-05-10 00:50:43 +01:00
parent a519d25e4b
commit d2662a6f17
12 changed files with 243 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
tests/test_cmd_bookmark.c
View File

@@ -125,40 +125,6 @@ void cmd_bookmark_list_shows_bookmarks(void **state)
g_list_free_full(bookmarks, (GDestroyNotify)_free_bookmark);
}
void cmd_bookmark_add_shows_usage_when_no_args_not_muc(void **state)
{
mock_cons_show();
CommandHelp *help = malloc(sizeof(CommandHelp));
help->usage = "some usage";
gchar *args[] = { "add", NULL };
mock_connection_status(JABBER_CONNECTED);
mock_current_win_type(WIN_CONSOLE);
expect_cons_show("Usage: some usage");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
free(help);
}
void cmd_bookmark_remove_shows_message_when_no_args_not_muc(void **state)
{
mock_cons_show();
CommandHelp *help = malloc(sizeof(CommandHelp));
help->usage = "some usage";
gchar *args[] = { "remove", NULL };
mock_connection_status(JABBER_CONNECTED);
mock_current_win_type(WIN_CONSOLE);
expect_cons_show("Usage: some usage");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
free(help);
}
void cmd_bookmark_add_adds_bookmark_with_jid(void **state)
{
mock_bookmark_add();
@@ -169,7 +135,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state)
mock_connection_status(JABBER_CONNECTED);
expect_and_return_bookmark_add(jid, NULL, FALSE, TRUE);
expect_and_return_bookmark_add(jid, NULL, NULL, NULL, TRUE);
expect_cons_show("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
@@ -185,12 +151,12 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state)
char *jid = "room@conf.server";
char *nick = "bob";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", jid, nick, NULL };
gchar *args[] = { "add", jid, "nick", nick, NULL };
mock_connection_status(JABBER_CONNECTED);
expect_and_return_bookmark_add(jid, nick, FALSE, TRUE);
expect_cons_show("Bookmark added for room@conf.server, nickname: bob.");
expect_and_return_bookmark_add(jid, nick, NULL, NULL, TRUE);
expect_cons_show("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
@@ -204,12 +170,12 @@ void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state)
mock_cons_show();
char *jid = "room@conf.server";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", jid, "autojoin", NULL };
gchar *args[] = { "add", jid, "autojoin", "on", NULL };
mock_connection_status(JABBER_CONNECTED);
expect_and_return_bookmark_add(jid, NULL, TRUE, TRUE);
expect_cons_show("Bookmark added for room@conf.server, autojoin enabled.");
expect_and_return_bookmark_add(jid, NULL, NULL, "on", TRUE);
expect_cons_show("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
@@ -224,12 +190,12 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state)
char *jid = "room@conf.server";
char *nick = "bob";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", jid, nick, "autojoin", NULL };
gchar *args[] = { "add", jid, "nick", nick, "autojoin", "on", NULL };
mock_connection_status(JABBER_CONNECTED);
expect_and_return_bookmark_add(jid, nick, TRUE, TRUE);
expect_cons_show("Bookmark added for room@conf.server, nickname: bob, autojoin enabled.");
expect_and_return_bookmark_add(jid, nick, NULL, "on", TRUE);
expect_cons_show("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
@@ -237,60 +203,6 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state)
free(help);
}
void cmd_bookmark_add_adds_bookmark_with_room_details(void **state)
{
mock_bookmark_add();
mock_ui_current_recipient();
mock_cons_show();
char *jid = "room@conf.server";
char *nick = "bob";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", NULL };
muc_init();
muc_join_room(jid, nick, NULL, TRUE);
mock_connection_status(JABBER_CONNECTED);
mock_current_win_type(WIN_MUC);
ui_current_recipient_returns(jid);
expect_and_return_bookmark_add(jid, nick, FALSE, TRUE);
expect_cons_show("Bookmark added for room@conf.server, nickname: bob.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
free(help);
muc_close();
}
void cmd_bookmark_add_adds_bookmark_with_room_details_autojoin(void **state)
{
mock_bookmark_add();
mock_ui_current_recipient();
mock_cons_show();
char *jid = "room@conf.server";
char *nick = "bob";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", "autojoin", NULL };
muc_init();
muc_join_room(jid, nick, NULL, TRUE);
mock_connection_status(JABBER_CONNECTED);
mock_current_win_type(WIN_MUC);
ui_current_recipient_returns(jid);
expect_and_return_bookmark_add(jid, nick, TRUE, TRUE);
expect_cons_show("Bookmark added for room@conf.server, nickname: bob, autojoin enabled.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
free(help);
muc_close();
}
void cmd_bookmark_remove_removes_bookmark(void **state)
{
mock_bookmark_remove();
@@ -301,7 +213,7 @@ void cmd_bookmark_remove_removes_bookmark(void **state)
mock_connection_status(JABBER_CONNECTED);
expect_and_return_bookmark_remove(jid, FALSE, TRUE);
expect_and_return_bookmark_remove(jid, TRUE);
expect_cons_show("Bookmark removed for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
@@ -310,44 +222,6 @@ void cmd_bookmark_remove_removes_bookmark(void **state)
free(help);
}
void cmd_bookmark_remove_removes_autojoin(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, TRUE);
expect_cons_show("Autojoin disabled for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
free(help);
}
void cmd_bookmark_add_shows_message_when_upated(void **state)
{
mock_bookmark_add();
mock_cons_show();
char *jid = "room@conf.server";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", jid, NULL };
mock_connection_status(JABBER_CONNECTED);
expect_and_return_bookmark_add(jid, NULL, FALSE, FALSE);
expect_cons_show("Bookmark updated for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
free(help);
}
void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state)
{
mock_bookmark_remove();
@@ -358,30 +232,11 @@ void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state)
mock_connection_status(JABBER_CONNECTED);
expect_and_return_bookmark_remove(jid, FALSE, FALSE);
expect_and_return_bookmark_remove(jid, FALSE);
expect_cons_show("No bookmark exists for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
assert_true(result);
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);
}
}