From a564b0241f24db0152897abffb881094a3e261b4 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 18 Aug 2014 21:25:52 +0100 Subject: [PATCH] Added test for jid validation on /bookmark add --- tests/test_cmd_bookmark.c | 20 +++++++++++++++++++- tests/test_cmd_bookmark.h | 1 + tests/testsuite.c | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/test_cmd_bookmark.c b/tests/test_cmd_bookmark.c index f576196c..94192774 100644 --- a/tests/test_cmd_bookmark.c +++ b/tests/test_cmd_bookmark.c @@ -126,6 +126,24 @@ void cmd_bookmark_list_shows_bookmarks(void **state) g_list_free_full(bookmarks, (GDestroyNotify)_free_bookmark); } +void cmd_bookmark_add_shows_message_when_invalid_jid(void **state) +{ + mock_bookmark_add(); + mock_cons_show(); + char *jid = "room"; + CommandHelp *help = malloc(sizeof(CommandHelp)); + gchar *args[] = { "add", jid, NULL }; + + mock_connection_status(JABBER_CONNECTED); + + expect_cons_show("Can't add bookmark with JID 'room'; should be 'room@domain.tld'"); + + gboolean result = cmd_bookmark(args, *help); + assert_true(result); + + free(help); +} + void cmd_bookmark_add_adds_bookmark_with_jid(void **state) { mock_bookmark_add(); @@ -240,4 +258,4 @@ void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state) assert_true(result); free(help); -} \ No newline at end of file +} diff --git a/tests/test_cmd_bookmark.h b/tests/test_cmd_bookmark.h index f5999e41..9505e105 100644 --- a/tests/test_cmd_bookmark.h +++ b/tests/test_cmd_bookmark.h @@ -5,6 +5,7 @@ void cmd_bookmark_shows_message_when_started(void **state); void cmd_bookmark_shows_message_when_undefined(void **state); void cmd_bookmark_shows_usage_when_no_args(void **state); void cmd_bookmark_list_shows_bookmarks(void **state); +void cmd_bookmark_add_shows_message_when_invalid_jid(void **state); void cmd_bookmark_add_adds_bookmark_with_jid(void **state); void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state); void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state); diff --git a/tests/testsuite.c b/tests/testsuite.c index 766bc896..f00ebc6c 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -432,6 +432,7 @@ int main(int argc, char* argv[]) { unit_test(cmd_bookmark_shows_message_when_undefined), unit_test(cmd_bookmark_shows_usage_when_no_args), unit_test(cmd_bookmark_list_shows_bookmarks), + unit_test(cmd_bookmark_add_shows_message_when_invalid_jid), unit_test(cmd_bookmark_add_adds_bookmark_with_jid), unit_test(cmd_bookmark_add_adds_bookmark_with_jid_nick), unit_test(cmd_bookmark_add_adds_bookmark_with_jid_autojoin),