diff options
Diffstat (limited to 'tests/unittests')
| -rw-r--r-- | tests/unittests/test_cmd_account.c | 28 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_bookmark.c | 30 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_bookmark.h | 1 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_connect.c | 121 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_disconnect.c | 4 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_join.c | 25 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_otr.c | 46 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_otr.h | 2 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_pgp.c | 14 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_pgp.h | 1 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_rooms.c | 18 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_rooms.h | 1 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_roster.c | 31 | ||||
| -rw-r--r-- | tests/unittests/test_cmd_sub.c | 4 | ||||
| -rw-r--r-- | tests/unittests/unittests.c | 15 | ||||
| -rw-r--r-- | tests/unittests/xmpp/stub_xmpp.c | 44 |
16 files changed, 156 insertions, 229 deletions
diff --git a/tests/unittests/test_cmd_account.c b/tests/unittests/test_cmd_account.c index 701deb8d..74781177 100644 --- a/tests/unittests/test_cmd_account.c +++ b/tests/unittests/test_cmd_account.c @@ -21,7 +21,7 @@ void cmd_account_shows_usage_when_not_connected_and_no_args(void **state) { gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ACCOUNT); @@ -36,8 +36,8 @@ void cmd_account_shows_account_when_connected_and_no_args(void **state) TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, "account_name"); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, "account_name"); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); @@ -371,7 +371,7 @@ void cmd_account_set_resource_sets_resource(void **state) { gchar *args[] = { "set", "a_account", "resource", "a_resource", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_any(accounts_account_exists, account_name); will_return(accounts_account_exists, TRUE); @@ -390,7 +390,7 @@ void cmd_account_set_resource_sets_resource_with_online_message(void **state) { gchar *args[] = { "set", "a_account", "resource", "a_resource", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_any(accounts_account_exists, account_name); will_return(accounts_account_exists, TRUE); @@ -644,7 +644,7 @@ void cmd_account_set_online_priority_sets_preference(void **state) expect_string(accounts_set_priority_online, account_name, "a_account"); expect_value(accounts_set_priority_online, value, 10); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Updated online priority for account a_account: 10"); expect_cons_show(""); @@ -663,7 +663,7 @@ void cmd_account_set_chat_priority_sets_preference(void **state) expect_string(accounts_set_priority_chat, account_name, "a_account"); expect_value(accounts_set_priority_chat, value, 10); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Updated chat priority for account a_account: 10"); expect_cons_show(""); @@ -682,7 +682,7 @@ void cmd_account_set_away_priority_sets_preference(void **state) expect_string(accounts_set_priority_away, account_name, "a_account"); expect_value(accounts_set_priority_away, value, 10); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Updated away priority for account a_account: 10"); expect_cons_show(""); @@ -701,7 +701,7 @@ void cmd_account_set_xa_priority_sets_preference(void **state) expect_string(accounts_set_priority_xa, account_name, "a_account"); expect_value(accounts_set_priority_xa, value, 10); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Updated xa priority for account a_account: 10"); expect_cons_show(""); @@ -720,7 +720,7 @@ void cmd_account_set_dnd_priority_sets_preference(void **state) expect_string(accounts_set_priority_dnd, account_name, "a_account"); expect_value(accounts_set_priority_dnd, value, 10); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Updated dnd priority for account a_account: 10"); expect_cons_show(""); @@ -791,23 +791,23 @@ void cmd_account_set_priority_updates_presence_when_account_connected_with_prese expect_any(accounts_set_priority_online, account_name); expect_any(accounts_set_priority_online, value); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_any(accounts_get_last_presence, account_name); will_return(accounts_get_last_presence, RESOURCE_ONLINE); - will_return(jabber_get_account_name, "a_account"); + will_return(session_get_account_name, "a_account"); #ifdef HAVE_LIBGPGME ProfAccount *account = account_new("a_account", "a_jid", NULL, NULL, TRUE, NULL, 5222, "a_resource", NULL, NULL, 10, 10, 10, 10, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_account_name, "a_account"); + will_return(session_get_account_name, "a_account"); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); #endif - will_return(jabber_get_presence_message, "Free to chat"); + will_return(connection_get_presence_msg, "Free to chat"); expect_value(presence_send, status, RESOURCE_ONLINE); expect_string(presence_send, msg, "Free to chat"); diff --git a/tests/unittests/test_cmd_bookmark.c b/tests/unittests/test_cmd_bookmark.c index eafae9b6..8b8b4871 100644 --- a/tests/unittests/test_cmd_bookmark.c +++ b/tests/unittests/test_cmd_bookmark.c @@ -24,7 +24,7 @@ static void test_with_connection_status(jabber_conn_status_t status) { - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You are not currently connected."); gboolean result = cmd_bookmark(NULL, CMD_BOOKMARK, NULL); @@ -46,23 +46,13 @@ void cmd_bookmark_shows_message_when_connecting(void **state) test_with_connection_status(JABBER_CONNECTING); } -void cmd_bookmark_shows_message_when_started(void **state) -{ - test_with_connection_status(JABBER_STARTED); -} - -void cmd_bookmark_shows_message_when_undefined(void **state) -{ - test_with_connection_status(JABBER_UNDEFINED); -} - void cmd_bookmark_shows_usage_when_no_args(void **state) { gchar *args[] = { NULL }; ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_BOOKMARK); @@ -127,7 +117,7 @@ void cmd_bookmark_list_shows_bookmarks(void **state) bookmarks = g_list_append(bookmarks, bm4); bookmarks = g_list_append(bookmarks, bm5); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); will_return(bookmark_get_list, bookmarks); // TODO - Custom list compare @@ -147,7 +137,7 @@ void cmd_bookmark_add_shows_message_when_invalid_jid(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_cons_show("Can't add bookmark with JID 'room'; should be 'room@domain.tld'"); @@ -162,7 +152,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(bookmark_add, jid, jid); expect_any(bookmark_add, nick); @@ -184,7 +174,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(bookmark_add, jid, jid); expect_string(bookmark_add, nick, nick); @@ -205,7 +195,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(bookmark_add, jid, jid); expect_any(bookmark_add, nick); @@ -227,7 +217,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(bookmark_add, jid, jid); expect_string(bookmark_add, nick, nick); @@ -248,7 +238,7 @@ void cmd_bookmark_remove_removes_bookmark(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(bookmark_remove, jid, jid); will_return(bookmark_remove, TRUE); @@ -266,7 +256,7 @@ void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state) ProfWin window; window.type = WIN_CONSOLE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_any(bookmark_remove, jid); will_return(bookmark_remove, FALSE); diff --git a/tests/unittests/test_cmd_bookmark.h b/tests/unittests/test_cmd_bookmark.h index 9505e105..abbdbe98 100644 --- a/tests/unittests/test_cmd_bookmark.h +++ b/tests/unittests/test_cmd_bookmark.h @@ -1,7 +1,6 @@ void cmd_bookmark_shows_message_when_disconnected(void **state); void cmd_bookmark_shows_message_when_disconnecting(void **state); void cmd_bookmark_shows_message_when_connecting(void **state); -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); diff --git a/tests/unittests/test_cmd_connect.c b/tests/unittests/test_cmd_connect.c index 53c4c940..e4f01271 100644 --- a/tests/unittests/test_cmd_connect.c +++ b/tests/unittests/test_cmd_connect.c @@ -18,7 +18,7 @@ static void test_with_connection_status(jabber_conn_status_t status) { - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You are either connected already, or a login is in process."); @@ -41,16 +41,11 @@ void cmd_connect_shows_message_when_connected(void **state) test_with_connection_status(JABBER_CONNECTED); } -void cmd_connect_shows_message_when_undefined(void **state) -{ - test_with_connection_status(JABBER_UNDEFINED); -} - void cmd_connect_when_no_account(void **state) { gchar *args[] = { "user@server.org", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); @@ -59,11 +54,11 @@ void cmd_connect_when_no_account(void **state) expect_cons_show("Connecting as user@server.org"); - expect_string(jabber_connect_with_details, jid, "user@server.org"); - expect_string(jabber_connect_with_details, passwd, "password"); - expect_value(jabber_connect_with_details, altdomain, NULL); - expect_value(jabber_connect_with_details, port, 0); - will_return(jabber_connect_with_details, JABBER_CONNECTING); + expect_string(session_connect_with_details, jid, "user@server.org"); + expect_string(session_connect_with_details, passwd, "password"); + expect_value(session_connect_with_details, altdomain, NULL); + expect_value(session_connect_with_details, port, 0); + will_return(session_connect_with_details, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -73,7 +68,7 @@ void cmd_connect_fail_message(void **state) { gchar *args[] = { "user@server.org", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_any(accounts_get_account, name); will_return(accounts_get_account, NULL); @@ -82,11 +77,11 @@ void cmd_connect_fail_message(void **state) expect_cons_show("Connecting as user@server.org"); - expect_any(jabber_connect_with_details, jid); - expect_any(jabber_connect_with_details, passwd); - expect_any(jabber_connect_with_details, altdomain); - expect_any(jabber_connect_with_details, port); - will_return(jabber_connect_with_details, JABBER_DISCONNECTED); + expect_any(session_connect_with_details, jid); + expect_any(session_connect_with_details, passwd); + expect_any(session_connect_with_details, altdomain); + expect_any(session_connect_with_details, port); + will_return(session_connect_with_details, JABBER_DISCONNECTED); expect_cons_show_error("Connection attempt for user@server.org failed."); @@ -98,7 +93,7 @@ void cmd_connect_lowercases_argument(void **state) { gchar *args[] = { "USER@server.ORG", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); @@ -107,11 +102,11 @@ void cmd_connect_lowercases_argument(void **state) expect_cons_show("Connecting as user@server.org"); - expect_any(jabber_connect_with_details, jid); - expect_any(jabber_connect_with_details, passwd); - expect_any(jabber_connect_with_details, altdomain); - expect_any(jabber_connect_with_details, port); - will_return(jabber_connect_with_details, JABBER_CONNECTING); + expect_any(session_connect_with_details, jid); + expect_any(session_connect_with_details, passwd); + expect_any(session_connect_with_details, altdomain); + expect_any(session_connect_with_details, port); + will_return(session_connect_with_details, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -123,7 +118,7 @@ void cmd_connect_asks_password_when_not_in_account(void **state) ProfAccount *account = account_new("jabber_org", "me@jabber.org", NULL, NULL, TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); @@ -132,8 +127,8 @@ void cmd_connect_asks_password_when_not_in_account(void **state) expect_cons_show("Connecting with account jabber_org as me@jabber.org"); - expect_any(jabber_connect_with_account, account); - will_return(jabber_connect_with_account, JABBER_CONNECTING); + expect_any(session_connect_with_account, account); + will_return(session_connect_with_account, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -143,7 +138,7 @@ void cmd_connect_shows_usage_when_no_server_value(void **state) { gchar *args[] = { "user@server.org", "server", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -156,7 +151,7 @@ void cmd_connect_shows_usage_when_server_no_port_value(void **state) { gchar *args[] = { "user@server.org", "server", "aserver", "port", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -169,7 +164,7 @@ void cmd_connect_shows_usage_when_no_port_value(void **state) { gchar *args[] = { "user@server.org", "port", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -182,7 +177,7 @@ void cmd_connect_shows_usage_when_port_no_server_value(void **state) { gchar *args[] = { "user@server.org", "port", "5678", "server", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -195,7 +190,7 @@ void cmd_connect_shows_message_when_port_0(void **state) { gchar *args[] = { "user@server.org", "port", "0", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Value 0 out of range. Must be in 1..65535."); expect_cons_show(""); @@ -208,7 +203,7 @@ void cmd_connect_shows_message_when_port_minus1(void **state) { gchar *args[] = { "user@server.org", "port", "-1", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Value -1 out of range. Must be in 1..65535."); expect_cons_show(""); @@ -221,7 +216,7 @@ void cmd_connect_shows_message_when_port_65536(void **state) { gchar *args[] = { "user@server.org", "port", "65536", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Value 65536 out of range. Must be in 1..65535."); expect_cons_show(""); @@ -234,7 +229,7 @@ void cmd_connect_shows_message_when_port_contains_chars(void **state) { gchar *args[] = { "user@server.org", "port", "52f66", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("Could not convert \"52f66\" to a number."); expect_cons_show(""); @@ -247,7 +242,7 @@ void cmd_connect_shows_usage_when_server_provided_twice(void **state) { gchar *args[] = { "user@server.org", "server", "server1", "server", "server2", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -260,7 +255,7 @@ void cmd_connect_shows_usage_when_port_provided_twice(void **state) { gchar *args[] = { "user@server.org", "port", "1111", "port", "1111", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -273,7 +268,7 @@ void cmd_connect_shows_usage_when_invalid_first_property(void **state) { gchar *args[] = { "user@server.org", "wrong", "server", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -286,7 +281,7 @@ void cmd_connect_shows_usage_when_invalid_second_property(void **state) { gchar *args[] = { "user@server.org", "server", "aserver", "wrong", "1234", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_CONNECT); expect_cons_show(""); @@ -299,7 +294,7 @@ void cmd_connect_with_server_when_provided(void **state) { gchar *args[] = { "user@server.org", "server", "aserver", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); @@ -308,11 +303,11 @@ void cmd_connect_with_server_when_provided(void **state) expect_cons_show("Connecting as user@server.org"); - expect_string(jabber_connect_with_details, jid, "user@server.org"); - expect_string(jabber_connect_with_details, passwd, "password"); - expect_string(jabber_connect_with_details, altdomain, "aserver"); - expect_value(jabber_connect_with_details, port, 0); - will_return(jabber_connect_with_details, JABBER_CONNECTING); + expect_string(session_connect_with_details, jid, "user@server.org"); + expect_string(session_connect_with_details, passwd, "password"); + expect_string(session_connect_with_details, altdomain, "aserver"); + expect_value(session_connect_with_details, port, 0); + will_return(session_connect_with_details, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -322,7 +317,7 @@ void cmd_connect_with_port_when_provided(void **state) { gchar *args[] = { "user@server.org", "port", "5432", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); @@ -331,11 +326,11 @@ void cmd_connect_with_port_when_provided(void **state) expect_cons_show("Connecting as user@server.org"); - expect_string(jabber_connect_with_details, jid, "user@server.org"); - expect_string(jabber_connect_with_details, passwd, "password"); - expect_value(jabber_connect_with_details, altdomain, NULL); - expect_value(jabber_connect_with_details, port, 5432); - will_return(jabber_connect_with_details, JABBER_CONNECTING); + expect_string(session_connect_with_details, jid, "user@server.org"); + expect_string(session_connect_with_details, passwd, "password"); + expect_value(session_connect_with_details, altdomain, NULL); + expect_value(session_connect_with_details, port, 5432); + will_return(session_connect_with_details, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -345,7 +340,7 @@ void cmd_connect_with_server_and_port_when_provided(void **state) { gchar *args[] = { "user@server.org", "port", "5432", "server", "aserver", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_string(accounts_get_account, name, "user@server.org"); will_return(accounts_get_account, NULL); @@ -354,11 +349,11 @@ void cmd_connect_with_server_and_port_when_provided(void **state) expect_cons_show("Connecting as user@server.org"); - expect_string(jabber_connect_with_details, jid, "user@server.org"); - expect_string(jabber_connect_with_details, passwd, "password"); - expect_string(jabber_connect_with_details, altdomain, "aserver"); - expect_value(jabber_connect_with_details, port, 5432); - will_return(jabber_connect_with_details, JABBER_CONNECTING); + expect_string(session_connect_with_details, jid, "user@server.org"); + expect_string(session_connect_with_details, passwd, "password"); + expect_string(session_connect_with_details, altdomain, "aserver"); + expect_value(session_connect_with_details, port, 5432); + will_return(session_connect_with_details, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -370,15 +365,15 @@ void cmd_connect_shows_message_when_connecting_with_account(void **state) ProfAccount *account = account_new("jabber_org", "user@jabber.org", "password", NULL, TRUE, NULL, 0, "laptop", NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); expect_cons_show("Connecting with account jabber_org as user@jabber.org/laptop"); - expect_any(jabber_connect_with_account, account); - will_return(jabber_connect_with_account, JABBER_CONNECTING); + expect_any(session_connect_with_account, account); + will_return(session_connect_with_account, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); @@ -390,15 +385,15 @@ void cmd_connect_connects_with_account(void **state) ProfAccount *account = account_new("jabber_org", "me@jabber.org", "password", NULL, TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); expect_cons_show("Connecting with account jabber_org as me@jabber.org"); - expect_memory(jabber_connect_with_account, account, account, sizeof(account)); - will_return(jabber_connect_with_account, JABBER_CONNECTING); + expect_memory(session_connect_with_account, account, account, sizeof(account)); + will_return(session_connect_with_account, JABBER_CONNECTING); gboolean result = cmd_connect(NULL, CMD_CONNECT, args); assert_true(result); diff --git a/tests/unittests/test_cmd_disconnect.c b/tests/unittests/test_cmd_disconnect.c index 90c99b3c..ba73adf5 100644 --- a/tests/unittests/test_cmd_disconnect.c +++ b/tests/unittests/test_cmd_disconnect.c @@ -21,8 +21,8 @@ void clears_chat_sessions(void **state) chat_session_recipient_active("bob@server.org", "laptop", FALSE); chat_session_recipient_active("mike@server.org", "work", FALSE); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_fulljid, "myjid@myserver.com"); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(connection_get_fulljid, "myjid@myserver.com"); expect_any_cons_show(); gboolean result = cmd_disconnect(NULL, CMD_DISCONNECT, NULL); diff --git a/tests/unittests/test_cmd_join.c b/tests/unittests/test_cmd_join.c index 668aec5c..8b71c5e5 100644 --- a/tests/unittests/test_cmd_join.c +++ b/tests/unittests/test_cmd_join.c @@ -20,7 +20,7 @@ static void test_with_connection_status(jabber_conn_status_t status) { - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You are not currently connected."); @@ -43,16 +43,11 @@ void cmd_join_shows_message_when_disconnected(void **state) test_with_connection_status(JABBER_DISCONNECTED); } -void cmd_join_shows_message_when_undefined(void **state) -{ - test_with_connection_status(JABBER_UNDEFINED); -} - void cmd_join_shows_error_message_when_invalid_room_jid(void **state) { gchar *args[] = { "//@@/", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_cons_show_error("Specified room has incorrect format."); expect_cons_show(""); @@ -74,8 +69,8 @@ void cmd_join_uses_account_mucservice_when_no_service_specified(void **state) muc_init(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, account_name); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, account_name); expect_string(accounts_get_account, name, account_name); will_return(accounts_get_account, account); @@ -99,8 +94,8 @@ void cmd_join_uses_supplied_nick(void **state) muc_init(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, account_name); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, account_name); expect_string(accounts_get_account, name, account_name); will_return(accounts_get_account, account); @@ -124,8 +119,8 @@ void cmd_join_uses_account_nick_when_not_supplied(void **state) muc_init(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, account_name); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, account_name); expect_string(accounts_get_account, name, account_name); will_return(accounts_get_account, account); @@ -152,8 +147,8 @@ void cmd_join_uses_password_when_supplied(void **state) muc_init(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, account_name); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, account_name); expect_string(accounts_get_account, name, account_name); will_return(accounts_get_account, account); diff --git a/tests/unittests/test_cmd_otr.c b/tests/unittests/test_cmd_otr.c index 9790c3da..44703943 100644 --- a/tests/unittests/test_cmd_otr.c +++ b/tests/unittests/test_cmd_otr.c @@ -138,7 +138,7 @@ void cmd_otr_gen_shows_message_when_not_connected(void **state) { gchar *args[] = { "gen", NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("You must be connected with an account to load OTR information."); @@ -150,7 +150,7 @@ static void test_with_command_and_connection_status(char *command, void *cmd_fun { gchar *args[] = { command, NULL }; - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You must be connected with an account to load OTR information."); @@ -164,16 +164,6 @@ void cmd_otr_gen_shows_message_when_disconnected(void **state) test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_DISCONNECTED); } -void cmd_otr_gen_shows_message_when_undefined(void **state) -{ - test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_UNDEFINED); -} - -void cmd_otr_gen_shows_message_when_started(void **state) -{ - test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_STARTED); -} - void cmd_otr_gen_shows_message_when_connecting(void **state) { test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_CONNECTING); @@ -191,8 +181,8 @@ void cmd_otr_gen_generates_key_for_connected_account(void **state) ProfAccount *account = account_new(account_name, "me@jabber.org", NULL, NULL, TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, account_name); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, account_name); expect_string(accounts_get_account, name, account_name); @@ -209,16 +199,6 @@ void cmd_otr_myfp_shows_message_when_disconnected(void **state) test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_DISCONNECTED); } -void cmd_otr_myfp_shows_message_when_undefined(void **state) -{ - test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_UNDEFINED); -} - -void cmd_otr_myfp_shows_message_when_started(void **state) -{ - test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_STARTED); -} - void cmd_otr_myfp_shows_message_when_connecting(void **state) { test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_CONNECTING); @@ -233,7 +213,7 @@ void cmd_otr_myfp_shows_message_when_no_key(void **state) { gchar *args[] = { "myfp", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); will_return(otr_key_loaded, FALSE); expect_ui_current_print_formatted_line('!', 0, "You have not generated or loaded a private key, use '/otr gen'"); @@ -249,7 +229,7 @@ void cmd_otr_myfp_shows_my_fingerprint(void **state) GString *message = g_string_new("Your OTR fingerprint: "); g_string_append(message, fingerprint); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); will_return(otr_key_loaded, TRUE); will_return(otr_get_my_fingerprint, strdup(fingerprint)); @@ -268,7 +248,7 @@ test_cmd_otr_theirfp_from_wintype(win_type_t wintype) ProfWin window; window.type = wintype; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_ui_current_print_line("You must be in a regular chat window to view a recipient's fingerprint."); @@ -304,7 +284,7 @@ void cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void **state) chatwin.pgp_send = FALSE; chatwin.is_otr = FALSE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session."); @@ -331,7 +311,7 @@ void cmd_otr_theirfp_shows_fingerprint(void **state) chatwin.pgp_send = FALSE; chatwin.is_otr = TRUE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(otr_get_their_fingerprint, recipient, recipient); will_return(otr_get_their_fingerprint, strdup(fingerprint)); @@ -351,7 +331,7 @@ test_cmd_otr_start_from_wintype(win_type_t wintype) ProfWin window; window.type = wintype; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_ui_current_print_line("You must be in a regular chat window to start an OTR session."); @@ -379,7 +359,7 @@ void cmd_otr_start_shows_message_when_already_started(void **state) char *recipient = "someone@server.org"; gchar *args[] = { "start", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); ProfWin window; window.type = WIN_CHAT; @@ -401,7 +381,7 @@ void cmd_otr_start_shows_message_when_no_key(void **state) char *recipient = "someone@server.org"; gchar *args[] = { "start", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); will_return(otr_key_loaded, FALSE); ProfWin window; @@ -435,7 +415,7 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void **state) chatwin.pgp_send = FALSE; chatwin.is_otr = FALSE; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); will_return(otr_key_loaded, TRUE); will_return(otr_start_query, query_message); diff --git a/tests/unittests/test_cmd_otr.h b/tests/unittests/test_cmd_otr.h index 4f00b6b1..5343cc57 100644 --- a/tests/unittests/test_cmd_otr.h +++ b/tests/unittests/test_cmd_otr.h @@ -13,12 +13,10 @@ void cmd_otr_gen_shows_message_when_not_connected(void **state); void cmd_otr_gen_generates_key_for_connected_account(void **state); void cmd_otr_gen_shows_message_when_disconnected(void **state); void cmd_otr_gen_shows_message_when_undefined(void **state); -void cmd_otr_gen_shows_message_when_started(void **state); void cmd_otr_gen_shows_message_when_connecting(void **state); void cmd_otr_gen_shows_message_when_disconnecting(void **state); void cmd_otr_myfp_shows_message_when_disconnected(void **state); void cmd_otr_myfp_shows_message_when_undefined(void **state); -void cmd_otr_myfp_shows_message_when_started(void **state); void cmd_otr_myfp_shows_message_when_connecting(void **state); void cmd_otr_myfp_shows_message_when_disconnecting(void **state); void cmd_otr_myfp_shows_message_when_no_key(void **state); diff --git a/tests/unittests/test_cmd_pgp.c b/tests/unittests/test_cmd_pgp.c index 68d48b0c..ec010cce 100644 --- a/tests/unittests/test_cmd_pgp.c +++ b/tests/unittests/test_cmd_pgp.c @@ -32,7 +32,7 @@ void cmd_pgp_start_shows_message_when_connection(jabber_conn_status_t conn_statu ProfWin window; window.type = WIN_CHAT; - will_return(jabber_get_connection_status, conn_status); + will_return(connection_get_status, conn_status); expect_cons_show("You must be connected to start PGP encrpytion."); @@ -55,23 +55,13 @@ void cmd_pgp_start_shows_message_when_connecting(void **state) cmd_pgp_start_shows_message_when_connection(JABBER_CONNECTING); } -void cmd_pgp_start_shows_message_when_undefined(void **state) -{ - cmd_pgp_start_shows_message_when_connection(JABBER_UNDEFINED); -} - -void cmd_pgp_start_shows_message_when_started(void **state) -{ - cmd_pgp_start_shows_message_when_connection(JABBER_STARTED); -} - void cmd_pgp_start_shows_message_when_no_arg_in_wintype(win_type_t wintype) { gchar *args[] = { "start", NULL }; ProfWin window; window.type = wintype; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_cons_show("You must be in a regular chat window to start PGP encrpytion."); diff --git a/tests/unittests/test_cmd_pgp.h b/tests/unittests/test_cmd_pgp.h index fcb24500..0d681a4a 100644 --- a/tests/unittests/test_cmd_pgp.h +++ b/tests/unittests/test_cmd_pgp.h @@ -6,7 +6,6 @@ void cmd_pgp_start_shows_message_when_disconnected(void **state); void cmd_pgp_start_shows_message_when_disconnecting(void **state); void cmd_pgp_start_shows_message_when_connecting(void **state); void cmd_pgp_start_shows_message_when_undefined(void **state); -void cmd_pgp_start_shows_message_when_started(void **state); void cmd_pgp_start_shows_message_when_no_arg_in_console(void **state); void cmd_pgp_start_shows_message_when_no_arg_in_muc(void **state); void cmd_pgp_start_shows_message_when_no_arg_in_mucconf(void **state); diff --git a/tests/unittests/test_cmd_rooms.c b/tests/unittests/test_cmd_rooms.c index 663073f3..85a528b5 100644 --- a/tests/unittests/test_cmd_rooms.c +++ b/tests/unittests/test_cmd_rooms.c @@ -18,7 +18,7 @@ static void test_with_connection_status(jabber_conn_status_t status) { - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You are not currently connected."); @@ -41,16 +41,6 @@ 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) { gchar *args[] = { NULL }; @@ -58,8 +48,8 @@ void cmd_rooms_uses_account_default_when_no_arg(void **state) ProfAccount *account = account_new("testaccount", NULL, NULL, NULL, TRUE, NULL, 0, NULL, NULL, NULL, 0, 0, 0, 0, 0, strdup("default_conf_server"), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - will_return(jabber_get_connection_status, JABBER_CONNECTED); - will_return(jabber_get_account_name, "account_name"); + will_return(connection_get_status, JABBER_CONNECTED); + will_return(session_get_account_name, "account_name"); expect_any(accounts_get_account, name); will_return(accounts_get_account, account); @@ -73,7 +63,7 @@ void cmd_rooms_arg_used_when_passed(void **state) { gchar *args[] = { "conf_server_arg" }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(iq_room_list_request, conferencejid, "conf_server_arg"); diff --git a/tests/unittests/test_cmd_rooms.h b/tests/unittests/test_cmd_rooms.h index a9a7af83..1b13cf07 100644 --- a/tests/unittests/test_cmd_rooms.h +++ b/tests/unittests/test_cmd_rooms.h @@ -1,7 +1,6 @@ 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_rooms_arg_used_when_passed(void **state); diff --git a/tests/unittests/test_cmd_roster.c b/tests/unittests/test_cmd_roster.c index 054328be..8b194de4 100644 --- a/tests/unittests/test_cmd_roster.c +++ b/tests/unittests/test_cmd_roster.c @@ -19,7 +19,7 @@ static void test_with_connection_status(jabber_conn_status_t status) { gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, status); + will_return(connection_get_status, status); expect_cons_show("You are not currently connected."); @@ -42,16 +42,11 @@ void cmd_roster_shows_message_when_disconnected(void **state) test_with_connection_status(JABBER_DISCONNECTED); } -void cmd_roster_shows_message_when_undefined(void **state) -{ - test_with_connection_status(JABBER_UNDEFINED); -} - void cmd_roster_shows_roster_when_no_args(void **state) { gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); roster_create(); roster_add("bob@server.org", "bob", NULL, "both", FALSE); @@ -69,7 +64,7 @@ void cmd_roster_add_shows_message_when_no_jid(void **state) { gchar *args[] = { "add", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ROSTER); @@ -83,7 +78,7 @@ void cmd_roster_add_sends_roster_add_request(void **state) char *nick = "bob"; gchar *args[] = { "add", jid, nick, NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(roster_send_add_new, barejid, jid); expect_string(roster_send_add_new, name, nick); @@ -96,7 +91,7 @@ void cmd_roster_remove_shows_message_when_no_jid(void **state) { gchar *args[] = { "remove", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ROSTER); @@ -109,7 +104,7 @@ void cmd_roster_remove_sends_roster_remove_request(void **state) char *jid = "bob@server.org"; gchar *args[] = { "remove", jid, NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(roster_send_remove, barejid, jid); @@ -121,7 +116,7 @@ void cmd_roster_nick_shows_message_when_no_jid(void **state) { gchar *args[] = { "nick", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ROSTER); @@ -133,7 +128,7 @@ void cmd_roster_nick_shows_message_when_no_nick(void **state) { gchar *args[] = { "nick", "bob@server.org", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ROSTER); @@ -147,7 +142,7 @@ void cmd_roster_nick_shows_message_when_no_contact_exists(void **state) roster_create(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_cons_show("Contact not found in roster: bob@server.org"); @@ -168,7 +163,7 @@ void cmd_roster_nick_sends_name_change_request(void **state) groups = g_slist_append(groups, strdup("group1")); roster_add(jid, "bob", groups, "both", FALSE); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(roster_send_name_change, barejid, jid); expect_string(roster_send_name_change, new_name, nick); @@ -188,7 +183,7 @@ void cmd_roster_clearnick_shows_message_when_no_jid(void **state) { gchar *args[] = { "clearnick", NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_ROSTER); @@ -202,7 +197,7 @@ void cmd_roster_clearnick_shows_message_when_no_contact_exists(void **state) roster_create(); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_cons_show("Contact not found in roster: bob@server.org"); @@ -222,7 +217,7 @@ void cmd_roster_clearnick_sends_name_change_request_with_empty_nick(void **state groups = g_slist_append(groups, strdup("group1")); roster_add(jid, "bob", groups, "both", FALSE); - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(roster_send_name_change, barejid, jid); expect_value(roster_send_name_change, new_name, NULL); diff --git a/tests/unittests/test_cmd_sub.c b/tests/unittests/test_cmd_sub.c index 62871520..a89e82bf 100644 --- a/tests/unittests/test_cmd_sub.c +++ b/tests/unittests/test_cmd_sub.c @@ -19,7 +19,7 @@ void cmd_sub_shows_message_when_not_connected(void **state) { gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, JABBER_DISCONNECTED); + will_return(connection_get_status, JABBER_DISCONNECTED); expect_cons_show("You are currently not connected."); @@ -31,7 +31,7 @@ void cmd_sub_shows_usage_when_no_arg(void **state) { gchar *args[] = { NULL }; - will_return(jabber_get_connection_status, JABBER_CONNECTED); + will_return(connection_get_status, JABBER_CONNECTED); expect_string(cons_bad_cmd_usage, cmd, CMD_SUB); diff --git a/tests/unittests/unittests.c b/tests/unittests/unittests.c index 7baa9615..2c3d6ce5 100644 --- a/tests/unittests/unittests.c +++ b/tests/unittests/unittests.c @@ -238,9 +238,6 @@ int main(int argc, char* argv[]) { unit_test_setup_teardown(cmd_connect_shows_message_when_connected, load_preferences, close_preferences), - unit_test_setup_teardown(cmd_connect_shows_message_when_undefined, - load_preferences, - close_preferences), unit_test_setup_teardown(cmd_connect_when_no_account, load_preferences, close_preferences), @@ -308,8 +305,6 @@ int main(int argc, char* argv[]) { 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_rooms_arg_used_when_passed), @@ -484,8 +479,6 @@ int main(int argc, char* argv[]) { unit_test(cmd_bookmark_shows_message_when_disconnected), unit_test(cmd_bookmark_shows_message_when_disconnecting), unit_test(cmd_bookmark_shows_message_when_connecting), - unit_test(cmd_bookmark_shows_message_when_started), - 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), @@ -518,13 +511,9 @@ int main(int argc, char* argv[]) { unit_test(cmd_otr_gen_shows_message_when_not_connected), unit_test(cmd_otr_gen_generates_key_for_connected_account), unit_test(cmd_otr_gen_shows_message_when_disconnected), - unit_test(cmd_otr_gen_shows_message_when_undefined), - unit_test(cmd_otr_gen_shows_message_when_started), unit_test(cmd_otr_gen_shows_message_when_connecting), unit_test(cmd_otr_gen_shows_message_when_disconnecting), unit_test(cmd_otr_myfp_shows_message_when_disconnected), - unit_test(cmd_otr_myfp_shows_message_when_undefined), - unit_test(cmd_otr_myfp_shows_message_when_started), unit_test(cmd_otr_myfp_shows_message_when_connecting), unit_test(cmd_otr_myfp_shows_message_when_disconnecting), unit_test(cmd_otr_myfp_shows_message_when_no_key), @@ -551,8 +540,6 @@ int main(int argc, char* argv[]) { unit_test(cmd_pgp_start_shows_message_when_disconnected), unit_test(cmd_pgp_start_shows_message_when_disconnecting), unit_test(cmd_pgp_start_shows_message_when_connecting), - unit_test(cmd_pgp_start_shows_message_when_undefined), - unit_test(cmd_pgp_start_shows_message_when_started), unit_test(cmd_pgp_start_shows_message_when_no_arg_in_console), unit_test(cmd_pgp_start_shows_message_when_no_arg_in_muc), unit_test(cmd_pgp_start_shows_message_when_no_arg_in_mucconf), @@ -565,7 +552,6 @@ int main(int argc, char* argv[]) { unit_test(cmd_join_shows_message_when_disconnecting), unit_test(cmd_join_shows_message_when_connecting), unit_test(cmd_join_shows_message_when_disconnected), - unit_test(cmd_join_shows_message_when_undefined), unit_test(cmd_join_shows_error_message_when_invalid_room_jid), unit_test(cmd_join_uses_account_mucservice_when_no_service_specified), unit_test(cmd_join_uses_supplied_nick), @@ -575,7 +561,6 @@ int main(int argc, char* argv[]) { unit_test(cmd_roster_shows_message_when_disconnecting), unit_test(cmd_roster_shows_message_when_connecting), unit_test(cmd_roster_shows_message_when_disconnected), - unit_test(cmd_roster_shows_message_when_undefined), unit_test(cmd_roster_shows_roster_when_no_args), unit_test(cmd_roster_add_shows_message_when_no_jid), unit_test(cmd_roster_add_sends_roster_add_request), diff --git a/tests/unittests/xmpp/stub_xmpp.c b/tests/unittests/xmpp/stub_xmpp.c index fef17bf6..0fb9d828 100644 --- a/tests/unittests/xmpp/stub_xmpp.c +++ b/tests/unittests/xmpp/stub_xmpp.c @@ -6,9 +6,9 @@ #include "xmpp/xmpp.h" // connection functions -void jabber_init(void) {} +void session_init(void) {} -jabber_conn_status_t jabber_connect_with_details(const char * const jid, +jabber_conn_status_t session_connect_with_details(const char * const jid, const char * const passwd, const char * const altdomain, const int port, const char *const tls_policy) { check_expected(jid); @@ -18,60 +18,72 @@ jabber_conn_status_t jabber_connect_with_details(const char * const jid, return (jabber_conn_status_t)mock(); } -jabber_conn_status_t jabber_connect_with_account(const ProfAccount * const account) +jabber_conn_status_t session_connect_with_account(const ProfAccount * const account) { check_expected(account); return (jabber_conn_status_t)mock(); } -void jabber_disconnect(void) {} -void jabber_shutdown(void) {} -void jabber_process_events(int millis) {} -const char * jabber_get_fulljid(void) +void session_disconnect(void) {} +void session_shutdown(void) {} +void session_process_events(int millis) {} +const char * connection_get_fulljid(void) { return (char *)mock(); } -const char * jabber_get_domain(void) +const char * session_get_domain(void) { return NULL; } -char* jabber_create_uuid(void) +gboolean connection_is_secured(void) +{ + return 1; +} + +TLSCertificate* +connection_get_tls_peer_cert(void) +{ + return NULL; +} + + +char* connection_create_uuid(void) { return NULL; } -void jabber_free_uuid(char * uuid) {} +void connection_free_uuid(char * uuid) {} -jabber_conn_status_t jabber_get_connection_status(void) +jabber_conn_status_t connection_get_status(void) { return (jabber_conn_status_t)mock(); } -char* jabber_get_presence_message(void) +char* connection_get_presence_msg(void) { return (char*)mock(); } -char* jabber_get_account_name(void) +char* session_get_account_name(void) { return (char*)mock(); } -GList * jabber_get_available_resources(void) +GList * session_get_available_resources(void) { return NULL; } gboolean -jabber_send_stanza(const char *const stanza) +connection_send_stanza(const char *const stanza) { return TRUE; } gboolean -jabber_service_supports(const char *const feature) +connection_supports(const char *const feature) { return FALSE; } |