Show message on /bookmark remove when bookmark does not exist

src/command/commands.c

@@ -1781,11 +1781,15 @@ cmd_bookmark(gchar **args, struct cmd_help_t help)
                 cons_show("Bookmark updated for %s.", jid);
             }
         } else if (strcmp(cmd, "remove") == 0) {
-            bookmark_remove(jid, autojoin);
+            gboolean removed = bookmark_remove(jid, autojoin);
-            if (autojoin) {
+            if (removed) {
-                cons_show("Autojoin disabled for %s.", jid);
+                if (autojoin) {
+                    cons_show("Autojoin disabled for %s.", jid);
+                } else {
+                    cons_show("Bookmark removed for %s.", jid);
+                }
             } else {
-                cons_show("Bookmark removed for %s.", jid);
+                cons_show("No bookmark exists for %s.", jid);
             }
         } else {
             cons_show("Usage: %s", help.usage);

src/xmpp/bookmark.c

@@ -71,7 +71,7 @@ _bookmark_add(const char *jid, const char *nick, gboolean autojoin)
     return FALSE;
 }
 
-static void
+static gboolean
 _bookmark_remove(const char *jid, gboolean autojoin)
 {
     /* TODO: manage bookmark_list */
@@ -81,6 +81,8 @@ _bookmark_remove(const char *jid, gboolean autojoin)
         /* TODO: send request */
         autocomplete_remove(bookmark_ac, jid);
     }
+
+    return FALSE;
 }
 
 static const GList *

src/xmpp/xmpp.h

@@ -133,7 +133,7 @@ Capabilities* (*caps_get)(const char * const caps_str);
 void (*caps_close)(void);
 
 gboolean (*bookmark_add)(const char *jid, const char *nick, gboolean autojoin);
-void (*bookmark_remove)(const char *jid, gboolean autojoin);
+gboolean (*bookmark_remove)(const char *jid, gboolean autojoin);
 const GList * (*bookmark_get_list)(void);
 char * (*bookmark_find)(char *search_str);
 void (*bookmark_autocomplete_reset)(void);

tests/test_cmd_bookmark.c

@@ -301,7 +301,7 @@ void cmd_bookmark_remove_removes_bookmark(void **state)
 
     mock_connection_status(JABBER_CONNECTED);
 
-    expect_bookmark_remove(jid, FALSE);
+    expect_and_return_bookmark_remove(jid, FALSE, TRUE);
     expect_cons_show("Bookmark removed for room@conf.server.");
 
     gboolean result = cmd_bookmark(args, *help);
@@ -320,7 +320,7 @@ void cmd_bookmark_remove_removes_autojoin(void **state)
 
     mock_connection_status(JABBER_CONNECTED);
 
-    expect_bookmark_remove(jid, TRUE);
+    expect_and_return_bookmark_remove(jid, TRUE, TRUE);
     expect_cons_show("Autojoin disabled for room@conf.server.");
 
     gboolean result = cmd_bookmark(args, *help);
@@ -347,3 +347,22 @@ void cmd_bookmark_add_shows_message_when_upated(void **state)
 
     free(help);
 }
+
+void cmd_bookmark_remove_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, NULL };
+
+    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);
+}

tests/test_cmd_bookmark.h

@@ -16,3 +16,4 @@ 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);

tests/testsuite.c

@@ -457,6 +457,7 @@ int main(int argc, char* argv[]) {
         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),
     };
 
 

tests/xmpp/mock_xmpp.c

@@ -73,11 +73,12 @@ _mock_bookmark_add(const char *jid, const char *nick, gboolean autojoin)
     return (gboolean)mock();
 }
 
-static void
+static gboolean
 _mock_bookmark_remove(const char *jid, gboolean autojoin)
 {
     check_expected(jid);
     check_expected(autojoin);
+    return (gboolean)mock();
 }
 
 void
@@ -210,8 +211,11 @@ expect_and_return_bookmark_add(char *expected_jid, char *expected_nick,
 }
 
 void
-expect_bookmark_remove(char *expected_jid, gboolean expected_autojoin)
+expect_and_return_bookmark_remove(char *expected_jid, gboolean expected_autojoin,
+    gboolean removed)
 {
     expect_string(_mock_bookmark_remove, jid, expected_jid);
     expect_value(_mock_bookmark_remove, autojoin, expected_autojoin);
+
+    will_return(_mock_bookmark_remove, removed);
 }

tests/xmpp/mock_xmpp.h

@@ -28,6 +28,7 @@ void expect_and_return_bookmark_add(char *expected_jid, char *expected_nick,
     gboolean expected_autojoin, gboolean added);
 
 void mock_bookmark_remove(void);
-void expect_bookmark_remove(char *expected_jid, gboolean expected_autojoin);
+void expect_and_return_bookmark_remove(char *expected_jid, gboolean expected_autojoin,
+    gboolean removed);
 
 #endif