about summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test_cmd_bookmark.c171
-rw-r--r--tests/test_cmd_bookmark.h7
-rw-r--r--tests/testsuite.c7
-rw-r--r--tests/xmpp/mock_xmpp.c25
-rw-r--r--tests/xmpp/mock_xmpp.h5
5 files changed, 31 insertions, 184 deletions
diff --git a/tests/test_cmd_bookmark.c b/tests/test_cmd_bookmark.c
index b6bcd484..3a78ba5b 100644
--- a/tests/test_cmd_bookmark.c
+++ b/tests/test_cmd_bookmark.c
@@ -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,71 +190,17 @@ 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 };
-
-    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.");
-
-    gboolean result = cmd_bookmark(args, *help);
-    assert_true(result);
-
-    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);
+    gchar *args[] = { "add", jid, "nick", nick, "autojoin", "on", NULL };
 
     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.");
+    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);
 
     free(help);
-    muc_close();
 }
 
 void cmd_bookmark_remove_removes_bookmark(void **state)
@@ -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_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_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);
-}
+}
\ No newline at end of file
diff --git a/tests/test_cmd_bookmark.h b/tests/test_cmd_bookmark.h
index ef8729ca..f5999e41 100644
--- a/tests/test_cmd_bookmark.h
+++ b/tests/test_cmd_bookmark.h
@@ -5,16 +5,9 @@ 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_usage_when_no_args_not_muc(void **state);
-void cmd_bookmark_remove_shows_message_when_no_args_not_muc(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);
 void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state);
-void cmd_bookmark_add_adds_bookmark_with_room_details(void **state);
-void cmd_bookmark_add_adds_bookmark_with_room_details_autojoin(void **state);
 void cmd_bookmark_remove_removes_bookmark(void **state);
-void cmd_bookmark_remove_removes_autojoin(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_autojoin_shows_message_when_no_bookmark(void **state);
diff --git a/tests/testsuite.c b/tests/testsuite.c
index f7d3619a..89ac5dcf 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -432,19 +432,12 @@ 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_usage_when_no_args_not_muc),
-        unit_test(cmd_bookmark_remove_shows_message_when_no_args_not_muc),
         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),
         unit_test(cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin),
-        unit_test(cmd_bookmark_add_adds_bookmark_with_room_details),
-        unit_test(cmd_bookmark_add_adds_bookmark_with_room_details_autojoin),
         unit_test(cmd_bookmark_remove_removes_bookmark),
-        unit_test(cmd_bookmark_remove_removes_autojoin),
-        unit_test(cmd_bookmark_add_shows_message_when_upated),
         unit_test(cmd_bookmark_remove_shows_message_when_no_bookmark),
-        unit_test(cmd_bookmark_remove_autojoin_shows_message_when_no_bookmark),
 
 #ifdef HAVE_LIBOTR
         unit_test(cmd_otr_shows_usage_when_no_args),
diff --git a/tests/xmpp/mock_xmpp.c b/tests/xmpp/mock_xmpp.c
index c2ded651..7faf7170 100644
--- a/tests/xmpp/mock_xmpp.c
+++ b/tests/xmpp/mock_xmpp.c
@@ -65,19 +65,19 @@ _mock_bookmark_get_list(void)
 }
 
 static gboolean
-_mock_bookmark_add(const char *jid, const char *nick, gboolean autojoin)
+_mock_bookmark_add(const char *jid, const char *nick, const char *password, const char *autojoin_str)
 {
     check_expected(jid);
     check_expected(nick);
-    check_expected(autojoin);
+    check_expected(password);
+    check_expected(autojoin_str);
     return (gboolean)mock();
 }
 
 static gboolean
-_mock_bookmark_remove(const char *jid, gboolean autojoin)
+_mock_bookmark_remove(const char *jid)
 {
     check_expected(jid);
-    check_expected(autojoin);
     return (gboolean)mock();
 }
 
@@ -258,7 +258,7 @@ presence_update_expect(resource_presence_t presence, char *msg, int idle)
 
 void
 expect_and_return_bookmark_add(char *expected_jid, char *expected_nick,
-    gboolean expected_autojoin, gboolean added)
+    const char *expected_password, const char *expected_autojoin_str, gboolean added)
 {
     expect_string(_mock_bookmark_add, jid, expected_jid);
     if (expected_nick != NULL) {
@@ -266,17 +266,24 @@ expect_and_return_bookmark_add(char *expected_jid, char *expected_nick,
     } else {
         expect_value(_mock_bookmark_add, nick, NULL);
     }
-    expect_value(_mock_bookmark_add, autojoin, expected_autojoin);
+    if (expected_password != NULL) {
+        expect_string(_mock_bookmark_add, password, expected_password);
+    } else {
+        expect_value(_mock_bookmark_add, password, NULL);
+    }
+    if (expected_autojoin_str != NULL) {
+        expect_string(_mock_bookmark_add, autojoin_str, expected_autojoin_str);
+    } else {
+        expect_value(_mock_bookmark_add, autojoin_str, NULL);
+    }
 
     will_return(_mock_bookmark_add, added);
 }
 
 void
-expect_and_return_bookmark_remove(char *expected_jid, gboolean expected_autojoin,
-    gboolean removed)
+expect_and_return_bookmark_remove(char *expected_jid, gboolean removed)
 {
     expect_string(_mock_bookmark_remove, jid, expected_jid);
-    expect_value(_mock_bookmark_remove, autojoin, expected_autojoin);
 
     will_return(_mock_bookmark_remove, removed);
 }
diff --git a/tests/xmpp/mock_xmpp.h b/tests/xmpp/mock_xmpp.h
index a5f93fd2..ed742971 100644
--- a/tests/xmpp/mock_xmpp.h
+++ b/tests/xmpp/mock_xmpp.h
@@ -25,11 +25,10 @@ void bookmark_get_list_returns(GList *bookmarks);
 
 void mock_bookmark_add(void);
 void expect_and_return_bookmark_add(char *expected_jid, char *expected_nick,
-    gboolean expected_autojoin, gboolean added);
+    char *expected_password, char *expected_autojoin_str, gboolean added);
 
 void mock_bookmark_remove(void);
-void expect_and_return_bookmark_remove(char *expected_jid, gboolean expected_autojoin,
-    gboolean removed);
+void expect_and_return_bookmark_remove(char *expected_jid, gboolean removed);
 
 void message_send_expect(char *message, char *recipient);
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-07-05 04:46:20 +0000