Mocked account preferences and tested cmd_rooms

Makefile.am

@@ -55,11 +55,12 @@ test_sources = \
 	src/tools/autocomplete.c src/tools/autocomplete.h \
 	src/tools/history.c src/tools/history.h \
 	src/tools/tinyurl.c src/tools/tinyurl.h \
-	src/config/accounts.c src/config/accounts.h \
+	src/config/accounts.h \
 	src/config/preferences.c src/config/preferences.h \
 	src/config/theme.c src/config/theme.h \
     tests/ui/mock_ui.c \
     tests/xmpp/mock_xmpp.c \
+    tests/config/mock_accounts.c \
     tests/test_autocomplete.c \
     tests/test_common.c \
 	tests/test_command.c \

tests/config/mock_accounts.c

@@ -0,0 +1,112 @@
+/*
+ * mock_accounts.c
+ *
+ * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
+ *
+ * This file is part of Profanity.
+ *
+ * Profanity is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Profanity is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY {} without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <glib.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include "config/accounts.h"
+
+void accounts_load(void) {}
+void accounts_close(void) {}
+
+char * accounts_find_all(char *prefix)
+{
+    return (char *)mock();
+}
+
+char * accounts_find_enabled(char *prefix)
+{
+    return (char *)mock();
+}
+
+void accounts_reset_all_search(void) {}
+void accounts_reset_enabled_search(void) {}
+void accounts_add(const char *jid, const char *altdomain) {}
+
+gchar** accounts_get_list(void)
+{
+    return (gchar **)mock();
+}
+
+ProfAccount* accounts_get_account(const char * const name)
+{
+    return (ProfAccount *)mock();
+}
+
+void accounts_free_account(ProfAccount *account) {}
+
+gboolean accounts_enable(const char * const name)
+{
+    return (gboolean)mock();
+}
+
+gboolean accounts_disable(const char * const name)
+{
+    return (gboolean)mock();
+}
+
+gboolean accounts_rename(const char * const account_name,
+    const char * const new_name)
+{
+    return (gboolean)mock();
+}
+
+gboolean accounts_account_exists(const char * const account_name)
+{
+    return (gboolean)mock();
+}
+
+void accounts_set_jid(const char * const account_name, const char * const value) {}
+void accounts_set_server(const char * const account_name, const char * const value) {}
+void accounts_set_resource(const char * const account_name, const char * const value) {}
+void accounts_set_password(const char * const account_name, const char * const value) {}
+void accounts_set_muc_service(const char * const account_name, const char * const value) {}
+void accounts_set_muc_nick(const char * const account_name, const char * const value) {}
+void accounts_set_last_presence(const char * const account_name, const char * const value) {}
+void accounts_set_login_presence(const char * const account_name, const char * const value) {}
+
+resource_presence_t accounts_get_login_presence(const char * const account_name)
+{
+    return (resource_presence_t)mock();
+}
+
+resource_presence_t accounts_get_last_presence(const char * const account_name)
+{
+    return (resource_presence_t)mock();
+}
+
+void accounts_set_priority_online(const char * const account_name, const gint value) {}
+void accounts_set_priority_chat(const char * const account_name, const gint value) {}
+void accounts_set_priority_away(const char * const account_name, const gint value) {}
+void accounts_set_priority_xa(const char * const account_name, const gint value) {}
+void accounts_set_priority_dnd(const char * const account_name, const gint value) {}
+void accounts_set_priority_all(const char * const account_name, const gint value) {}
+
+gint accounts_get_priority_for_presence_type(const char * const account_name,
+    resource_presence_t presence_type)
+{
+    return (gint)mock();
+}
+
+void accounts_clear_password(const char * const account_name) {}
+

tests/test_command.c

@@ -9,16 +9,75 @@
 #include "ui/ui.h"
 #include "command/command.h"
 
-void cmd_rooms_shows_message_when_not_connected(void **state)
+static void test_with_connection_status(jabber_conn_status_t status)
 {
     CommandHelp *help = malloc(sizeof(CommandHelp));
-    will_return(jabber_get_connection_status, JABBER_DISCONNECTED);
+    
+    will_return(jabber_get_connection_status, status);
     expect_string(cons_show, msg, "You are not currently connected.");
     
     gboolean result = _cmd_rooms(NULL, *help);
-
     assert_true(result);
 
     free(help);
 }
 
+void cmd_rooms_shows_message_when_disconnected(void **state)
+{
+    test_with_connection_status(JABBER_DISCONNECTED);
+}
+
+void cmd_rooms_shows_message_when_disconnecting(void **state)
+{
+    test_with_connection_status(JABBER_DISCONNECTING);
+}
+
+void cmd_rooms_shows_message_when_connecting(void **state)
+{
+    test_with_connection_status(JABBER_CONNECTING);
+}
+
+void cmd_rooms_shows_message_when_started(void **state)
+{
+    test_with_connection_status(JABBER_STARTED);
+}
+
+void cmd_rooms_shows_message_when_undefined(void **state)
+{
+    test_with_connection_status(JABBER_UNDEFINED);
+}
+
+void cmd_rooms_uses_account_default_when_no_arg(void **state)
+{
+    CommandHelp *help = malloc(sizeof(CommandHelp));
+    ProfAccount *account = malloc(sizeof(ProfAccount));
+    account->muc_service = "default_conf_server";
+    gchar *args[] = { NULL }; 
+
+    will_return(jabber_get_connection_status, JABBER_CONNECTED);
+    will_return(jabber_get_account_name, "account_name");
+    will_return(accounts_get_account, account);
+    expect_string(iq_room_list_request, conferencejid, "default_conf_server");
+    
+    gboolean result = _cmd_rooms(args, *help);
+
+    assert_true(result);
+
+    free(help);
+    free(account);
+}
+
+void cmd_arg_used_when_passed(void **state)
+{
+    CommandHelp *help = malloc(sizeof(CommandHelp));
+    gchar *args[] = { "conf_server_arg" }; 
+
+    will_return(jabber_get_connection_status, JABBER_CONNECTED);
+    expect_string(iq_room_list_request, conferencejid, "conf_server_arg");
+    
+    gboolean result = _cmd_rooms(args, *help);
+
+    assert_true(result);
+
+    free(help);
+}

tests/test_command.h

@@ -1 +1,7 @@
-void cmd_rooms_shows_message_when_not_connected(void **state);
+void cmd_rooms_shows_message_when_disconnected(void **state);
+void cmd_rooms_shows_message_when_disconnecting(void **state);
+void cmd_rooms_shows_message_when_connecting(void **state);
+void cmd_rooms_shows_message_when_started(void **state);
+void cmd_rooms_shows_message_when_undefined(void **state);
+void cmd_rooms_uses_account_default_when_no_arg(void **state);
+void cmd_arg_used_when_passed(void **state);

tests/testsuite.c

@@ -13,8 +13,14 @@
 
 int main(int argc, char* argv[]) {
     const UnitTest tests[] = {
-        unit_test(cmd_rooms_shows_message_when_not_connected),
+        unit_test(cmd_rooms_shows_message_when_disconnected),
-
+        unit_test(cmd_rooms_shows_message_when_disconnecting),
+        unit_test(cmd_rooms_shows_message_when_connecting),
+        unit_test(cmd_rooms_shows_message_when_started),
+        unit_test(cmd_rooms_shows_message_when_undefined),
+        unit_test(cmd_rooms_uses_account_default_when_no_arg),
+        unit_test(cmd_arg_used_when_passed),
+ 
         unit_test(replace_one_substr),
         unit_test(replace_one_substr_beginning),
         unit_test(replace_one_substr_end),

tests/ui/mock_ui.c

@@ -1,5 +1,5 @@
 /*
- * ui.h
+ * mock_ui.h
  *
  * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
  *

tests/xmpp/mock_xmpp.c

@@ -1,5 +1,5 @@
 /*
- * xmpp.h
+ * mock_xmpp.c
  *
  * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
  *
@@ -116,7 +116,12 @@ gboolean presence_sub_request_exists(const char * const bare_jid)
 
 // iq functions
 void iq_send_software_version(const char * const fulljid) {}
-void iq_room_list_request(gchar *conferencejid) {}
+
+void iq_room_list_request(gchar *conferencejid)
+{
+    check_expected(conferencejid);
+}
+
 void iq_disco_info_request(gchar *jid) {}
 void iq_disco_items_request(gchar *jid) {}