Fixed tests for new command format
This commit is contained in:
@@ -20,17 +20,15 @@
|
||||
|
||||
#include "helpers.h"
|
||||
|
||||
#define CMD_BOOKMARK "/bookmark"
|
||||
|
||||
static void test_with_connection_status(jabber_conn_status_t status)
|
||||
{
|
||||
CommandHelp *help = malloc(sizeof(CommandHelp));
|
||||
|
||||
will_return(jabber_get_connection_status, status);
|
||||
expect_cons_show("You are not currently connected.");
|
||||
|
||||
gboolean result = cmd_bookmark(NULL, NULL, *help);
|
||||
gboolean result = cmd_bookmark(NULL, CMD_BOOKMARK, NULL);
|
||||
assert_true(result);
|
||||
|
||||
free(help);
|
||||
}
|
||||
|
||||
void cmd_bookmark_shows_message_when_disconnected(void **state)
|
||||
@@ -60,20 +58,16 @@ void cmd_bookmark_shows_message_when_undefined(void **state)
|
||||
|
||||
void cmd_bookmark_shows_usage_when_no_args(void **state)
|
||||
{
|
||||
CommandHelp *help = malloc(sizeof(CommandHelp));
|
||||
help->usage = "some usage";
|
||||
gchar *args[] = { NULL };
|
||||
ProfWin window;
|
||||
window.type = WIN_CONSOLE;
|
||||
|
||||
will_return(jabber_get_connection_status, JABBER_CONNECTED);
|
||||
|
||||
expect_cons_show("Usage: some usage");
|
||||
expect_string(cons_bad_cmd_usage, cmd, CMD_BOOKMARK);
|
||||
|
||||
gboolean result = cmd_bookmark(&window, args, *help);
|
||||
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, args);
|
||||
assert_true(result);
|
||||
|
||||
free(help);
|
||||
}
|
||||
|
||||
static void _free_bookmark(Bookmark *bookmark)
|
||||
@@ -101,7 +95,6 @@ _cmp_bookmark(Bookmark *bm1, Bookmark *bm2)
|
||||
|
||||
void cmd_bookmark_list_shows_bookmarks(void **state)
|
||||
{
|
||||
CommandHelp *help = malloc(sizeof(CommandHelp));
|
||||
gchar *args[] = { "list", NULL };
|
||||
GList *bookmarks = NULL;
|
||||
ProfWin window;
|
||||
@@ -141,17 +134,15 @@ void cmd_bookmark_list_shows_bookmarks(void **state)
|
||||
glist_set_cmp((GCompareFunc)_cmp_bookmark);
|
||||
expect_any(cons_show_bookmarks, list);
|
||||
|
||||
gboolean result = cmd_bookmark(&window, args, *help);
|
||||
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, args);
|
||||
assert_true(result);
|
||||
|
||||
free(help);
|
||||
g_list_free_full(bookmarks, (GDestroyNotify)_free_bookmark);
|
||||
}
|
||||
|
||||
void cmd_bookmark_add_shows_message_when_invalid_jid(void **state)
|
||||
{
|
||||
char *jid = "room";
|
||||
CommandHelp *help = malloc(sizeof(CommandHelp));
|
||||
gchar *args[] = { "add", jid, NULL };
|
||||
ProfWin window;
|
||||
window.type = WIN_CONSOLE;
|
||||
@@ -160,16 +151,13 @@ void cmd_bookmark_add_shows_message_when_invalid_jid(void **state)
|
||||
|
||||
expect_cons_show("Can't add bookmark with JID 'room'; should be 'room@domain.tld'");
|
||||
|
||||
gboolean result = cmd_bookmark(&window, args, *help);
|
||||
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, args);
|
||||
assert_true(result);
|
||||
|
||||
free(help);
|
||||
}
|
||||
|
||||
void cmd_bookmark_add_adds_bookmark_with_jid(void **state)
|
||||
{
|
||||
char *jid = "room@conf.server";
|
||||
CommandHelp *help = malloc(sizeof(CommandHelp));
|
||||
gchar *args[] = { "add", jid, NULL };
|
||||
ProfWin window;
|
||||
window.type = WIN_CONSOLE;
|
||||
@@ -184,16 +172,14 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state)
|
||||
|
||||
expect_cons_show("Bookmark added for room@conf.server.");
|
||||
|
||||
gboolean result = cmd_bookmark(&window, args, *help);
|
||||
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, args);
|
||||
assert_true(result);
|
||||
|
||||
free(help);
|
||||
}
|
||||
|
||||
void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state)
|
||||
{ char *jid = "room@conf.server";
|
||||
{
|
||||
char *jid = "room@conf.server";
|
||||
char *nick = "bob";
|
||||
CommandHelp *help = malloc(sizeof(CommandHelp));
|
||||
gchar *args[] = { "add", jid, "nick", nick, NULL };
|
||||
ProfWin window;
|
||||
window.type = WIN_CONSOLE;
|
||||
@@ -208,16 +194,13 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state)
|
||||
|
||||
expect_cons_show("Bookmark added for room@conf.server.");
|
||||
|
||||
gboolean result = cmd_bookmark(&window, args, *help);
|
||||
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, args);
|
||||
assert_true(result);
|
||||
|
||||
free(help);
|
||||
}
|
||||
|
||||
void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state)
|
||||
{
|
||||
char *jid = "room@conf.server";
|
||||
CommandHelp *help = malloc(sizeof(CommandHelp));
|
||||
gchar *args[] = { "add", jid, "autojoin", "on", NULL };
|
||||
ProfWin window;
|
||||
window.type = WIN_CONSOLE;
|
||||
@@ -232,17 +215,14 @@ void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state)
|
||||
|
||||
expect_cons_show("Bookmark added for room@conf.server.");
|
||||
|
||||
gboolean result = cmd_bookmark(&window, args, *help);
|
||||
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, args);
|
||||
assert_true(result);
|
||||
|
||||
free(help);
|
||||
}
|
||||
|
||||
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", nick, "autojoin", "on", NULL };
|
||||
ProfWin window;
|
||||
window.type = WIN_CONSOLE;
|
||||
@@ -257,16 +237,13 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state)
|
||||
|
||||
expect_cons_show("Bookmark added for room@conf.server.");
|
||||
|
||||
gboolean result = cmd_bookmark(&window, args, *help);
|
||||
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, args);
|
||||
assert_true(result);
|
||||
|
||||
free(help);
|
||||
}
|
||||
|
||||
void cmd_bookmark_remove_removes_bookmark(void **state)
|
||||
{
|
||||
char *jid = "room@conf.server";
|
||||
CommandHelp *help = malloc(sizeof(CommandHelp));
|
||||
gchar *args[] = { "remove", jid, NULL };
|
||||
ProfWin window;
|
||||
window.type = WIN_CONSOLE;
|
||||
@@ -278,16 +255,13 @@ void cmd_bookmark_remove_removes_bookmark(void **state)
|
||||
|
||||
expect_cons_show("Bookmark removed for room@conf.server.");
|
||||
|
||||
gboolean result = cmd_bookmark(&window, args, *help);
|
||||
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, args);
|
||||
assert_true(result);
|
||||
|
||||
free(help);
|
||||
}
|
||||
|
||||
void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state)
|
||||
{
|
||||
char *jid = "room@conf.server";
|
||||
CommandHelp *help = malloc(sizeof(CommandHelp));
|
||||
gchar *args[] = { "remove", jid, NULL };
|
||||
ProfWin window;
|
||||
window.type = WIN_CONSOLE;
|
||||
@@ -299,8 +273,6 @@ void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state)
|
||||
|
||||
expect_cons_show("No bookmark exists for room@conf.server.");
|
||||
|
||||
gboolean result = cmd_bookmark(&window, args, *help);
|
||||
gboolean result = cmd_bookmark(&window, CMD_BOOKMARK, args);
|
||||
assert_true(result);
|
||||
|
||||
free(help);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user