From e81435be06a24c949b6dbf8557411d78c8cab459 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Sat, 28 Feb 2026 12:41:33 +0100 Subject: [PATCH] tests: standardize naming convention Use a behavior-driven naming convention for unit tests. Functions are now named using the pattern: [unit]__[verb]__[scenario] The __ works as a semantic separator. Examples: * jid_create__returns__null_from_null() * cmd_connect__shows__usage_when_no_server_value Benefits: * Easy to find all tests associated with a specific function using the mandatory prefix. * Test output in CI now explicitly describes the unit, the expected outcome, and the scenario being tested. Also disabled keyhandlers tests due to missing code in src/ui. --- tests/unittests/command/test_cmd_account.c | 112 +-- tests/unittests/command/test_cmd_account.h | 117 +-- tests/unittests/command/test_cmd_alias.c | 18 +- tests/unittests/command/test_cmd_alias.h | 23 +- tests/unittests/command/test_cmd_bookmark.c | 34 +- tests/unittests/command/test_cmd_bookmark.h | 41 +- tests/unittests/command/test_cmd_connect.c | 50 +- tests/unittests/command/test_cmd_connect.h | 59 +- tests/unittests/command/test_cmd_disconnect.c | 2 +- tests/unittests/command/test_cmd_disconnect.h | 7 +- tests/unittests/command/test_cmd_join.c | 16 +- tests/unittests/command/test_cmd_join.h | 23 +- tests/unittests/command/test_cmd_otr.c | 60 +- tests/unittests/command/test_cmd_otr.h | 69 +- tests/unittests/command/test_cmd_pgp.c | 40 +- tests/unittests/command/test_cmd_pgp.h | 27 +- tests/unittests/command/test_cmd_presence.c | 26 +- tests/unittests/command/test_cmd_presence.h | 31 +- tests/unittests/command/test_cmd_rooms.c | 12 +- tests/unittests/command/test_cmd_rooms.h | 19 +- tests/unittests/command/test_cmd_roster.c | 37 +- tests/unittests/command/test_cmd_roster.h | 38 +- tests/unittests/command/test_cmd_sub.c | 4 +- tests/unittests/command/test_cmd_sub.h | 9 +- tests/unittests/config/test_preferences.c | 6 +- tests/unittests/config/test_preferences.h | 11 +- tests/unittests/event/test_server_events.c | 10 +- tests/unittests/event/test_server_events.h | 24 +- tests/unittests/plugins/test_callbacks.c | 4 +- tests/unittests/plugins/test_callbacks.h | 9 +- tests/unittests/plugins/test_plugins_disco.c | 14 +- tests/unittests/plugins/test_plugins_disco.h | 19 +- tests/unittests/test_common.c | 94 +- tests/unittests/test_common.h | 103 +- tests/unittests/tools/test_autocomplete.c | 32 +- tests/unittests/tools/test_autocomplete.h | 37 +- tests/unittests/tools/test_parser.c | 100 +- tests/unittests/tools/test_parser.h | 105 ++- tests/unittests/ui/test_keyhandlers.c | 133 ++- tests/unittests/ui/test_keyhandlers.h | 93 +- tests/unittests/unittests.c | 876 +++++++++--------- tests/unittests/xmpp/test_chat_session.c | 8 +- tests/unittests/xmpp/test_chat_session.h | 13 +- tests/unittests/xmpp/test_contact.c | 48 +- tests/unittests/xmpp/test_contact.h | 53 +- tests/unittests/xmpp/test_form.c | 42 +- tests/unittests/xmpp/test_form.h | 47 +- tests/unittests/xmpp/test_jid.c | 50 +- tests/unittests/xmpp/test_jid.h | 55 +- tests/unittests/xmpp/test_muc.c | 12 +- tests/unittests/xmpp/test_muc.h | 17 +- tests/unittests/xmpp/test_roster_list.c | 70 +- tests/unittests/xmpp/test_roster_list.h | 75 +- 53 files changed, 1601 insertions(+), 1433 deletions(-) diff --git a/tests/unittests/command/test_cmd_account.c b/tests/unittests/command/test_cmd_account.c index dd607408..085c089f 100644 --- a/tests/unittests/command/test_cmd_account.c +++ b/tests/unittests/command/test_cmd_account.c @@ -15,7 +15,7 @@ #define CMD_ACCOUNT "/account" void -cmd_account_shows_usage_when_not_connected_and_no_args(void** state) +cmd_account__shows__usage_when_not_connected_and_no_args(void** state) { gchar* args[] = { NULL }; @@ -28,7 +28,7 @@ cmd_account_shows_usage_when_not_connected_and_no_args(void** state) } void -cmd_account_shows_account_when_connected_and_no_args(void** state) +cmd_account__shows__account_when_connected_and_no_args(void** state) { ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("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, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0); @@ -46,7 +46,7 @@ cmd_account_shows_account_when_connected_and_no_args(void** state) } void -cmd_account_list_shows_accounts(void** state) +cmd_account_list__shows__accounts(void** state) { gchar* args[] = { "list", NULL }; @@ -65,7 +65,7 @@ cmd_account_list_shows_accounts(void** state) } void -cmd_account_show_shows_usage_when_no_arg(void** state) +cmd_account_show__shows__usage_when_no_arg(void** state) { gchar* args[] = { "show", NULL }; @@ -76,7 +76,7 @@ cmd_account_show_shows_usage_when_no_arg(void** state) } void -cmd_account_show_shows_message_when_account_does_not_exist(void** state) +cmd_account_show__shows__message_when_account_does_not_exist(void** state) { gchar* args[] = { "show", "account_name", NULL }; @@ -91,7 +91,7 @@ cmd_account_show_shows_message_when_account_does_not_exist(void** state) } void -cmd_account_show_shows_account_when_exists(void** state) +cmd_account_show__shows__account_when_exists(void** state) { gchar* args[] = { "show", "account_name", NULL }; ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("me@jabber.org"), NULL, NULL, @@ -107,7 +107,7 @@ cmd_account_show_shows_account_when_exists(void** state) } void -cmd_account_add_shows_usage_when_no_arg(void** state) +cmd_account_add__shows__usage_when_no_arg(void** state) { gchar* args[] = { "add", NULL }; @@ -118,7 +118,7 @@ cmd_account_add_shows_usage_when_no_arg(void** state) } void -cmd_account_add_adds_account(void** state) +cmd_account_add__updates__adds_account(void** state) { gchar* args[] = { "add", "new_account", NULL }; @@ -133,7 +133,7 @@ cmd_account_add_adds_account(void** state) } void -cmd_account_enable_shows_usage_when_no_arg(void** state) +cmd_account_enable__shows__usage_when_no_arg(void** state) { gchar* args[] = { "enable", NULL }; @@ -144,7 +144,7 @@ cmd_account_enable_shows_usage_when_no_arg(void** state) } void -cmd_account_enable_enables_account(void** state) +cmd_account_enable__updates__enables_account(void** state) { gchar* args[] = { "enable", "account_name", NULL }; @@ -159,7 +159,7 @@ cmd_account_enable_enables_account(void** state) } void -cmd_account_enable_shows_message_when_account_doesnt_exist(void** state) +cmd_account_enable__shows__message_when_account_doesnt_exist(void** state) { gchar* args[] = { "enable", "account_name", NULL }; @@ -174,7 +174,7 @@ cmd_account_enable_shows_message_when_account_doesnt_exist(void** state) } void -cmd_account_disable_shows_usage_when_no_arg(void** state) +cmd_account_disable__shows__usage_when_no_arg(void** state) { gchar* args[] = { "disable", NULL }; @@ -185,7 +185,7 @@ cmd_account_disable_shows_usage_when_no_arg(void** state) } void -cmd_account_disable_disables_account(void** state) +cmd_account_disable__updates__disables_account(void** state) { gchar* args[] = { "disable", "account_name", NULL }; @@ -200,7 +200,7 @@ cmd_account_disable_disables_account(void** state) } void -cmd_account_disable_shows_message_when_account_doesnt_exist(void** state) +cmd_account_disable__shows__message_when_account_doesnt_exist(void** state) { gchar* args[] = { "disable", "account_name", NULL }; @@ -215,7 +215,7 @@ cmd_account_disable_shows_message_when_account_doesnt_exist(void** state) } void -cmd_account_rename_shows_usage_when_no_args(void** state) +cmd_account_rename__shows__usage_when_no_args(void** state) { gchar* args[] = { "rename", NULL }; @@ -226,7 +226,7 @@ cmd_account_rename_shows_usage_when_no_args(void** state) } void -cmd_account_rename_shows_usage_when_one_arg(void** state) +cmd_account_rename__shows__usage_when_one_arg(void** state) { gchar* args[] = { "rename", "original_name", NULL }; @@ -237,7 +237,7 @@ cmd_account_rename_shows_usage_when_one_arg(void** state) } void -cmd_account_rename_renames_account(void** state) +cmd_account_rename__updates__renames_account(void** state) { gchar* args[] = { "rename", "original_name", "new_name", NULL }; @@ -253,7 +253,7 @@ cmd_account_rename_renames_account(void** state) } void -cmd_account_rename_shows_message_when_not_renamed(void** state) +cmd_account_rename__shows__message_when_not_renamed(void** state) { gchar* args[] = { "rename", "original_name", "new_name", NULL }; @@ -269,7 +269,7 @@ cmd_account_rename_shows_message_when_not_renamed(void** state) } void -cmd_account_set_shows_usage_when_no_args(void** state) +cmd_account_set__shows__usage_when_no_args(void** state) { gchar* args[] = { "set", NULL }; @@ -280,7 +280,7 @@ cmd_account_set_shows_usage_when_no_args(void** state) } void -cmd_account_set_shows_usage_when_one_arg(void** state) +cmd_account_set__shows__usage_when_one_arg(void** state) { gchar* args[] = { "set", "a_account", NULL }; @@ -291,7 +291,7 @@ cmd_account_set_shows_usage_when_one_arg(void** state) } void -cmd_account_set_shows_usage_when_two_args(void** state) +cmd_account_set__shows__usage_when_two_args(void** state) { gchar* args[] = { "set", "a_account", "a_property", NULL }; @@ -302,7 +302,7 @@ cmd_account_set_shows_usage_when_two_args(void** state) } void -cmd_account_set_shows_message_when_account_doesnt_exist(void** state) +cmd_account_set__shows__message_when_account_doesnt_exist(void** state) { gchar* args[] = { "set", "a_account", "a_property", "a_value", NULL }; @@ -317,7 +317,7 @@ cmd_account_set_shows_message_when_account_doesnt_exist(void** state) } void -cmd_account_set_jid_shows_message_for_malformed_jid(void** state) +cmd_account_set__shows__message_for_malformed_jid(void** state) { gchar* args[] = { "set", "a_account", "jid", "@malformed", NULL }; @@ -331,7 +331,7 @@ cmd_account_set_jid_shows_message_for_malformed_jid(void** state) } void -cmd_account_set_jid_sets_barejid(void** state) +cmd_account_set__updates__jid_sets_barejid(void** state) { gchar* args[] = { "set", "a_account", "jid", "a_local@a_domain", NULL }; @@ -349,7 +349,7 @@ cmd_account_set_jid_sets_barejid(void** state) } void -cmd_account_set_jid_sets_resource(void** state) +cmd_account_set__updates__jid_sets_resource(void** state) { gchar* args[] = { "set", "a_account", "jid", "a_local@a_domain/a_resource", NULL }; @@ -372,7 +372,7 @@ cmd_account_set_jid_sets_resource(void** state) } void -cmd_account_set_server_sets_server(void** state) +cmd_account_set__updates__server_sets_server(void** state) { gchar* args[] = { "set", "a_account", "server", "a_server", NULL }; @@ -390,7 +390,7 @@ cmd_account_set_server_sets_server(void** state) } void -cmd_account_set_resource_sets_resource(void** state) +cmd_account_set__updates__resource_sets_resource(void** state) { gchar* args[] = { "set", "a_account", "resource", "a_resource", NULL }; @@ -410,7 +410,7 @@ cmd_account_set_resource_sets_resource(void** state) } void -cmd_account_set_resource_sets_resource_with_online_message(void** state) +cmd_account_set__shows__resource_sets_resource_with_online_message(void** state) { gchar* args[] = { "set", "a_account", "resource", "a_resource", NULL }; @@ -430,7 +430,7 @@ cmd_account_set_resource_sets_resource_with_online_message(void** state) } void -cmd_account_set_password_sets_password(void** state) +cmd_account_set__updates__password_sets_password(void** state) { gchar* args[] = { "set", "a_account", "password", "a_password", NULL }; ProfAccount* account = account_new(g_strdup("a_account"), NULL, NULL, NULL, @@ -453,7 +453,7 @@ cmd_account_set_password_sets_password(void** state) } void -cmd_account_set_eval_password_sets_eval_password(void** state) +cmd_account_set__updates__eval_password_sets_eval_password(void** state) { gchar* args[] = { "set", "a_account", "eval_password", "a_password", NULL }; ProfAccount* account = account_new(g_strdup("a_account"), NULL, NULL, NULL, @@ -476,7 +476,7 @@ cmd_account_set_eval_password_sets_eval_password(void** state) } void -cmd_account_set_password_when_eval_password_set(void** state) +cmd_account_set__shows__password_when_eval_password_set(void** state) { gchar* args[] = { "set", "a_account", "password", "a_password", NULL }; ProfAccount* account = account_new(g_strdup("a_account"), NULL, NULL, g_strdup("a_password"), @@ -495,7 +495,7 @@ cmd_account_set_password_when_eval_password_set(void** state) } void -cmd_account_set_eval_password_when_password_set(void** state) +cmd_account_set__shows__eval_password_when_password_set(void** state) { gchar* args[] = { "set", "a_account", "eval_password", "a_password", NULL }; ProfAccount* account = account_new(g_strdup("a_account"), NULL, g_strdup("a_password"), NULL, @@ -514,7 +514,7 @@ cmd_account_set_eval_password_when_password_set(void** state) } void -cmd_account_set_muc_sets_muc(void** state) +cmd_account_set__updates__muc_sets_muc(void** state) { gchar* args[] = { "set", "a_account", "muc", "a_muc", NULL }; @@ -532,7 +532,7 @@ cmd_account_set_muc_sets_muc(void** state) } void -cmd_account_set_nick_sets_nick(void** state) +cmd_account_set__updates__nick_sets_nick(void** state) { gchar* args[] = { "set", "a_account", "nick", "a_nick", NULL }; @@ -550,7 +550,7 @@ cmd_account_set_nick_sets_nick(void** state) } void -cmd_account_show_message_for_missing_otr_policy(void** state) +cmd_account_set__shows__message_for_missing_otr_policy(void** state) { gchar* args[] = { "set", "a_account", "otr", NULL }; @@ -561,7 +561,7 @@ cmd_account_show_message_for_missing_otr_policy(void** state) } void -cmd_account_show_message_for_invalid_otr_policy(void** state) +cmd_account_set__shows__message_for_invalid_otr_policy(void** state) { gchar* args[] = { "set", "a_account", "otr", "bad_otr_policy", NULL }; @@ -576,7 +576,7 @@ cmd_account_show_message_for_invalid_otr_policy(void** state) } void -cmd_account_set_otr_sets_otr(void** state) +cmd_account_set__updates__otr_sets_otr(void** state) { gchar* args[] = { "set", "a_account", "otr", "opportunistic", NULL }; @@ -594,7 +594,7 @@ cmd_account_set_otr_sets_otr(void** state) } void -cmd_account_set_status_shows_message_when_invalid_status(void** state) +cmd_account_set__shows__message_when_invalid_status(void** state) { gchar* args[] = { "set", "a_account", "status", "bad_status", NULL }; @@ -609,7 +609,7 @@ cmd_account_set_status_shows_message_when_invalid_status(void** state) } void -cmd_account_set_status_sets_status_when_valid(void** state) +cmd_account_set__updates__status_sets_status_when_valid(void** state) { gchar* args[] = { "set", "a_account", "status", "away", NULL }; @@ -627,7 +627,7 @@ cmd_account_set_status_sets_status_when_valid(void** state) } void -cmd_account_set_status_sets_status_when_last(void** state) +cmd_account_set__updates__status_sets_status_when_last(void** state) { gchar* args[] = { "set", "a_account", "status", "last", NULL }; @@ -645,7 +645,7 @@ cmd_account_set_status_sets_status_when_last(void** state) } void -cmd_account_set_invalid_presence_string_priority_shows_message(void** state) +cmd_account_set__shows__invalid_presence_string_priority_message(void** state) { gchar* args[] = { "set", "a_account", "blah", "10", NULL }; @@ -660,7 +660,7 @@ cmd_account_set_invalid_presence_string_priority_shows_message(void** state) } void -cmd_account_set_last_priority_shows_message(void** state) +cmd_account_set__shows__last_priority_message(void** state) { gchar* args[] = { "set", "a_account", "last", "10", NULL }; @@ -675,7 +675,7 @@ cmd_account_set_last_priority_shows_message(void** state) } void -cmd_account_set_online_priority_sets_preference(void** state) +cmd_account_set__updates__online_priority_sets_preference(void** state) { gchar* args[] = { "set", "a_account", "online", "10", NULL }; @@ -695,7 +695,7 @@ cmd_account_set_online_priority_sets_preference(void** state) } void -cmd_account_set_chat_priority_sets_preference(void** state) +cmd_account_set__updates__chat_priority_sets_preference(void** state) { gchar* args[] = { "set", "a_account", "chat", "10", NULL }; @@ -715,7 +715,7 @@ cmd_account_set_chat_priority_sets_preference(void** state) } void -cmd_account_set_away_priority_sets_preference(void** state) +cmd_account_set__updates__away_priority_sets_preference(void** state) { gchar* args[] = { "set", "a_account", "away", "10", NULL }; @@ -735,7 +735,7 @@ cmd_account_set_away_priority_sets_preference(void** state) } void -cmd_account_set_xa_priority_sets_preference(void** state) +cmd_account_set__updates__xa_priority_sets_preference(void** state) { gchar* args[] = { "set", "a_account", "xa", "10", NULL }; @@ -755,7 +755,7 @@ cmd_account_set_xa_priority_sets_preference(void** state) } void -cmd_account_set_dnd_priority_sets_preference(void** state) +cmd_account_set__updates__dnd_priority_sets_preference(void** state) { gchar* args[] = { "set", "a_account", "dnd", "10", NULL }; @@ -775,7 +775,7 @@ cmd_account_set_dnd_priority_sets_preference(void** state) } void -cmd_account_set_priority_too_low_shows_message(void** state) +cmd_account_set__shows__priority_too_low_message(void** state) { gchar* args[] = { "set", "a_account", "online", "-150", NULL }; @@ -789,7 +789,7 @@ cmd_account_set_priority_too_low_shows_message(void** state) } void -cmd_account_set_priority_too_high_shows_message(void** state) +cmd_account_set__shows__priority_too_high_message(void** state) { gchar* args[] = { "set", "a_account", "online", "150", NULL }; @@ -803,7 +803,7 @@ cmd_account_set_priority_too_high_shows_message(void** state) } void -cmd_account_set_priority_when_not_number_shows_message(void** state) +cmd_account_set__shows__priority_when_not_number_message(void** state) { gchar* args[] = { "set", "a_account", "online", "abc", NULL }; @@ -817,7 +817,7 @@ cmd_account_set_priority_when_not_number_shows_message(void** state) } void -cmd_account_set_priority_when_empty_shows_message(void** state) +cmd_account_set__shows__priority_when_empty_message(void** state) { gchar* args[] = { "set", "a_account", "online", "", NULL }; @@ -831,7 +831,7 @@ cmd_account_set_priority_when_empty_shows_message(void** state) } void -cmd_account_set_priority_updates_presence_when_account_connected_with_presence(void** state) +cmd_account_set__updates__priority_updates_presence_when_connected(void** state) { gchar* args[] = { "set", "a_account", "online", "10", NULL }; @@ -868,7 +868,7 @@ cmd_account_set_priority_updates_presence_when_account_connected_with_presence(v } void -cmd_account_clear_shows_usage_when_no_args(void** state) +cmd_account_clear__shows__usage_when_no_args(void** state) { gchar* args[] = { "clear", NULL }; @@ -879,7 +879,7 @@ cmd_account_clear_shows_usage_when_no_args(void** state) } void -cmd_account_clear_shows_usage_when_one_arg(void** state) +cmd_account_clear__shows__usage_when_one_arg(void** state) { gchar* args[] = { "clear", "a_account", NULL }; @@ -890,7 +890,7 @@ cmd_account_clear_shows_usage_when_one_arg(void** state) } void -cmd_account_clear_shows_message_when_account_doesnt_exist(void** state) +cmd_account_clear__shows__message_when_account_doesnt_exist(void** state) { gchar* args[] = { "clear", "a_account", "a_property", NULL }; @@ -905,7 +905,7 @@ cmd_account_clear_shows_message_when_account_doesnt_exist(void** state) } void -cmd_account_clear_shows_message_when_invalid_property(void** state) +cmd_account_clear__shows__message_when_invalid_property(void** state) { gchar* args[] = { "clear", "a_account", "badproperty", NULL }; diff --git a/tests/unittests/command/test_cmd_account.h b/tests/unittests/command/test_cmd_account.h index 7a8d1b42..65fc0c32 100644 --- a/tests/unittests/command/test_cmd_account.h +++ b/tests/unittests/command/test_cmd_account.h @@ -1,56 +1,61 @@ -void cmd_account_shows_usage_when_not_connected_and_no_args(void** state); -void cmd_account_shows_account_when_connected_and_no_args(void** state); -void cmd_account_list_shows_accounts(void** state); -void cmd_account_show_shows_usage_when_no_arg(void** state); -void cmd_account_show_shows_message_when_account_does_not_exist(void** state); -void cmd_account_show_shows_account_when_exists(void** state); -void cmd_account_add_shows_usage_when_no_arg(void** state); -void cmd_account_add_adds_account(void** state); -void cmd_account_enable_shows_usage_when_no_arg(void** state); -void cmd_account_enable_enables_account(void** state); -void cmd_account_enable_shows_message_when_account_doesnt_exist(void** state); -void cmd_account_disable_shows_usage_when_no_arg(void** state); -void cmd_account_disable_disables_account(void** state); -void cmd_account_disable_shows_message_when_account_doesnt_exist(void** state); -void cmd_account_rename_shows_usage_when_no_args(void** state); -void cmd_account_rename_shows_usage_when_one_arg(void** state); -void cmd_account_rename_renames_account(void** state); -void cmd_account_rename_shows_message_when_not_renamed(void** state); -void cmd_account_set_shows_usage_when_no_args(void** state); -void cmd_account_set_shows_usage_when_one_arg(void** state); -void cmd_account_set_shows_usage_when_two_args(void** state); -void cmd_account_set_shows_message_when_account_doesnt_exist(void** state); -void cmd_account_set_jid_shows_message_for_malformed_jid(void** state); -void cmd_account_set_jid_sets_barejid(void** state); -void cmd_account_set_jid_sets_resource(void** state); -void cmd_account_set_server_sets_server(void** state); -void cmd_account_set_resource_sets_resource(void** state); -void cmd_account_set_resource_sets_resource_with_online_message(void** state); -void cmd_account_set_password_sets_password(void** state); -void cmd_account_set_eval_password_sets_eval_password(void** state); -void cmd_account_set_password_when_eval_password_set(void** state); -void cmd_account_set_eval_password_when_password_set(void** state); -void cmd_account_set_muc_sets_muc(void** state); -void cmd_account_set_nick_sets_nick(void** state); -void cmd_account_show_message_for_missing_otr_policy(void** state); -void cmd_account_show_message_for_invalid_otr_policy(void** state); -void cmd_account_set_otr_sets_otr(void** state); -void cmd_account_set_status_shows_message_when_invalid_status(void** state); -void cmd_account_set_status_sets_status_when_valid(void** state); -void cmd_account_set_status_sets_status_when_last(void** state); -void cmd_account_set_invalid_presence_string_priority_shows_message(void** state); -void cmd_account_set_last_priority_shows_message(void** state); -void cmd_account_set_online_priority_sets_preference(void** state); -void cmd_account_set_chat_priority_sets_preference(void** state); -void cmd_account_set_away_priority_sets_preference(void** state); -void cmd_account_set_xa_priority_sets_preference(void** state); -void cmd_account_set_dnd_priority_sets_preference(void** state); -void cmd_account_set_priority_too_low_shows_message(void** state); -void cmd_account_set_priority_too_high_shows_message(void** state); -void cmd_account_set_priority_when_not_number_shows_message(void** state); -void cmd_account_set_priority_when_empty_shows_message(void** state); -void cmd_account_set_priority_updates_presence_when_account_connected_with_presence(void** state); -void cmd_account_clear_shows_usage_when_no_args(void** state); -void cmd_account_clear_shows_usage_when_one_arg(void** state); -void cmd_account_clear_shows_message_when_account_doesnt_exist(void** state); -void cmd_account_clear_shows_message_when_invalid_property(void** state); +#ifndef TESTS_TEST_CMD_ACCOUNT_H +#define TESTS_TEST_CMD_ACCOUNT_H + +void cmd_account__shows__usage_when_not_connected_and_no_args(void** state); +void cmd_account__shows__account_when_connected_and_no_args(void** state); +void cmd_account_list__shows__accounts(void** state); +void cmd_account_show__shows__usage_when_no_arg(void** state); +void cmd_account_show__shows__message_when_account_does_not_exist(void** state); +void cmd_account_show__shows__account_when_exists(void** state); +void cmd_account_add__shows__usage_when_no_arg(void** state); +void cmd_account_add__updates__adds_account(void** state); +void cmd_account_enable__shows__usage_when_no_arg(void** state); +void cmd_account_enable__updates__enables_account(void** state); +void cmd_account_enable__shows__message_when_account_doesnt_exist(void** state); +void cmd_account_disable__shows__usage_when_no_arg(void** state); +void cmd_account_disable__updates__disables_account(void** state); +void cmd_account_disable__shows__message_when_account_doesnt_exist(void** state); +void cmd_account_rename__shows__usage_when_no_args(void** state); +void cmd_account_rename__shows__usage_when_one_arg(void** state); +void cmd_account_rename__updates__renames_account(void** state); +void cmd_account_rename__shows__message_when_not_renamed(void** state); +void cmd_account_set__shows__usage_when_no_args(void** state); +void cmd_account_set__shows__usage_when_one_arg(void** state); +void cmd_account_set__shows__usage_when_two_args(void** state); +void cmd_account_set__shows__message_when_account_doesnt_exist(void** state); +void cmd_account_set__shows__message_for_malformed_jid(void** state); +void cmd_account_set__updates__jid_sets_barejid(void** state); +void cmd_account_set__updates__jid_sets_resource(void** state); +void cmd_account_set__updates__server_sets_server(void** state); +void cmd_account_set__updates__resource_sets_resource(void** state); +void cmd_account_set__shows__resource_sets_resource_with_online_message(void** state); +void cmd_account_set__updates__password_sets_password(void** state); +void cmd_account_set__updates__eval_password_sets_eval_password(void** state); +void cmd_account_set__shows__password_when_eval_password_set(void** state); +void cmd_account_set__shows__eval_password_when_password_set(void** state); +void cmd_account_set__updates__muc_sets_muc(void** state); +void cmd_account_set__updates__nick_sets_nick(void** state); +void cmd_account_set__shows__message_for_missing_otr_policy(void** state); +void cmd_account_set__shows__message_for_invalid_otr_policy(void** state); +void cmd_account_set__updates__otr_sets_otr(void** state); +void cmd_account_set__shows__message_when_invalid_status(void** state); +void cmd_account_set__updates__status_sets_status_when_valid(void** state); +void cmd_account_set__updates__status_sets_status_when_last(void** state); +void cmd_account_set__shows__invalid_presence_string_priority_message(void** state); +void cmd_account_set__shows__last_priority_message(void** state); +void cmd_account_set__updates__online_priority_sets_preference(void** state); +void cmd_account_set__updates__chat_priority_sets_preference(void** state); +void cmd_account_set__updates__away_priority_sets_preference(void** state); +void cmd_account_set__updates__xa_priority_sets_preference(void** state); +void cmd_account_set__updates__dnd_priority_sets_preference(void** state); +void cmd_account_set__shows__priority_too_low_message(void** state); +void cmd_account_set__shows__priority_too_high_message(void** state); +void cmd_account_set__shows__priority_when_not_number_message(void** state); +void cmd_account_set__shows__priority_when_empty_message(void** state); +void cmd_account_set__updates__priority_updates_presence_when_connected(void** state); +void cmd_account_clear__shows__usage_when_no_args(void** state); +void cmd_account_clear__shows__usage_when_one_arg(void** state); +void cmd_account_clear__shows__message_when_account_doesnt_exist(void** state); +void cmd_account_clear__shows__message_when_invalid_property(void** state); + +#endif diff --git a/tests/unittests/command/test_cmd_alias.c b/tests/unittests/command/test_cmd_alias.c index 69081012..ee9df0f7 100644 --- a/tests/unittests/command/test_cmd_alias.c +++ b/tests/unittests/command/test_cmd_alias.c @@ -17,7 +17,7 @@ #define CMD_ALIAS "/alias" void -cmd_alias_add_shows_usage_when_no_args(void** state) +cmd_alias__shows__usage_when_add_no_args(void** state) { gchar* args[] = { "add", NULL }; @@ -28,7 +28,7 @@ cmd_alias_add_shows_usage_when_no_args(void** state) } void -cmd_alias_add_shows_usage_when_no_value(void** state) +cmd_alias__shows__usage_when_add_no_value(void** state) { gchar* args[] = { "add", "alias", NULL }; @@ -39,7 +39,7 @@ cmd_alias_add_shows_usage_when_no_value(void** state) } void -cmd_alias_remove_shows_usage_when_no_args(void** state) +cmd_alias__shows__usage_when_remove_no_args(void** state) { gchar* args[] = { "remove", NULL }; @@ -50,7 +50,7 @@ cmd_alias_remove_shows_usage_when_no_args(void** state) } void -cmd_alias_show_usage_when_invalid_subcmd(void** state) +cmd_alias__shows__usage_when_invalid_subcmd(void** state) { gchar* args[] = { "blah", NULL }; @@ -61,7 +61,7 @@ cmd_alias_show_usage_when_invalid_subcmd(void** state) } void -cmd_alias_add_adds_alias(void** state) +cmd_alias__updates__adds_alias(void** state) { gchar* args[] = { "add", "hc", "/help commands", NULL }; @@ -77,7 +77,7 @@ cmd_alias_add_adds_alias(void** state) } void -cmd_alias_add_shows_message_when_exists(void** state) +cmd_alias__shows__message_when_add_exists(void** state) { gchar* args[] = { "add", "hc", "/help commands", NULL }; @@ -91,7 +91,7 @@ cmd_alias_add_shows_message_when_exists(void** state) } void -cmd_alias_remove_removes_alias(void** state) +cmd_alias__updates__removes_alias(void** state) { gchar* args[] = { "remove", "hn", NULL }; @@ -109,7 +109,7 @@ cmd_alias_remove_removes_alias(void** state) } void -cmd_alias_remove_shows_message_when_no_alias(void** state) +cmd_alias__shows__message_when_remove_no_alias(void** state) { gchar* args[] = { "remove", "hn", NULL }; @@ -120,7 +120,7 @@ cmd_alias_remove_shows_message_when_no_alias(void** state) } void -cmd_alias_list_shows_all_aliases(void** state) +cmd_alias__shows__all_aliases(void** state) { gchar* args[] = { "list", NULL }; diff --git a/tests/unittests/command/test_cmd_alias.h b/tests/unittests/command/test_cmd_alias.h index b674d479..d3bae139 100644 --- a/tests/unittests/command/test_cmd_alias.h +++ b/tests/unittests/command/test_cmd_alias.h @@ -1,9 +1,14 @@ -void cmd_alias_add_shows_usage_when_no_args(void** state); -void cmd_alias_add_shows_usage_when_no_value(void** state); -void cmd_alias_remove_shows_usage_when_no_args(void** state); -void cmd_alias_show_usage_when_invalid_subcmd(void** state); -void cmd_alias_add_adds_alias(void** state); -void cmd_alias_add_shows_message_when_exists(void** state); -void cmd_alias_remove_removes_alias(void** state); -void cmd_alias_remove_shows_message_when_no_alias(void** state); -void cmd_alias_list_shows_all_aliases(void** state); +#ifndef TESTS_TEST_CMD_ALIAS_H +#define TESTS_TEST_CMD_ALIAS_H + +void cmd_alias__shows__usage_when_add_no_args(void** state); +void cmd_alias__shows__usage_when_add_no_value(void** state); +void cmd_alias__shows__usage_when_remove_no_args(void** state); +void cmd_alias__shows__usage_when_invalid_subcmd(void** state); +void cmd_alias__updates__adds_alias(void** state); +void cmd_alias__shows__message_when_add_exists(void** state); +void cmd_alias__updates__removes_alias(void** state); +void cmd_alias__shows__message_when_remove_no_alias(void** state); +void cmd_alias__shows__all_aliases(void** state); + +#endif diff --git a/tests/unittests/command/test_cmd_bookmark.c b/tests/unittests/command/test_cmd_bookmark.c index 849561ba..cb7c2d42 100644 --- a/tests/unittests/command/test_cmd_bookmark.c +++ b/tests/unittests/command/test_cmd_bookmark.c @@ -32,25 +32,25 @@ test_with_connection_status(jabber_conn_status_t status) } void -cmd_bookmark_shows_message_when_disconnected(void** state) +cmd_bookmark__shows__message_when_disconnected(void** state) { test_with_connection_status(JABBER_DISCONNECTED); } void -cmd_bookmark_shows_message_when_disconnecting(void** state) +cmd_bookmark__shows__message_when_disconnecting(void** state) { test_with_connection_status(JABBER_DISCONNECTING); } void -cmd_bookmark_shows_message_when_connecting(void** state) +cmd_bookmark__shows__message_when_connecting(void** state) { test_with_connection_status(JABBER_CONNECTING); } void -cmd_bookmark_shows_usage_when_no_args(void** state) +cmd_bookmark__shows__usage_when_no_args(void** state) { gchar* args[] = { NULL }; ProfWin window; @@ -90,7 +90,7 @@ _cmp_bookmark(Bookmark* bm1, Bookmark* bm2) } void -cmd_bookmark_list_shows_bookmarks(void** state) +cmd_bookmark_list__shows__bookmarks(void** state) { gchar* args[] = { "list", NULL }; GList* bookmarks = NULL; @@ -152,7 +152,7 @@ cmd_bookmark_list_shows_bookmarks(void** state) } void -cmd_bookmark_add_shows_message_when_invalid_jid(void** state) +cmd_bookmark_add__shows__message_when_invalid_jid(void** state) { char* jid = "room"; gchar* args[] = { "add", jid, NULL }; @@ -169,7 +169,7 @@ cmd_bookmark_add_shows_message_when_invalid_jid(void** state) } void -cmd_bookmark_add_adds_bookmark_with_jid(void** state) +cmd_bookmark_add__updates__bookmark_with_jid(void** state) { char* jid = "room@conf.server"; gchar* args[] = { "add", jid, NULL }; @@ -191,7 +191,7 @@ cmd_bookmark_add_adds_bookmark_with_jid(void** state) } void -cmd_bookmark_uses_roomjid_in_room(void** state) +cmd_bookmark__tests__uses_roomjid_in_room(void** state) { gchar* args[] = { NULL }; ProfMucWin muc_win; @@ -214,7 +214,7 @@ cmd_bookmark_uses_roomjid_in_room(void** state) } void -cmd_bookmark_add_uses_roomjid_in_room(void** state) +cmd_bookmark_add__tests__uses_roomjid_in_room(void** state) { gchar* args[] = { "add", NULL }; ProfMucWin muc_win; @@ -237,7 +237,7 @@ cmd_bookmark_add_uses_roomjid_in_room(void** state) } void -cmd_bookmark_add_uses_supplied_jid_in_room(void** state) +cmd_bookmark_add__tests__uses_supplied_jid_in_room(void** state) { char* jid = "room1@conf.server"; gchar* args[] = { "add", jid, NULL }; @@ -261,7 +261,7 @@ cmd_bookmark_add_uses_supplied_jid_in_room(void** state) } void -cmd_bookmark_add_adds_bookmark_with_jid_nick(void** state) +cmd_bookmark_add__updates__bookmark_with_jid_nick(void** state) { char* jid = "room@conf.server"; char* nick = "bob"; @@ -284,7 +284,7 @@ cmd_bookmark_add_adds_bookmark_with_jid_nick(void** state) } void -cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void** state) +cmd_bookmark_add__updates__bookmark_with_jid_autojoin(void** state) { char* jid = "room@conf.server"; gchar* args[] = { "add", jid, "autojoin", "on", NULL }; @@ -306,7 +306,7 @@ cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void** state) } void -cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void** state) +cmd_bookmark_add__updates__bookmark_with_jid_nick_autojoin(void** state) { char* jid = "room@conf.server"; char* nick = "bob"; @@ -329,7 +329,7 @@ cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void** state) } void -cmd_bookmark_remove_removes_bookmark(void** state) +cmd_bookmark_remove__updates__removes_bookmark(void** state) { char* jid = "room@conf.server"; gchar* args[] = { "remove", jid, NULL }; @@ -348,7 +348,7 @@ cmd_bookmark_remove_removes_bookmark(void** state) } void -cmd_bookmark_remove_shows_message_when_no_bookmark(void** state) +cmd_bookmark_remove__shows__message_when_no_bookmark(void** state) { char* jid = "room@conf.server"; gchar* args[] = { "remove", jid, NULL }; @@ -367,7 +367,7 @@ cmd_bookmark_remove_shows_message_when_no_bookmark(void** state) } void -cmd_bookmark_remove_uses_roomjid_in_room(void** state) +cmd_bookmark_remove__tests__uses_roomjid_in_room(void** state) { gchar* args[] = { "remove", NULL }; ProfMucWin muc_win; @@ -387,7 +387,7 @@ cmd_bookmark_remove_uses_roomjid_in_room(void** state) } void -cmd_bookmark_remove_uses_supplied_jid_in_room(void** state) +cmd_bookmark_remove__tests__uses_supplied_jid_in_room(void** state) { char* jid = "room1@conf.server"; gchar* args[] = { "remove", jid, NULL }; diff --git a/tests/unittests/command/test_cmd_bookmark.h b/tests/unittests/command/test_cmd_bookmark.h index d8e598bb..b6e9cbd1 100644 --- a/tests/unittests/command/test_cmd_bookmark.h +++ b/tests/unittests/command/test_cmd_bookmark.h @@ -1,18 +1,23 @@ -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_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_uses_roomjid_in_room(void** state); -void cmd_bookmark_add_uses_roomjid_in_room(void** state); -void cmd_bookmark_add_uses_supplied_jid_in_room(void** state); -void cmd_bookmark_remove_uses_roomjid_in_room(void** state); -void cmd_bookmark_remove_uses_supplied_jid_in_room(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_remove_removes_bookmark(void** state); -void cmd_bookmark_remove_shows_message_when_no_bookmark(void** state); +#ifndef TESTS_TEST_CMD_BOOKMARK_H +#define TESTS_TEST_CMD_BOOKMARK_H + +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_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__updates__bookmark_with_jid(void** state); +void cmd_bookmark__tests__uses_roomjid_in_room(void** state); +void cmd_bookmark_add__tests__uses_roomjid_in_room(void** state); +void cmd_bookmark_add__tests__uses_supplied_jid_in_room(void** state); +void cmd_bookmark_remove__tests__uses_roomjid_in_room(void** state); +void cmd_bookmark_remove__tests__uses_supplied_jid_in_room(void** state); +void cmd_bookmark_add__updates__bookmark_with_jid_nick(void** state); +void cmd_bookmark_add__updates__bookmark_with_jid_autojoin(void** state); +void cmd_bookmark_add__updates__bookmark_with_jid_nick_autojoin(void** state); +void cmd_bookmark_remove__updates__removes_bookmark(void** state); +void cmd_bookmark_remove__shows__message_when_no_bookmark(void** state); + +#endif diff --git a/tests/unittests/command/test_cmd_connect.c b/tests/unittests/command/test_cmd_connect.c index be37ef07..6ebc7d0e 100644 --- a/tests/unittests/command/test_cmd_connect.c +++ b/tests/unittests/command/test_cmd_connect.c @@ -25,25 +25,25 @@ test_with_connection_status(jabber_conn_status_t status) } void -cmd_connect_shows_message_when_disconnecting(void** state) +cmd_connect__shows__message_when_disconnecting(void** state) { test_with_connection_status(JABBER_DISCONNECTING); } void -cmd_connect_shows_message_when_connecting(void** state) +cmd_connect__shows__message_when_connecting(void** state) { test_with_connection_status(JABBER_CONNECTING); } void -cmd_connect_shows_message_when_connected(void** state) +cmd_connect__shows__message_when_connected(void** state) { test_with_connection_status(JABBER_CONNECTED); } void -cmd_connect_when_no_account(void** state) +cmd_connect__tests__no_account(void** state) { gchar* args[] = { "user@server.org", NULL }; @@ -67,7 +67,7 @@ cmd_connect_when_no_account(void** state) } void -cmd_connect_fail_message(void** state) +cmd_connect__shows__fail_message(void** state) { gchar* args[] = { "user@server.org", NULL }; @@ -93,7 +93,7 @@ cmd_connect_fail_message(void** state) } void -cmd_connect_lowercases_argument_with_no_account(void** state) +cmd_connect__tests__lowercases_argument_with_no_account(void** state) { gchar* args[] = { "USER@server.ORG", NULL }; @@ -117,7 +117,7 @@ cmd_connect_lowercases_argument_with_no_account(void** state) } void -cmd_connect_lowercases_argument_with_account(void** state) +cmd_connect__tests__lowercases_argument_with_account(void** state) { gchar* args[] = { "Jabber_org", NULL }; ProfAccount* account = account_new(g_strdup("Jabber_org"), g_strdup("me@jabber.org"), g_strdup("password"), NULL, @@ -138,7 +138,7 @@ cmd_connect_lowercases_argument_with_account(void** state) } void -cmd_connect_asks_password_when_not_in_account(void** state) +cmd_connect__tests__asks_password_when_not_in_account(void** state) { gchar* args[] = { "jabber_org", NULL }; ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("me@jabber.org"), NULL, NULL, @@ -161,7 +161,7 @@ cmd_connect_asks_password_when_not_in_account(void** state) } void -cmd_connect_shows_usage_when_no_server_value(void** state) +cmd_connect__shows__usage_when_no_server_value(void** state) { gchar* args[] = { "user@server.org", "server", NULL }; @@ -175,7 +175,7 @@ cmd_connect_shows_usage_when_no_server_value(void** state) } void -cmd_connect_shows_usage_when_server_no_port_value(void** state) +cmd_connect__shows__usage_when_server_no_port_value(void** state) { gchar* args[] = { "user@server.org", "server", "aserver", "port", NULL }; @@ -189,7 +189,7 @@ cmd_connect_shows_usage_when_server_no_port_value(void** state) } void -cmd_connect_shows_usage_when_no_port_value(void** state) +cmd_connect__shows__usage_when_no_port_value(void** state) { gchar* args[] = { "user@server.org", "port", NULL }; @@ -203,7 +203,7 @@ cmd_connect_shows_usage_when_no_port_value(void** state) } void -cmd_connect_shows_usage_when_port_no_server_value(void** state) +cmd_connect__shows__usage_when_port_no_server_value(void** state) { gchar* args[] = { "user@server.org", "port", "5678", "server", NULL }; @@ -217,7 +217,7 @@ cmd_connect_shows_usage_when_port_no_server_value(void** state) } void -cmd_connect_shows_message_when_port_0(void** state) +cmd_connect__shows__message_when_port_0(void** state) { gchar* args[] = { "user@server.org", "port", "0", NULL }; @@ -231,7 +231,7 @@ cmd_connect_shows_message_when_port_0(void** state) } void -cmd_connect_shows_message_when_port_minus1(void** state) +cmd_connect__shows__message_when_port_minus1(void** state) { gchar* args[] = { "user@server.org", "port", "-1", NULL }; @@ -245,7 +245,7 @@ cmd_connect_shows_message_when_port_minus1(void** state) } void -cmd_connect_shows_message_when_port_65536(void** state) +cmd_connect__shows__message_when_port_65536(void** state) { gchar* args[] = { "user@server.org", "port", "65536", NULL }; @@ -259,7 +259,7 @@ cmd_connect_shows_message_when_port_65536(void** state) } void -cmd_connect_shows_message_when_port_contains_chars(void** state) +cmd_connect__shows__message_when_port_contains_chars(void** state) { gchar* args[] = { "user@server.org", "port", "52f66", NULL }; @@ -273,7 +273,7 @@ cmd_connect_shows_message_when_port_contains_chars(void** state) } void -cmd_connect_shows_usage_when_server_provided_twice(void** state) +cmd_connect__shows__usage_when_server_provided_twice(void** state) { gchar* args[] = { "user@server.org", "server", "server1", "server", "server2", NULL }; @@ -287,7 +287,7 @@ cmd_connect_shows_usage_when_server_provided_twice(void** state) } void -cmd_connect_shows_usage_when_port_provided_twice(void** state) +cmd_connect__shows__usage_when_port_provided_twice(void** state) { gchar* args[] = { "user@server.org", "port", "1111", "port", "1111", NULL }; @@ -301,7 +301,7 @@ cmd_connect_shows_usage_when_port_provided_twice(void** state) } void -cmd_connect_shows_usage_when_invalid_first_property(void** state) +cmd_connect__shows__usage_when_invalid_first_property(void** state) { gchar* args[] = { "user@server.org", "wrong", "server", NULL }; @@ -315,7 +315,7 @@ cmd_connect_shows_usage_when_invalid_first_property(void** state) } void -cmd_connect_shows_usage_when_invalid_second_property(void** state) +cmd_connect__shows__usage_when_invalid_second_property(void** state) { gchar* args[] = { "user@server.org", "server", "aserver", "wrong", "1234", NULL }; @@ -329,7 +329,7 @@ cmd_connect_shows_usage_when_invalid_second_property(void** state) } void -cmd_connect_with_server_when_provided(void** state) +cmd_connect__tests__with_server_when_provided(void** state) { gchar* args[] = { "user@server.org", "server", "aserver", NULL }; @@ -353,7 +353,7 @@ cmd_connect_with_server_when_provided(void** state) } void -cmd_connect_with_port_when_provided(void** state) +cmd_connect__tests__with_port_when_provided(void** state) { gchar* args[] = { "user@server.org", "port", "5432", NULL }; @@ -377,7 +377,7 @@ cmd_connect_with_port_when_provided(void** state) } void -cmd_connect_with_server_and_port_when_provided(void** state) +cmd_connect__tests__with_server_and_port_when_provided(void** state) { gchar* args[] = { "user@server.org", "port", "5432", "server", "aserver", NULL }; @@ -401,7 +401,7 @@ cmd_connect_with_server_and_port_when_provided(void** state) } void -cmd_connect_shows_message_when_connecting_with_account(void** state) +cmd_connect__shows__message_when_connecting_with_account(void** state) { gchar* args[] = { "jabber_org", NULL }; ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("user@jabber.org"), g_strdup("password"), NULL, @@ -422,7 +422,7 @@ cmd_connect_shows_message_when_connecting_with_account(void** state) } void -cmd_connect_connects_with_account(void** state) +cmd_connect__tests__connects_with_account(void** state) { gchar* args[] = { "jabber_org", NULL }; ProfAccount* account = account_new(g_strdup("jabber_org"), g_strdup("me@jabber.org"), g_strdup("password"), NULL, diff --git a/tests/unittests/command/test_cmd_connect.h b/tests/unittests/command/test_cmd_connect.h index 14e7f7b2..a3968b9c 100644 --- a/tests/unittests/command/test_cmd_connect.h +++ b/tests/unittests/command/test_cmd_connect.h @@ -1,27 +1,32 @@ -void cmd_connect_shows_message_when_disconnecting(void** state); -void cmd_connect_shows_message_when_connecting(void** state); -void cmd_connect_shows_message_when_connected(void** state); -void cmd_connect_shows_message_when_undefined(void** state); -void cmd_connect_when_no_account(void** state); -void cmd_connect_with_altdomain_when_provided(void** state); -void cmd_connect_fail_message(void** state); -void cmd_connect_lowercases_argument_with_no_account(void** state); -void cmd_connect_lowercases_argument_with_account(void** state); -void cmd_connect_asks_password_when_not_in_account(void** state); -void cmd_connect_shows_message_when_connecting_with_account(void** state); -void cmd_connect_connects_with_account(void** state); -void cmd_connect_shows_usage_when_no_server_value(void** state); -void cmd_connect_shows_usage_when_server_no_port_value(void** state); -void cmd_connect_shows_usage_when_no_port_value(void** state); -void cmd_connect_shows_usage_when_port_no_server_value(void** state); -void cmd_connect_shows_message_when_port_0(void** state); -void cmd_connect_shows_message_when_port_minus1(void** state); -void cmd_connect_shows_message_when_port_65536(void** state); -void cmd_connect_shows_message_when_port_contains_chars(void** state); -void cmd_connect_with_server_when_provided(void** state); -void cmd_connect_with_port_when_provided(void** state); -void cmd_connect_with_server_and_port_when_provided(void** state); -void cmd_connect_shows_usage_when_server_provided_twice(void** state); -void cmd_connect_shows_usage_when_port_provided_twice(void** state); -void cmd_connect_shows_usage_when_invalid_first_property(void** state); -void cmd_connect_shows_usage_when_invalid_second_property(void** state); +#ifndef TESTS_TEST_CMD_CONNECT_H +#define TESTS_TEST_CMD_CONNECT_H + +void cmd_connect__shows__message_when_disconnecting(void** state); +void cmd_connect__shows__message_when_connecting(void** state); +void cmd_connect__shows__message_when_connected(void** state); +void cmd_connect__shows__message_when_undefined(void** state); +void cmd_connect__tests__no_account(void** state); +void cmd_connect__tests__with_altdomain_when_provided(void** state); +void cmd_connect__shows__fail_message(void** state); +void cmd_connect__tests__lowercases_argument_with_no_account(void** state); +void cmd_connect__tests__lowercases_argument_with_account(void** state); +void cmd_connect__tests__asks_password_when_not_in_account(void** state); +void cmd_connect__shows__message_when_connecting_with_account(void** state); +void cmd_connect__tests__connects_with_account(void** state); +void cmd_connect__shows__usage_when_no_server_value(void** state); +void cmd_connect__shows__usage_when_server_no_port_value(void** state); +void cmd_connect__shows__usage_when_no_port_value(void** state); +void cmd_connect__shows__usage_when_port_no_server_value(void** state); +void cmd_connect__shows__message_when_port_0(void** state); +void cmd_connect__shows__message_when_port_minus1(void** state); +void cmd_connect__shows__message_when_port_65536(void** state); +void cmd_connect__shows__message_when_port_contains_chars(void** state); +void cmd_connect__tests__with_server_when_provided(void** state); +void cmd_connect__tests__with_port_when_provided(void** state); +void cmd_connect__tests__with_server_and_port_when_provided(void** state); +void cmd_connect__shows__usage_when_server_provided_twice(void** state); +void cmd_connect__shows__usage_when_port_provided_twice(void** state); +void cmd_connect__shows__usage_when_invalid_first_property(void** state); +void cmd_connect__shows__usage_when_invalid_second_property(void** state); + +#endif diff --git a/tests/unittests/command/test_cmd_disconnect.c b/tests/unittests/command/test_cmd_disconnect.c index e524577a..d621ceaf 100644 --- a/tests/unittests/command/test_cmd_disconnect.c +++ b/tests/unittests/command/test_cmd_disconnect.c @@ -12,7 +12,7 @@ #define CMD_DISCONNECT "/disconnect" void -clears_chat_sessions(void** state) +cmd_disconnect__updates__clears_chat_sessions(void** state) { chat_sessions_init(); roster_create(); diff --git a/tests/unittests/command/test_cmd_disconnect.h b/tests/unittests/command/test_cmd_disconnect.h index 0988bd25..757714ec 100644 --- a/tests/unittests/command/test_cmd_disconnect.h +++ b/tests/unittests/command/test_cmd_disconnect.h @@ -1 +1,6 @@ -void clears_chat_sessions(void** state); +#ifndef TESTS_TEST_CMD_DISCONNECT_H +#define TESTS_TEST_CMD_DISCONNECT_H + +void cmd_disconnect__updates__clears_chat_sessions(void** state); + +#endif diff --git a/tests/unittests/command/test_cmd_join.c b/tests/unittests/command/test_cmd_join.c index 75440332..563d7f14 100644 --- a/tests/unittests/command/test_cmd_join.c +++ b/tests/unittests/command/test_cmd_join.c @@ -27,25 +27,25 @@ test_with_connection_status(jabber_conn_status_t status) } void -cmd_join_shows_message_when_disconnecting(void** state) +cmd_join__shows__message_when_disconnecting(void** state) { test_with_connection_status(JABBER_DISCONNECTING); } void -cmd_join_shows_message_when_connecting(void** state) +cmd_join__shows__message_when_connecting(void** state) { test_with_connection_status(JABBER_CONNECTING); } void -cmd_join_shows_message_when_disconnected(void** state) +cmd_join__shows__message_when_disconnected(void** state) { test_with_connection_status(JABBER_DISCONNECTED); } void -cmd_join_shows_error_message_when_invalid_room_jid(void** state) +cmd_join__shows__error_message_when_invalid_room_jid(void** state) { gchar* args[] = { "//@@/", NULL }; @@ -59,7 +59,7 @@ cmd_join_shows_error_message_when_invalid_room_jid(void** state) } void -cmd_join_uses_account_mucservice_when_no_service_specified(void** state) +cmd_join__tests__uses_account_mucservice_when_no_service_specified(void** state) { gchar* account_name = g_strdup("an_account"); char* room = "room"; @@ -85,7 +85,7 @@ cmd_join_uses_account_mucservice_when_no_service_specified(void** state) } void -cmd_join_uses_supplied_nick(void** state) +cmd_join__tests__uses_supplied_nick(void** state) { gchar* account_name = g_strdup("an_account"); char* room = "room@conf.server.org"; @@ -109,7 +109,7 @@ cmd_join_uses_supplied_nick(void** state) } void -cmd_join_uses_account_nick_when_not_supplied(void** state) +cmd_join__tests__uses_account_nick_when_not_supplied(void** state) { gchar* account_name = g_strdup("an_account"); char* room = "room2@conf.server.org"; @@ -133,7 +133,7 @@ cmd_join_uses_account_nick_when_not_supplied(void** state) } void -cmd_join_uses_password_when_supplied(void** state) +cmd_join__tests__uses_password_when_supplied(void** state) { gchar* account_name = g_strdup("an_account"); char* room = "room"; diff --git a/tests/unittests/command/test_cmd_join.h b/tests/unittests/command/test_cmd_join.h index c22d9847..d5b282a3 100644 --- a/tests/unittests/command/test_cmd_join.h +++ b/tests/unittests/command/test_cmd_join.h @@ -1,9 +1,14 @@ -void cmd_join_shows_message_when_disconnecting(void** state); -void cmd_join_shows_message_when_connecting(void** state); -void cmd_join_shows_message_when_disconnected(void** state); -void cmd_join_shows_message_when_undefined(void** state); -void cmd_join_shows_error_message_when_invalid_room_jid(void** state); -void cmd_join_uses_account_mucservice_when_no_service_specified(void** state); -void cmd_join_uses_supplied_nick(void** state); -void cmd_join_uses_account_nick_when_not_supplied(void** state); -void cmd_join_uses_password_when_supplied(void** state); +#ifndef TESTS_TEST_CMD_JOIN_H +#define TESTS_TEST_CMD_JOIN_H + +void cmd_join__shows__message_when_disconnecting(void** state); +void cmd_join__shows__message_when_connecting(void** state); +void cmd_join__shows__message_when_disconnected(void** state); +void cmd_join__shows__message_when_undefined(void** state); +void cmd_join__shows__error_message_when_invalid_room_jid(void** state); +void cmd_join__tests__uses_account_mucservice_when_no_service_specified(void** state); +void cmd_join__tests__uses_supplied_nick(void** state); +void cmd_join__tests__uses_account_nick_when_not_supplied(void** state); +void cmd_join__tests__uses_password_when_supplied(void** state); + +#endif diff --git a/tests/unittests/command/test_cmd_otr.c b/tests/unittests/command/test_cmd_otr.c index 832f5e2f..465eece5 100644 --- a/tests/unittests/command/test_cmd_otr.c +++ b/tests/unittests/command/test_cmd_otr.c @@ -24,7 +24,7 @@ #ifdef HAVE_LIBOTR void -cmd_otr_log_shows_usage_when_no_args(void** state) +cmd_otr_log__shows__usage_when_no_args(void** state) { gchar* args[] = { "log", NULL }; @@ -35,7 +35,7 @@ cmd_otr_log_shows_usage_when_no_args(void** state) } void -cmd_otr_log_shows_usage_when_invalid_subcommand(void** state) +cmd_otr_log__shows__usage_when_invalid_subcommand(void** state) { gchar* args[] = { "log", "wrong", NULL }; @@ -46,7 +46,7 @@ cmd_otr_log_shows_usage_when_invalid_subcommand(void** state) } void -cmd_otr_log_on_enables_logging(void** state) +cmd_otr_log__updates__enables_logging(void** state) { gchar* args[] = { "log", "on", NULL }; prefs_set_string(PREF_OTR_LOG, "off"); @@ -62,7 +62,7 @@ cmd_otr_log_on_enables_logging(void** state) } void -cmd_otr_log_on_shows_warning_when_chlog_disabled(void** state) +cmd_otr_log__shows__warning_when_chlog_disabled(void** state) { gchar* args[] = { "log", "on", NULL }; prefs_set_string(PREF_OTR_LOG, "off"); @@ -76,7 +76,7 @@ cmd_otr_log_on_shows_warning_when_chlog_disabled(void** state) } void -cmd_otr_log_off_disables_logging(void** state) +cmd_otr_log__updates__disables_logging(void** state) { gchar* args[] = { "log", "off", NULL }; prefs_set_string(PREF_OTR_LOG, "on"); @@ -92,7 +92,7 @@ cmd_otr_log_off_disables_logging(void** state) } void -cmd_otr_redact_redacts_logging(void** state) +cmd_otr_log__updates__redacts_logging(void** state) { gchar* args[] = { "log", "redact", NULL }; prefs_set_string(PREF_OTR_LOG, "on"); @@ -108,7 +108,7 @@ cmd_otr_redact_redacts_logging(void** state) } void -cmd_otr_log_redact_shows_warning_when_chlog_disabled(void** state) +cmd_otr_log__shows__redact_warning_when_chlog_disabled(void** state) { gchar* args[] = { "log", "redact", NULL }; prefs_set_string(PREF_OTR_LOG, "off"); @@ -122,7 +122,7 @@ cmd_otr_log_redact_shows_warning_when_chlog_disabled(void** state) } void -cmd_otr_libver_shows_libotr_version(void** state) +cmd_otr_libver__shows__libotr_version(void** state) { gchar* args[] = { "libver", NULL }; char* version = "9.9.9"; @@ -140,7 +140,7 @@ cmd_otr_libver_shows_libotr_version(void** state) } void -cmd_otr_gen_shows_message_when_not_connected(void** state) +cmd_otr_gen__shows__message_when_not_connected(void** state) { gchar* args[] = { "gen", NULL }; @@ -167,25 +167,25 @@ test_with_command_and_connection_status(char* command, void* cmd_func, jabber_co } void -cmd_otr_gen_shows_message_when_disconnected(void** state) +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_connecting(void** state) +cmd_otr_gen__shows__message_when_connecting(void** state) { test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_CONNECTING); } void -cmd_otr_gen_shows_message_when_disconnecting(void** state) +cmd_otr_gen__shows__message_when_disconnecting(void** state) { test_with_command_and_connection_status("gen", cmd_otr_gen, JABBER_DISCONNECTING); } void -cmd_otr_gen_generates_key_for_connected_account(void** state) +cmd_otr_gen__tests__generates_key_for_connected_account(void** state) { gchar* args[] = { "gen", NULL }; gchar* account_name = g_strdup("myaccount"); @@ -206,25 +206,25 @@ cmd_otr_gen_generates_key_for_connected_account(void** state) } void -cmd_otr_myfp_shows_message_when_disconnected(void** state) +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_connecting(void** state) +cmd_otr_myfp__shows__message_when_connecting(void** state) { test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_CONNECTING); } void -cmd_otr_myfp_shows_message_when_disconnecting(void** state) +cmd_otr_myfp__shows__message_when_disconnecting(void** state) { test_with_command_and_connection_status("myfp", cmd_otr_myfp, JABBER_DISCONNECTING); } void -cmd_otr_myfp_shows_message_when_no_key(void** state) +cmd_otr_myfp__shows__message_when_no_key(void** state) { gchar* args[] = { "myfp", NULL }; @@ -238,7 +238,7 @@ cmd_otr_myfp_shows_message_when_no_key(void** state) } void -cmd_otr_myfp_shows_my_fingerprint(void** state) +cmd_otr_myfp__shows__my_fingerprint(void** state) { char* fingerprint = "AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD EEEEEEEE"; gchar* args[] = { "myfp", NULL }; @@ -277,25 +277,25 @@ test_cmd_otr_theirfp_from_wintype(win_type_t wintype) } void -cmd_otr_theirfp_shows_message_when_in_console(void** state) +cmd_otr_theirfp__shows__message_when_in_console(void** state) { test_cmd_otr_theirfp_from_wintype(WIN_CONSOLE); } void -cmd_otr_theirfp_shows_message_when_in_muc(void** state) +cmd_otr_theirfp__shows__message_when_in_muc(void** state) { test_cmd_otr_theirfp_from_wintype(WIN_MUC); } void -cmd_otr_theirfp_shows_message_when_in_private(void** state) +cmd_otr_theirfp__shows__message_when_in_private(void** state) { test_cmd_otr_theirfp_from_wintype(WIN_PRIVATE); } void -cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void** state) +cmd_otr_theirfp__shows__message_when_non_otr_chat_window(void** state) { gchar* args[] = { "theirfp", NULL }; @@ -320,7 +320,7 @@ cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void** state) } void -cmd_otr_theirfp_shows_fingerprint(void** state) +cmd_otr_theirfp__shows__fingerprint(void** state) { char* recipient = "someone@chat.com"; char* fingerprint = "AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD EEEEEEEE"; @@ -373,25 +373,25 @@ test_cmd_otr_start_from_wintype(win_type_t wintype) } void -cmd_otr_start_shows_message_when_in_console(void** state) +cmd_otr_start__shows__message_when_in_console(void** state) { test_cmd_otr_start_from_wintype(WIN_CONSOLE); } void -cmd_otr_start_shows_message_when_in_muc(void** state) +cmd_otr_start__shows__message_when_in_muc(void** state) { test_cmd_otr_start_from_wintype(WIN_MUC); } void -cmd_otr_start_shows_message_when_in_private(void** state) +cmd_otr_start__shows__message_when_in_private(void** state) { test_cmd_otr_start_from_wintype(WIN_PRIVATE); } void -cmd_otr_start_shows_message_when_already_started(void** state) +cmd_otr_start__shows__message_when_already_started(void** state) { char* recipient = "someone@server.org"; gchar* args[] = { "start", NULL }; @@ -417,7 +417,7 @@ cmd_otr_start_shows_message_when_already_started(void** state) } void -cmd_otr_start_shows_message_when_no_key(void** state) +cmd_otr_start__shows__message_when_no_key(void** state) { char* recipient = "someone@server.org"; gchar* args[] = { "start", NULL }; @@ -444,7 +444,7 @@ cmd_otr_start_shows_message_when_no_key(void** state) } void -cmd_otr_start_sends_otr_query_message_to_current_recipeint(void** state) +cmd_otr_start__tests__sends_otr_query_message_to_current_recipeint(void** state) { char* recipient = "buddy@chat.com"; char* query_message = "?OTR?"; @@ -475,7 +475,7 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void** state) #else void -cmd_otr_shows_message_when_otr_unsupported(void** state) +cmd_otr__shows__message_when_otr_unsupported(void** state) { gchar* args[] = { "gen", NULL }; diff --git a/tests/unittests/command/test_cmd_otr.h b/tests/unittests/command/test_cmd_otr.h index a9ffb1e1..7543e4e4 100644 --- a/tests/unittests/command/test_cmd_otr.h +++ b/tests/unittests/command/test_cmd_otr.h @@ -1,37 +1,42 @@ +#ifndef TESTS_TEST_CMD_OTR_H +#define TESTS_TEST_CMD_OTR_H + #include "config.h" #ifdef HAVE_LIBOTR -void cmd_otr_log_shows_usage_when_no_args(void** state); -void cmd_otr_log_shows_usage_when_invalid_subcommand(void** state); -void cmd_otr_log_on_enables_logging(void** state); -void cmd_otr_log_off_disables_logging(void** state); -void cmd_otr_redact_redacts_logging(void** state); -void cmd_otr_log_on_shows_warning_when_chlog_disabled(void** state); -void cmd_otr_log_redact_shows_warning_when_chlog_disabled(void** state); -void cmd_otr_libver_shows_libotr_version(void** state); -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_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_connecting(void** state); -void cmd_otr_myfp_shows_message_when_disconnecting(void** state); -void cmd_otr_myfp_shows_message_when_no_key(void** state); -void cmd_otr_myfp_shows_my_fingerprint(void** state); -void cmd_otr_theirfp_shows_message_when_in_console(void** state); -void cmd_otr_theirfp_shows_message_when_in_muc(void** state); -void cmd_otr_theirfp_shows_message_when_in_private(void** state); -void cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void** state); -void cmd_otr_theirfp_shows_fingerprint(void** state); -void cmd_otr_start_shows_message_when_in_console(void** state); -void cmd_otr_start_shows_message_when_in_muc(void** state); -void cmd_otr_start_shows_message_when_in_private(void** state); -void cmd_otr_start_shows_message_when_already_started(void** state); -void cmd_otr_start_shows_message_when_no_key(void** state); -void cmd_otr_start_sends_otr_query_message_to_current_recipeint(void** state); +void cmd_otr_log__shows__usage_when_no_args(void** state); +void cmd_otr_log__shows__usage_when_invalid_subcommand(void** state); +void cmd_otr_log__updates__enables_logging(void** state); +void cmd_otr_log__updates__disables_logging(void** state); +void cmd_otr_log__updates__redacts_logging(void** state); +void cmd_otr_log__shows__warning_when_chlog_disabled(void** state); +void cmd_otr_log__shows__redact_warning_when_chlog_disabled(void** state); +void cmd_otr_libver__shows__libotr_version(void** state); +void cmd_otr_gen__shows__message_when_not_connected(void** state); +void cmd_otr_gen__tests__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_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_connecting(void** state); +void cmd_otr_myfp__shows__message_when_disconnecting(void** state); +void cmd_otr_myfp__shows__message_when_no_key(void** state); +void cmd_otr_myfp__shows__my_fingerprint(void** state); +void cmd_otr_theirfp__shows__message_when_in_console(void** state); +void cmd_otr_theirfp__shows__message_when_in_muc(void** state); +void cmd_otr_theirfp__shows__message_when_in_private(void** state); +void cmd_otr_theirfp__shows__message_when_non_otr_chat_window(void** state); +void cmd_otr_theirfp__shows__fingerprint(void** state); +void cmd_otr_start__shows__message_when_in_console(void** state); +void cmd_otr_start__shows__message_when_in_muc(void** state); +void cmd_otr_start__shows__message_when_in_private(void** state); +void cmd_otr_start__shows__message_when_already_started(void** state); +void cmd_otr_start__shows__message_when_no_key(void** state); +void cmd_otr_start__tests__sends_otr_query_message_to_current_recipeint(void** state); #else -void cmd_otr_shows_message_when_otr_unsupported(void** state); +void cmd_otr__shows__message_when_otr_unsupported(void** state); +#endif + #endif diff --git a/tests/unittests/command/test_cmd_pgp.c b/tests/unittests/command/test_cmd_pgp.c index 71253c49..377952be 100644 --- a/tests/unittests/command/test_cmd_pgp.c +++ b/tests/unittests/command/test_cmd_pgp.c @@ -14,7 +14,7 @@ #ifdef HAVE_LIBGPGME void -cmd_pgp_shows_usage_when_no_args(void** state) +cmd_pgp__shows__usage_when_no_args(void** state) { gchar* args[] = { NULL }; @@ -25,7 +25,7 @@ cmd_pgp_shows_usage_when_no_args(void** state) } void -cmd_pgp_start_shows_message_when_connection(jabber_conn_status_t conn_status) +cmd_pgp_start__shows__message_when_connection(jabber_conn_status_t conn_status) { gchar* args[] = { "start", NULL }; ProfWin window; @@ -40,25 +40,25 @@ cmd_pgp_start_shows_message_when_connection(jabber_conn_status_t conn_status) } void -cmd_pgp_start_shows_message_when_disconnected(void** state) +cmd_pgp_start__shows__message_when_disconnected(void** state) { - cmd_pgp_start_shows_message_when_connection(JABBER_DISCONNECTED); + cmd_pgp_start__shows__message_when_connection(JABBER_DISCONNECTED); } void -cmd_pgp_start_shows_message_when_disconnecting(void** state) +cmd_pgp_start__shows__message_when_disconnecting(void** state) { - cmd_pgp_start_shows_message_when_connection(JABBER_DISCONNECTING); + cmd_pgp_start__shows__message_when_connection(JABBER_DISCONNECTING); } void -cmd_pgp_start_shows_message_when_connecting(void** state) +cmd_pgp_start__shows__message_when_connecting(void** state) { - cmd_pgp_start_shows_message_when_connection(JABBER_CONNECTING); + cmd_pgp_start__shows__message_when_connection(JABBER_CONNECTING); } void -cmd_pgp_start_shows_message_when_no_arg_in_wintype(win_type_t wintype) +cmd_pgp_start__shows__message_when_no_arg_in_wintype(win_type_t wintype) { gchar* args[] = { "start", NULL }; ProfWin window; @@ -73,38 +73,38 @@ cmd_pgp_start_shows_message_when_no_arg_in_wintype(win_type_t wintype) } void -cmd_pgp_start_shows_message_when_no_arg_in_console(void** state) +cmd_pgp_start__shows__message_when_no_arg_in_console(void** state) { - cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_CONSOLE); + cmd_pgp_start__shows__message_when_no_arg_in_wintype(WIN_CONSOLE); } void -cmd_pgp_start_shows_message_when_no_arg_in_muc(void** state) +cmd_pgp_start__shows__message_when_no_arg_in_muc(void** state) { - cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_MUC); + cmd_pgp_start__shows__message_when_no_arg_in_wintype(WIN_MUC); } void -cmd_pgp_start_shows_message_when_no_arg_in_conf(void** state) +cmd_pgp_start__shows__message_when_no_arg_in_conf(void** state) { - cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_CONFIG); + cmd_pgp_start__shows__message_when_no_arg_in_wintype(WIN_CONFIG); } void -cmd_pgp_start_shows_message_when_no_arg_in_private(void** state) +cmd_pgp_start__shows__message_when_no_arg_in_private(void** state) { - cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_PRIVATE); + cmd_pgp_start__shows__message_when_no_arg_in_wintype(WIN_PRIVATE); } void -cmd_pgp_start_shows_message_when_no_arg_in_xmlconsole(void** state) +cmd_pgp_start__shows__message_when_no_arg_in_xmlconsole(void** state) { - cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_XML); + cmd_pgp_start__shows__message_when_no_arg_in_wintype(WIN_XML); } #else void -cmd_pgp_shows_message_when_pgp_unsupported(void** state) +cmd_pgp__shows__message_when_pgp_unsupported(void** state) { gchar* args[] = { "gen", NULL }; diff --git a/tests/unittests/command/test_cmd_pgp.h b/tests/unittests/command/test_cmd_pgp.h index 60110beb..f8e829f4 100644 --- a/tests/unittests/command/test_cmd_pgp.h +++ b/tests/unittests/command/test_cmd_pgp.h @@ -1,16 +1,21 @@ +#ifndef TESTS_TEST_CMD_PGP_H +#define TESTS_TEST_CMD_PGP_H + #include "config.h" #ifdef HAVE_LIBGPGME -void cmd_pgp_shows_usage_when_no_args(void** state); -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_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_conf(void** state); -void cmd_pgp_start_shows_message_when_no_arg_in_private(void** state); -void cmd_pgp_start_shows_message_when_no_arg_in_xmlconsole(void** state); +void cmd_pgp__shows__usage_when_no_args(void** state); +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_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_conf(void** state); +void cmd_pgp_start__shows__message_when_no_arg_in_private(void** state); +void cmd_pgp_start__shows__message_when_no_arg_in_xmlconsole(void** state); #else -void cmd_pgp_shows_message_when_pgp_unsupported(void** state); +void cmd_pgp__shows__message_when_pgp_unsupported(void** state); +#endif + #endif diff --git a/tests/unittests/command/test_cmd_presence.c b/tests/unittests/command/test_cmd_presence.c index 8d386097..8224bd21 100644 --- a/tests/unittests/command/test_cmd_presence.c +++ b/tests/unittests/command/test_cmd_presence.c @@ -13,7 +13,7 @@ #define CMD_PRESENCE "/presence" void -cmd_presence_shows_usage_when_bad_subcmd(void** state) +cmd_presence__shows__usage_when_bad_subcmd(void** state) { gchar* args[] = { "badcmd", NULL }; @@ -24,7 +24,7 @@ cmd_presence_shows_usage_when_bad_subcmd(void** state) } void -cmd_presence_shows_usage_when_bad_console_setting(void** state) +cmd_presence__shows__usage_when_bad_console_setting(void** state) { gchar* args[] = { "console", "badsetting", NULL }; @@ -35,7 +35,7 @@ cmd_presence_shows_usage_when_bad_console_setting(void** state) } void -cmd_presence_shows_usage_when_bad_chat_setting(void** state) +cmd_presence__shows__usage_when_bad_chat_setting(void** state) { gchar* args[] = { "chat", "badsetting", NULL }; @@ -46,7 +46,7 @@ cmd_presence_shows_usage_when_bad_chat_setting(void** state) } void -cmd_presence_shows_usage_when_bad_muc_setting(void** state) +cmd_presence__shows__usage_when_bad_muc_setting(void** state) { gchar* args[] = { "muc", "badsetting", NULL }; @@ -57,7 +57,7 @@ cmd_presence_shows_usage_when_bad_muc_setting(void** state) } void -cmd_presence_console_sets_all(void** state) +cmd_presence__updates__console_all(void** state) { gchar* args[] = { "console", "all", NULL }; @@ -72,7 +72,7 @@ cmd_presence_console_sets_all(void** state) } void -cmd_presence_console_sets_online(void** state) +cmd_presence__updates__console_online(void** state) { gchar* args[] = { "console", "online", NULL }; @@ -87,7 +87,7 @@ cmd_presence_console_sets_online(void** state) } void -cmd_presence_console_sets_none(void** state) +cmd_presence__updates__console_none(void** state) { gchar* args[] = { "console", "none", NULL }; @@ -102,7 +102,7 @@ cmd_presence_console_sets_none(void** state) } void -cmd_presence_chat_sets_all(void** state) +cmd_presence__updates__chat_all(void** state) { gchar* args[] = { "chat", "all", NULL }; @@ -117,7 +117,7 @@ cmd_presence_chat_sets_all(void** state) } void -cmd_presence_chat_sets_online(void** state) +cmd_presence__updates__chat_online(void** state) { gchar* args[] = { "chat", "online", NULL }; @@ -132,7 +132,7 @@ cmd_presence_chat_sets_online(void** state) } void -cmd_presence_chat_sets_none(void** state) +cmd_presence__updates__chat_none(void** state) { gchar* args[] = { "chat", "none", NULL }; @@ -147,7 +147,7 @@ cmd_presence_chat_sets_none(void** state) } void -cmd_presence_room_sets_all(void** state) +cmd_presence__updates__room_all(void** state) { gchar* args[] = { "room", "all", NULL }; @@ -162,7 +162,7 @@ cmd_presence_room_sets_all(void** state) } void -cmd_presence_room_sets_online(void** state) +cmd_presence__updates__room_online(void** state) { gchar* args[] = { "room", "online", NULL }; @@ -177,7 +177,7 @@ cmd_presence_room_sets_online(void** state) } void -cmd_presence_room_sets_none(void** state) +cmd_presence__updates__room_none(void** state) { gchar* args[] = { "room", "none", NULL }; diff --git a/tests/unittests/command/test_cmd_presence.h b/tests/unittests/command/test_cmd_presence.h index 96668db2..569a254a 100644 --- a/tests/unittests/command/test_cmd_presence.h +++ b/tests/unittests/command/test_cmd_presence.h @@ -1,13 +1,18 @@ -void cmd_presence_shows_usage_when_bad_subcmd(void** state); -void cmd_presence_shows_usage_when_bad_console_setting(void** state); -void cmd_presence_shows_usage_when_bad_chat_setting(void** state); -void cmd_presence_shows_usage_when_bad_muc_setting(void** state); -void cmd_presence_console_sets_all(void** state); -void cmd_presence_console_sets_online(void** state); -void cmd_presence_console_sets_none(void** state); -void cmd_presence_chat_sets_all(void** state); -void cmd_presence_chat_sets_online(void** state); -void cmd_presence_chat_sets_none(void** state); -void cmd_presence_room_sets_all(void** state); -void cmd_presence_room_sets_online(void** state); -void cmd_presence_room_sets_none(void** state); +#ifndef TESTS_TEST_CMD_PRESENCE_H +#define TESTS_TEST_CMD_PRESENCE_H + +void cmd_presence__shows__usage_when_bad_subcmd(void** state); +void cmd_presence__shows__usage_when_bad_console_setting(void** state); +void cmd_presence__shows__usage_when_bad_chat_setting(void** state); +void cmd_presence__shows__usage_when_bad_muc_setting(void** state); +void cmd_presence__updates__console_all(void** state); +void cmd_presence__updates__console_online(void** state); +void cmd_presence__updates__console_none(void** state); +void cmd_presence__updates__chat_all(void** state); +void cmd_presence__updates__chat_online(void** state); +void cmd_presence__updates__chat_none(void** state); +void cmd_presence__updates__room_all(void** state); +void cmd_presence__updates__room_online(void** state); +void cmd_presence__updates__room_none(void** state); + +#endif diff --git a/tests/unittests/command/test_cmd_rooms.c b/tests/unittests/command/test_cmd_rooms.c index ef2e6b48..cffec0ba 100644 --- a/tests/unittests/command/test_cmd_rooms.c +++ b/tests/unittests/command/test_cmd_rooms.c @@ -25,25 +25,25 @@ test_with_connection_status(jabber_conn_status_t status) } void -cmd_rooms_shows_message_when_disconnected(void** state) +cmd_rooms__shows__message_when_disconnected(void** state) { test_with_connection_status(JABBER_DISCONNECTED); } void -cmd_rooms_shows_message_when_disconnecting(void** state) +cmd_rooms__shows__message_when_disconnecting(void** state) { test_with_connection_status(JABBER_DISCONNECTING); } void -cmd_rooms_shows_message_when_connecting(void** state) +cmd_rooms__shows__message_when_connecting(void** state) { test_with_connection_status(JABBER_CONNECTING); } void -cmd_rooms_uses_account_default_when_no_arg(void** state) +cmd_rooms__tests__account_default_when_no_arg(void** state) { gchar* args[] = { NULL }; @@ -66,7 +66,7 @@ cmd_rooms_uses_account_default_when_no_arg(void** state) } void -cmd_rooms_service_arg_used_when_passed(void** state) +cmd_rooms__tests__service_arg_used_when_passed(void** state) { gchar* args[] = { "service", "conf_server_arg", NULL }; @@ -83,7 +83,7 @@ cmd_rooms_service_arg_used_when_passed(void** state) } void -cmd_rooms_filter_arg_used_when_passed(void** state) +cmd_rooms__tests__filter_arg_used_when_passed(void** state) { gchar* args[] = { "filter", "text", NULL }; diff --git a/tests/unittests/command/test_cmd_rooms.h b/tests/unittests/command/test_cmd_rooms.h index d1107d78..918a7f86 100644 --- a/tests/unittests/command/test_cmd_rooms.h +++ b/tests/unittests/command/test_cmd_rooms.h @@ -1,7 +1,12 @@ -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_undefined(void** state); -void cmd_rooms_uses_account_default_when_no_arg(void** state); -void cmd_rooms_service_arg_used_when_passed(void** state); -void cmd_rooms_filter_arg_used_when_passed(void** state); +#ifndef TESTS_TEST_CMD_ROOMS_H +#define TESTS_TEST_CMD_ROOMS_H + +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_undefined(void** state); +void cmd_rooms__tests__account_default_when_no_arg(void** state); +void cmd_rooms__tests__service_arg_used_when_passed(void** state); +void cmd_rooms__tests__filter_arg_used_when_passed(void** state); + +#endif diff --git a/tests/unittests/command/test_cmd_roster.c b/tests/unittests/command/test_cmd_roster.c index 74ba7a98..99c64d9c 100644 --- a/tests/unittests/command/test_cmd_roster.c +++ b/tests/unittests/command/test_cmd_roster.c @@ -26,25 +26,25 @@ test_with_connection_status(jabber_conn_status_t status) } void -cmd_roster_shows_message_when_disconnecting(void** state) +cmd_roster__shows__message_when_disconnecting(void** state) { test_with_connection_status(JABBER_DISCONNECTING); } void -cmd_roster_shows_message_when_connecting(void** state) +cmd_roster__shows__message_when_connecting(void** state) { test_with_connection_status(JABBER_CONNECTING); } void -cmd_roster_shows_message_when_disconnected(void** state) +cmd_roster__shows__message_when_disconnected(void** state) { test_with_connection_status(JABBER_DISCONNECTED); } void -cmd_roster_shows_roster_when_no_args(void** state) +cmd_roster__shows__roster_when_no_args(void** state) { gchar* args[] = { NULL }; @@ -64,7 +64,7 @@ cmd_roster_shows_roster_when_no_args(void** state) } void -cmd_roster_add_shows_message_when_no_jid(void** state) +cmd_roster__shows__message_when_add_no_jid(void** state) { gchar* args[] = { "add", NULL }; @@ -77,7 +77,7 @@ cmd_roster_add_shows_message_when_no_jid(void** state) } void -cmd_roster_add_sends_roster_add_request(void** state) +cmd_roster__tests__add_sends_roster_add_request(void** state) { char* jid = "bob@server.org"; char* nick = "bob"; @@ -93,7 +93,7 @@ cmd_roster_add_sends_roster_add_request(void** state) } void -cmd_roster_remove_shows_message_when_no_jid(void** state) +cmd_roster__shows__message_when_remove_no_jid(void** state) { gchar* args[] = { "remove", NULL }; @@ -106,7 +106,7 @@ cmd_roster_remove_shows_message_when_no_jid(void** state) } void -cmd_roster_remove_sends_roster_remove_request(void** state) +cmd_roster__tests__remove_sends_roster_remove_request(void** state) { char* jid = "bob@server.org"; gchar* args[] = { "remove", jid, NULL }; @@ -124,13 +124,14 @@ cmd_roster_remove_sends_roster_remove_request(void** state) } void -cmd_roster_remove_nickname_sends_roster_remove_request(void** state) +cmd_roster__tests__remove_nickname_sends_roster_remove_request(void** state) { char* jid = "bob@server.org"; - gchar* args[] = { "remove", "bob", NULL }; + char* nick = "bob"; + gchar* args[] = { "remove", nick, NULL }; roster_create(); - roster_add("bob@server.org", "bob", NULL, "both", FALSE); + roster_add(jid, nick, NULL, "both", FALSE); will_return(connection_get_status, JABBER_CONNECTED); @@ -142,7 +143,7 @@ cmd_roster_remove_nickname_sends_roster_remove_request(void** state) } void -cmd_roster_nick_shows_message_when_no_jid(void** state) +cmd_roster__shows__message_when_nick_no_jid(void** state) { gchar* args[] = { "nick", NULL }; @@ -155,7 +156,7 @@ cmd_roster_nick_shows_message_when_no_jid(void** state) } void -cmd_roster_nick_shows_message_when_no_nick(void** state) +cmd_roster__shows__message_when_nick_no_nick(void** state) { gchar* args[] = { "nick", "bob@server.org", NULL }; @@ -168,7 +169,7 @@ cmd_roster_nick_shows_message_when_no_nick(void** state) } void -cmd_roster_nick_shows_message_when_no_contact_exists(void** state) +cmd_roster__shows__message_when_nick_no_contact_exists(void** state) { gchar* args[] = { "nick", "bob@server.org", "bobster", NULL }; @@ -185,7 +186,7 @@ cmd_roster_nick_shows_message_when_no_contact_exists(void** state) } void -cmd_roster_nick_sends_name_change_request(void** state) +cmd_roster__tests__nick_sends_name_change_request(void** state) { char* jid = "bob@server.org"; char* nick = "bobster"; @@ -214,7 +215,7 @@ cmd_roster_nick_sends_name_change_request(void** state) } void -cmd_roster_clearnick_shows_message_when_no_jid(void** state) +cmd_roster__shows__message_when_clearnick_no_jid(void** state) { gchar* args[] = { "clearnick", NULL }; @@ -227,7 +228,7 @@ cmd_roster_clearnick_shows_message_when_no_jid(void** state) } void -cmd_roster_clearnick_shows_message_when_no_contact_exists(void** state) +cmd_roster__shows__message_when_clearnick_no_contact_exists(void** state) { gchar* args[] = { "clearnick", "bob@server.org", NULL }; @@ -244,7 +245,7 @@ cmd_roster_clearnick_shows_message_when_no_contact_exists(void** state) } void -cmd_roster_clearnick_sends_name_change_request_with_empty_nick(void** state) +cmd_roster__tests__clearnick_sends_name_change_request_with_empty_nick(void** state) { char* jid = "bob@server.org"; gchar* args[] = { "clearnick", jid, NULL }; diff --git a/tests/unittests/command/test_cmd_roster.h b/tests/unittests/command/test_cmd_roster.h index bc57f267..06690b42 100644 --- a/tests/unittests/command/test_cmd_roster.h +++ b/tests/unittests/command/test_cmd_roster.h @@ -1,17 +1,21 @@ -void cmd_roster_shows_message_when_disconnecting(void** state); -void cmd_roster_shows_message_when_connecting(void** state); -void cmd_roster_shows_message_when_disconnected(void** state); -void cmd_roster_shows_message_when_undefined(void** state); -void cmd_roster_shows_roster_when_no_args(void** state); -void cmd_roster_add_shows_message_when_no_jid(void** state); -void cmd_roster_add_sends_roster_add_request(void** state); -void cmd_roster_remove_shows_message_when_no_jid(void** state); -void cmd_roster_remove_sends_roster_remove_request(void** state); -void cmd_roster_remove_nickname_sends_roster_remove_request(void** state); -void cmd_roster_nick_shows_message_when_no_jid(void** state); -void cmd_roster_nick_shows_message_when_no_nick(void** state); -void cmd_roster_nick_shows_message_when_no_contact_exists(void** state); -void cmd_roster_nick_sends_name_change_request(void** state); -void cmd_roster_clearnick_shows_message_when_no_jid(void** state); -void cmd_roster_clearnick_shows_message_when_no_contact_exists(void** state); -void cmd_roster_clearnick_sends_name_change_request_with_empty_nick(void** state); +#ifndef TESTS_TEST_CMD_ROSTER_H +#define TESTS_TEST_CMD_ROSTER_H + +void cmd_roster__shows__message_when_disconnecting(void** state); +void cmd_roster__shows__message_when_connecting(void** state); +void cmd_roster__shows__message_when_disconnected(void** state); +void cmd_roster__shows__roster_when_no_args(void** state); +void cmd_roster__shows__message_when_add_no_jid(void** state); +void cmd_roster__tests__add_sends_roster_add_request(void** state); +void cmd_roster__shows__message_when_remove_no_jid(void** state); +void cmd_roster__tests__remove_sends_roster_remove_request(void** state); +void cmd_roster__tests__remove_nickname_sends_roster_remove_request(void** state); +void cmd_roster__shows__message_when_nick_no_jid(void** state); +void cmd_roster__shows__message_when_nick_no_nick(void** state); +void cmd_roster__shows__message_when_nick_no_contact_exists(void** state); +void cmd_roster__tests__nick_sends_name_change_request(void** state); +void cmd_roster__shows__message_when_clearnick_no_jid(void** state); +void cmd_roster__shows__message_when_clearnick_no_contact_exists(void** state); +void cmd_roster__tests__clearnick_sends_name_change_request_with_empty_nick(void** state); + +#endif diff --git a/tests/unittests/command/test_cmd_sub.c b/tests/unittests/command/test_cmd_sub.c index a24e13aa..a9120643 100644 --- a/tests/unittests/command/test_cmd_sub.c +++ b/tests/unittests/command/test_cmd_sub.c @@ -13,7 +13,7 @@ #define CMD_SUB "/sub" void -cmd_sub_shows_message_when_not_connected(void** state) +cmd_sub__shows__message_when_not_connected(void** state) { gchar* args[] = { NULL }; @@ -26,7 +26,7 @@ cmd_sub_shows_message_when_not_connected(void** state) } void -cmd_sub_shows_usage_when_no_arg(void** state) +cmd_sub__shows__usage_when_no_arg(void** state) { gchar* args[] = { NULL }; diff --git a/tests/unittests/command/test_cmd_sub.h b/tests/unittests/command/test_cmd_sub.h index 6cebf649..528c9147 100644 --- a/tests/unittests/command/test_cmd_sub.h +++ b/tests/unittests/command/test_cmd_sub.h @@ -1,2 +1,7 @@ -void cmd_sub_shows_message_when_not_connected(void** state); -void cmd_sub_shows_usage_when_no_arg(void** state); +#ifndef TESTS_TEST_CMD_SUB_H +#define TESTS_TEST_CMD_SUB_H + +void cmd_sub__shows__message_when_not_connected(void** state); +void cmd_sub__shows__usage_when_no_arg(void** state); + +#endif diff --git a/tests/unittests/config/test_preferences.c b/tests/unittests/config/test_preferences.c index 7c662a34..446b4666 100644 --- a/tests/unittests/config/test_preferences.c +++ b/tests/unittests/config/test_preferences.c @@ -6,7 +6,7 @@ #include "config/preferences.h" void -statuses_console_defaults_to_all(void** state) +prefs_get_string__returns__all_for_console_default(void** state) { gchar* setting = prefs_get_string(PREF_STATUSES_CONSOLE); @@ -16,7 +16,7 @@ statuses_console_defaults_to_all(void** state) } void -statuses_chat_defaults_to_all(void** state) +prefs_get_string__returns__none_for_chat_default(void** state) { gchar* setting = prefs_get_string(PREF_STATUSES_CHAT); @@ -26,7 +26,7 @@ statuses_chat_defaults_to_all(void** state) } void -statuses_muc_defaults_to_all(void** state) +prefs_get_string__returns__none_for_muc_default(void** state) { gchar* setting = prefs_get_string(PREF_STATUSES_MUC); diff --git a/tests/unittests/config/test_preferences.h b/tests/unittests/config/test_preferences.h index 84438e95..7a8fa69a 100644 --- a/tests/unittests/config/test_preferences.h +++ b/tests/unittests/config/test_preferences.h @@ -1,3 +1,8 @@ -void statuses_console_defaults_to_all(void** state); -void statuses_chat_defaults_to_all(void** state); -void statuses_muc_defaults_to_all(void** state); +#ifndef TESTS_TEST_PREFERENCES_H +#define TESTS_TEST_PREFERENCES_H + +void prefs_get_string__returns__all_for_console_default(void** state); +void prefs_get_string__returns__none_for_chat_default(void** state); +void prefs_get_string__returns__none_for_muc_default(void** state); + +#endif diff --git a/tests/unittests/event/test_server_events.c b/tests/unittests/event/test_server_events.c index 37d46620..29fabf88 100644 --- a/tests/unittests/event/test_server_events.c +++ b/tests/unittests/event/test_server_events.c @@ -15,7 +15,7 @@ #include "ui/window_list.h" void -console_shows_online_presence_when_set_online(void** state) +sv_ev_contact_online__shows__presence_in_console_when_set_online(void** state) { prefs_set_string(PREF_STATUSES_CONSOLE, "online"); plugins_init(); @@ -35,7 +35,7 @@ console_shows_online_presence_when_set_online(void** state) } void -console_shows_online_presence_when_set_all(void** state) +sv_ev_contact_online__shows__presence_in_console_when_set_all(void** state) { prefs_set_string(PREF_STATUSES_CONSOLE, "all"); plugins_init(); @@ -55,7 +55,7 @@ console_shows_online_presence_when_set_all(void** state) } void -console_shows_dnd_presence_when_set_all(void** state) +sv_ev_contact_online__shows__dnd_presence_in_console_when_set_all(void** state) { prefs_set_string(PREF_STATUSES_CONSOLE, "all"); plugins_init(); @@ -75,7 +75,7 @@ console_shows_dnd_presence_when_set_all(void** state) } void -handle_offline_removes_chat_session(void** state) +sv_ev_contact_offline__updates__removes_chat_session(void** state) { plugins_init(); roster_create(); @@ -100,7 +100,7 @@ handle_offline_removes_chat_session(void** state) } void -lost_connection_clears_chat_sessions(void** state) +sv_ev_lost_connection__updates__clears_chat_sessions(void** state) { roster_create(); roster_process_pending_presence(); diff --git a/tests/unittests/event/test_server_events.h b/tests/unittests/event/test_server_events.h index 1cac6799..6173cb1d 100644 --- a/tests/unittests/event/test_server_events.h +++ b/tests/unittests/event/test_server_events.h @@ -1,14 +1,10 @@ -void console_doesnt_show_online_presence_when_set_none(void** state); -void console_shows_online_presence_when_set_online(void** state); -void console_shows_online_presence_when_set_all(void** state); -void console_doesnt_show_dnd_presence_when_set_none(void** state); -void console_doesnt_show_dnd_presence_when_set_online(void** state); -void console_shows_dnd_presence_when_set_all(void** state); -void handle_message_error_when_no_recipient(void** state); -void handle_message_error_when_recipient_cancel(void** state); -void handle_message_error_when_recipient_cancel_disables_chat_session(void** state); -void handle_message_error_when_recipient_and_no_type(void** state); -void handle_presence_error_when_no_recipient(void** state); -void handle_presence_error_when_from_recipient(void** state); -void handle_offline_removes_chat_session(void** state); -void lost_connection_clears_chat_sessions(void** state); +#ifndef TESTS_TEST_SERVER_EVENTS_H +#define TESTS_TEST_SERVER_EVENTS_H + +void sv_ev_contact_online__shows__presence_in_console_when_set_online(void** state); +void sv_ev_contact_online__shows__presence_in_console_when_set_all(void** state); +void sv_ev_contact_online__shows__dnd_presence_in_console_when_set_all(void** state); +void sv_ev_contact_offline__updates__removes_chat_session(void** state); +void sv_ev_lost_connection__updates__clears_chat_sessions(void** state); + +#endif diff --git a/tests/unittests/plugins/test_callbacks.c b/tests/unittests/plugins/test_callbacks.c index 005ce82a..c0970c8f 100644 --- a/tests/unittests/plugins/test_callbacks.c +++ b/tests/unittests/plugins/test_callbacks.c @@ -7,7 +7,7 @@ #include "plugins/plugins.h" void -returns_no_commands(void** state) +plugins_get_command_names__returns__no_commands(void** state) { plugins_init(); GList* commands = plugins_get_command_names(); @@ -16,7 +16,7 @@ returns_no_commands(void** state) } void -returns_commands(void** state) +plugins_get_command_names__returns__commands_when_added(void** state) { plugins_init(); PluginCommand* command1 = g_new0(PluginCommand, 1); diff --git a/tests/unittests/plugins/test_callbacks.h b/tests/unittests/plugins/test_callbacks.h index 27130241..d1bd1f8f 100644 --- a/tests/unittests/plugins/test_callbacks.h +++ b/tests/unittests/plugins/test_callbacks.h @@ -1,2 +1,7 @@ -void returns_no_commands(void** state); -void returns_commands(void** state); +#ifndef TESTS_TEST_CALLBACKS_H +#define TESTS_TEST_CALLBACKS_H + +void plugins_get_command_names__returns__no_commands(void** state); +void plugins_get_command_names__returns__commands_when_added(void** state); + +#endif diff --git a/tests/unittests/plugins/test_plugins_disco.c b/tests/unittests/plugins/test_plugins_disco.c index a21ae94c..0d8704b2 100644 --- a/tests/unittests/plugins/test_plugins_disco.c +++ b/tests/unittests/plugins/test_plugins_disco.c @@ -4,7 +4,7 @@ #include "plugins/disco.h" void -returns_empty_list_when_none(void** state) +disco_get_features__returns__empty_list_when_none(void** state) { disco_close(); GList* features = disco_get_features(); @@ -16,7 +16,7 @@ returns_empty_list_when_none(void** state) } void -returns_added_feature(void** state) +disco_add_feature__updates__added_feature(void** state) { disco_close(); disco_add_feature("my_plugin", "some:feature:example"); @@ -31,7 +31,7 @@ returns_added_feature(void** state) } void -resets_features_on_close(void** state) +disco_close__updates__resets_features(void** state) { disco_close(); disco_add_feature("my_plugin", "some:feature:example"); @@ -49,7 +49,7 @@ resets_features_on_close(void** state) } void -returns_all_added_features(void** state) +disco_get_features__returns__all_added_features(void** state) { disco_close(); disco_add_feature("first_plugin", "first:feature"); @@ -72,7 +72,7 @@ returns_all_added_features(void** state) } void -does_not_add_duplicate_feature(void** state) +disco_add_feature__updates__not_duplicate_feature(void** state) { disco_close(); disco_add_feature("my_plugin", "my:feature"); @@ -86,7 +86,7 @@ does_not_add_duplicate_feature(void** state) } void -removes_plugin_features(void** state) +disco_remove_features__updates__removes_plugin_features(void** state) { disco_close(); disco_add_feature("plugin1", "plugin1:feature1"); @@ -107,7 +107,7 @@ removes_plugin_features(void** state) } void -does_not_remove_feature_when_more_than_one_reference(void** state) +disco_remove_features__updates__not_remove_when_more_than_one_reference(void** state) { disco_close(); disco_add_feature("plugin1", "feature1"); diff --git a/tests/unittests/plugins/test_plugins_disco.h b/tests/unittests/plugins/test_plugins_disco.h index 4377e28e..82f2799b 100644 --- a/tests/unittests/plugins/test_plugins_disco.h +++ b/tests/unittests/plugins/test_plugins_disco.h @@ -1,7 +1,12 @@ -void returns_empty_list_when_none(void** state); -void returns_added_feature(void** state); -void resets_features_on_close(void** state); -void returns_all_added_features(void** state); -void does_not_add_duplicate_feature(void** state); -void removes_plugin_features(void** state); -void does_not_remove_feature_when_more_than_one_reference(void** state); +#ifndef TESTS_TEST_PLUGINS_DISCO_H +#define TESTS_TEST_PLUGINS_DISCO_H + +void disco_get_features__returns__empty_list_when_none(void** state); +void disco_add_feature__updates__added_feature(void** state); +void disco_close__updates__resets_features(void** state); +void disco_get_features__returns__all_added_features(void** state); +void disco_add_feature__updates__not_duplicate_feature(void** state); +void disco_remove_features__updates__removes_plugin_features(void** state); +void disco_remove_features__updates__not_remove_when_more_than_one_reference(void** state); + +#endif diff --git a/tests/unittests/test_common.c b/tests/unittests/test_common.c index aed343c2..7fa4813a 100644 --- a/tests/unittests/test_common.c +++ b/tests/unittests/test_common.c @@ -5,7 +5,7 @@ #include "tests/unittests/ui/stub_ui.h" // Include for mocking cons_show void -replace_one_substr(void** state) +str_replace__returns__one_substr(void** state) { char* string = "it is a string"; char* sub = "is"; @@ -19,7 +19,7 @@ replace_one_substr(void** state) } void -replace_one_substr_beginning(void** state) +str_replace__returns__one_substr_beginning(void** state) { char* string = "it is a string"; char* sub = "it"; @@ -33,7 +33,7 @@ replace_one_substr_beginning(void** state) } void -replace_one_substr_end(void** state) +str_replace__returns__one_substr_end(void** state) { char* string = "it is a string"; char* sub = "string"; @@ -47,7 +47,7 @@ replace_one_substr_end(void** state) } void -replace_two_substr(void** state) +str_replace__returns__two_substr(void** state) { char* string = "it is a is string"; char* sub = "is"; @@ -61,7 +61,7 @@ replace_two_substr(void** state) } void -replace_char(void** state) +str_replace__returns__char(void** state) { char* string = "some & a thing & something else"; char* sub = "&"; @@ -75,7 +75,7 @@ replace_char(void** state) } void -replace_when_none(void** state) +str_replace__returns__original_when_none(void** state) { char* string = "its another string"; char* sub = "haha"; @@ -89,7 +89,7 @@ replace_when_none(void** state) } void -replace_when_match(void** state) +str_replace__returns__replaced_when_match(void** state) { char* string = "hello"; char* sub = "hello"; @@ -103,7 +103,7 @@ replace_when_match(void** state) } void -replace_when_string_empty(void** state) +str_replace__returns__empty_when_string_empty(void** state) { char* string = ""; char* sub = "hello"; @@ -117,7 +117,7 @@ replace_when_string_empty(void** state) } void -replace_when_string_null(void** state) +str_replace__returns__null_when_string_null(void** state) { char* string = NULL; char* sub = "hello"; @@ -129,7 +129,7 @@ replace_when_string_null(void** state) } void -replace_when_sub_empty(void** state) +str_replace__returns__original_when_sub_empty(void** state) { char* string = "hello"; char* sub = ""; @@ -143,7 +143,7 @@ replace_when_sub_empty(void** state) } void -replace_when_sub_null(void** state) +str_replace__returns__original_when_sub_null(void** state) { char* string = "hello"; char* sub = NULL; @@ -157,7 +157,7 @@ replace_when_sub_null(void** state) } void -replace_when_new_empty(void** state) +str_replace__returns__empty_when_new_empty(void** state) { char* string = "hello"; char* sub = "hello"; @@ -171,7 +171,7 @@ replace_when_new_empty(void** state) } void -replace_when_new_null(void** state) +str_replace__returns__original_when_new_null(void** state) { char* string = "hello"; char* sub = "hello"; @@ -185,55 +185,55 @@ replace_when_new_null(void** state) } void -test_online_is_valid_resource_presence_string(void** state) +valid_resource_presence_string__is__true_for_online(void** state) { assert_true(valid_resource_presence_string("online")); } void -test_chat_is_valid_resource_presence_string(void** state) +valid_resource_presence_string__is__true_for_chat(void** state) { assert_true(valid_resource_presence_string("chat")); } void -test_away_is_valid_resource_presence_string(void** state) +valid_resource_presence_string__is__true_for_away(void** state) { assert_true(valid_resource_presence_string("away")); } void -test_xa_is_valid_resource_presence_string(void** state) +valid_resource_presence_string__is__true_for_xa(void** state) { assert_true(valid_resource_presence_string("xa")); } void -test_dnd_is_valid_resource_presence_string(void** state) +valid_resource_presence_string__is__true_for_dnd(void** state) { assert_true(valid_resource_presence_string("dnd")); } void -test_available_is_not_valid_resource_presence_string(void** state) +valid_resource_presence_string__is__false_for_available(void** state) { assert_false(valid_resource_presence_string("available")); } void -test_unavailable_is_not_valid_resource_presence_string(void** state) +valid_resource_presence_string__is__false_for_unavailable(void** state) { assert_false(valid_resource_presence_string("unavailable")); } void -test_blah_is_not_valid_resource_presence_string(void** state) +valid_resource_presence_string__is__false_for_blah(void** state) { assert_false(valid_resource_presence_string("blah")); } void -utf8_display_len_null_str(void** state) +utf8_display_len__returns__0_for_null(void** state) { int result = utf8_display_len(NULL); @@ -241,7 +241,7 @@ utf8_display_len_null_str(void** state) } void -utf8_display_len_1_non_wide(void** state) +utf8_display_len__returns__1_for_non_wide(void** state) { int result = utf8_display_len("1"); @@ -249,7 +249,7 @@ utf8_display_len_1_non_wide(void** state) } void -utf8_display_len_1_wide(void** state) +utf8_display_len__returns__2_for_wide(void** state) { int result = utf8_display_len("四"); @@ -257,7 +257,7 @@ utf8_display_len_1_wide(void** state) } void -utf8_display_len_non_wide(void** state) +utf8_display_len__returns__correct_for_non_wide(void** state) { int result = utf8_display_len("123456789abcdef"); @@ -265,7 +265,7 @@ utf8_display_len_non_wide(void** state) } void -utf8_display_len_wide(void** state) +utf8_display_len__returns__correct_for_wide(void** state) { int result = utf8_display_len("12三四56"); @@ -273,7 +273,7 @@ utf8_display_len_wide(void** state) } void -utf8_display_len_all_wide(void** state) +utf8_display_len__returns__correct_for_all_wide(void** state) { int result = utf8_display_len("ひらがな"); @@ -281,7 +281,7 @@ utf8_display_len_all_wide(void** state) } void -strip_quotes_does_nothing_when_no_quoted(void** state) +strip_arg_quotes__returns__original_when_no_quotes(void** state) { char* input = "/cmd test string"; @@ -293,7 +293,7 @@ strip_quotes_does_nothing_when_no_quoted(void** state) } void -strip_quotes_strips_first(void** state) +strip_arg_quotes__returns__stripped_first(void** state) { char* input = "/cmd \"test string"; @@ -305,7 +305,7 @@ strip_quotes_strips_first(void** state) } void -strip_quotes_strips_last(void** state) +strip_arg_quotes__returns__stripped_last(void** state) { char* input = "/cmd test string\""; @@ -317,7 +317,7 @@ strip_quotes_strips_last(void** state) } void -strip_quotes_strips_both(void** state) +strip_arg_quotes__returns__stripped_both(void** state) { char* input = "/cmd \"test string\""; @@ -328,7 +328,7 @@ strip_quotes_strips_both(void** state) free(result); } -void test_valid_tls_policy_option(void** state) { +void valid_tls_policy_option__is__correct_for_various_inputs(void** state) { // Valid inputs assert_true(valid_tls_policy_option("force")); assert_true(valid_tls_policy_option("allow")); @@ -352,7 +352,7 @@ void test_valid_tls_policy_option(void** state) { assert_true(valid_tls_policy_option(NULL)); } -void test_get_expanded_path(void** state) { +void get_expanded_path__returns__expanded(void** state) { gchar* expanded_path; // `file://` prefix @@ -378,7 +378,7 @@ void test_get_expanded_path(void** state) { g_free(expanded_path); } -void test_strtoi_range_valid_input(void** state) { +void strtoi_range__returns__true_for_valid_input(void** state) { int value; gchar* err_msg = NULL; gboolean result; @@ -404,7 +404,7 @@ void test_strtoi_range_valid_input(void** state) { assert_null(err_msg); } -void test_strtoi_range_out_of_range(void** state) { +void strtoi_range__returns__false_for_out_of_range(void** state) { int value; gchar* err_msg = NULL; gboolean result; @@ -431,7 +431,7 @@ void test_strtoi_range_out_of_range(void** state) { err_msg = NULL; } -void test_strtoi_range_invalid_input(void** state) { +void strtoi_range__returns__false_for_invalid_input(void** state) { int value; gchar* err_msg = NULL; gboolean result; @@ -451,7 +451,7 @@ void test_strtoi_range_invalid_input(void** state) { err_msg = NULL; } -void test_strtoi_range_null_empty_input(void** state) { +void strtoi_range__returns__false_for_null_empty_input(void** state) { int value; gchar* err_msg = NULL; gboolean result; @@ -471,7 +471,7 @@ void test_strtoi_range_null_empty_input(void** state) { err_msg = NULL; } -void test_strtoi_range_null_err_msg(void** state) { +void strtoi_range__returns__correct_values_when_err_msg_null(void** state) { int value; gboolean result; @@ -485,7 +485,7 @@ void test_strtoi_range_null_err_msg(void** state) { assert_false(result); } -void test_string_to_verbosity(void** state) { +void string_to_verbosity__returns__correct_values(void** state) { int verbosity; gchar* err_msg = NULL; gboolean result; @@ -556,7 +556,7 @@ typedef struct } format_call_external_argv_t; void -format_call_external_argv_td(void** state) +format_call_external_argv__tests__table_driven(void** state) { enum table { num_tests = 4 }; @@ -613,7 +613,7 @@ typedef struct } unique_filename_from_url_t; void -unique_filename_from_url_td(void** state) +unique_filename_from_url__tests__table_driven(void** state) { enum table { num_tests = 15 }; @@ -751,7 +751,7 @@ _lists_equal(GSList* a, GSList* b) } void -prof_occurrences_of_large_message_tests(void** state) +prof_occurrences__tests__large_message(void** state) { GSList* actual = NULL; GSList* expected = NULL; @@ -773,7 +773,7 @@ prof_occurrences_of_large_message_tests(void** state) } void -prof_partial_occurrences_tests(void** state) +prof_occurrences__tests__partial(void** state) { GSList* actual = NULL; GSList* expected = NULL; @@ -865,7 +865,7 @@ prof_partial_occurrences_tests(void** state) } void -get_mentions_tests(void** state) +get_mentions__tests__various(void** state) { GSList* actual = NULL; GSList* expected = NULL; @@ -937,7 +937,7 @@ get_mentions_tests(void** state) } void -release_is_new_tests(void** state) +release_is_new__tests__various(void** state) { // Higher major version assert_true(release_is_new("0.16.0", "1.0.0")); @@ -973,7 +973,7 @@ release_is_new_tests(void** state) } void -prof_whole_occurrences_tests(void** state) +prof_occurrences__tests__whole(void** state) { GSList* actual = NULL; GSList* expected = NULL; @@ -1175,7 +1175,7 @@ prof_whole_occurrences_tests(void** state) expected = NULL; } -void test_string_matches_one_of_edge_cases(void** state) { +void string_matches_one_of__tests__edge_cases(void** state) { // is is NULL, is_can_be_null is TRUE -> should return TRUE assert_true(string_matches_one_of(NULL, NULL, TRUE, "option1", "option2", NULL)); diff --git a/tests/unittests/test_common.h b/tests/unittests/test_common.h index 6229d54a..0bd72943 100644 --- a/tests/unittests/test_common.h +++ b/tests/unittests/test_common.h @@ -1,47 +1,56 @@ -void replace_one_substr(void** state); -void replace_one_substr_beginning(void** state); -void replace_one_substr_end(void** state); -void replace_two_substr(void** state); -void replace_char(void** state); -void replace_when_none(void** state); -void replace_when_match(void** state); -void replace_when_string_empty(void** state); -void replace_when_string_null(void** state); -void replace_when_sub_empty(void** state); -void replace_when_sub_null(void** state); -void replace_when_new_empty(void** state); -void replace_when_new_null(void** state); -void test_online_is_valid_resource_presence_string(void** state); -void test_chat_is_valid_resource_presence_string(void** state); -void test_away_is_valid_resource_presence_string(void** state); -void test_xa_is_valid_resource_presence_string(void** state); -void test_dnd_is_valid_resource_presence_string(void** state); -void test_available_is_not_valid_resource_presence_string(void** state); -void test_unavailable_is_not_valid_resource_presence_string(void** state); -void test_blah_is_not_valid_resource_presence_string(void** state); -void utf8_display_len_null_str(void** state); -void utf8_display_len_1_non_wide(void** state); -void utf8_display_len_1_wide(void** state); -void utf8_display_len_non_wide(void** state); -void utf8_display_len_wide(void** state); -void utf8_display_len_all_wide(void** state); -void strip_quotes_does_nothing_when_no_quoted(void** state); -void strip_quotes_strips_first(void** state); -void strip_quotes_strips_last(void** state); -void strip_quotes_strips_both(void** state); -void prof_partial_occurrences_tests(void** state); -void prof_whole_occurrences_tests(void** state); -void prof_occurrences_of_large_message_tests(void** state); -void unique_filename_from_url_td(void** state); -void format_call_external_argv_td(void** state); -void test_get_expanded_path(void** state); -void test_string_to_verbosity(void** state); -void test_strtoi_range_valid_input(void** state); -void test_strtoi_range_out_of_range(void** state); -void test_strtoi_range_invalid_input(void** state); -void test_strtoi_range_null_empty_input(void** state); -void test_strtoi_range_null_err_msg(void** state); -void test_string_matches_one_of_edge_cases(void** state); -void test_valid_tls_policy_option(void** state); -void get_mentions_tests(void** state); -void release_is_new_tests(void** state); +#ifndef TESTS_TEST_COMMON_H +#define TESTS_TEST_COMMON_H + +void str_replace__returns__one_substr(void** state); +void str_replace__returns__one_substr_beginning(void** state); +void str_replace__returns__one_substr_end(void** state); +void str_replace__returns__two_substr(void** state); +void str_replace__returns__char(void** state); +void str_replace__returns__original_when_none(void** state); +void str_replace__returns__replaced_when_match(void** state); +void str_replace__returns__empty_when_string_empty(void** state); +void str_replace__returns__null_when_string_null(void** state); +void str_replace__returns__original_when_sub_empty(void** state); +void str_replace__returns__original_when_sub_null(void** state); +void str_replace__returns__empty_when_new_empty(void** state); +void str_replace__returns__original_when_new_null(void** state); + +void valid_resource_presence_string__is__true_for_online(void** state); +void valid_resource_presence_string__is__true_for_chat(void** state); +void valid_resource_presence_string__is__true_for_away(void** state); +void valid_resource_presence_string__is__true_for_xa(void** state); +void valid_resource_presence_string__is__true_for_dnd(void** state); +void valid_resource_presence_string__is__false_for_available(void** state); +void valid_resource_presence_string__is__false_for_unavailable(void** state); +void valid_resource_presence_string__is__false_for_blah(void** state); + +void utf8_display_len__returns__0_for_null(void** state); +void utf8_display_len__returns__1_for_non_wide(void** state); +void utf8_display_len__returns__2_for_wide(void** state); +void utf8_display_len__returns__correct_for_non_wide(void** state); +void utf8_display_len__returns__correct_for_wide(void** state); +void utf8_display_len__returns__correct_for_all_wide(void** state); + +void strip_arg_quotes__returns__original_when_no_quotes(void** state); +void strip_arg_quotes__returns__stripped_first(void** state); +void strip_arg_quotes__returns__stripped_last(void** state); +void strip_arg_quotes__returns__stripped_both(void** state); + +void prof_occurrences__tests__partial(void** state); +void prof_occurrences__tests__whole(void** state); +void prof_occurrences__tests__large_message(void** state); +void unique_filename_from_url__tests__table_driven(void** state); +void format_call_external_argv__tests__table_driven(void** state); +void get_expanded_path__returns__expanded(void** state); +void string_to_verbosity__returns__correct_values(void** state); +void strtoi_range__returns__true_for_valid_input(void** state); +void strtoi_range__returns__false_for_out_of_range(void** state); +void strtoi_range__returns__false_for_invalid_input(void** state); +void strtoi_range__returns__false_for_null_empty_input(void** state); +void strtoi_range__returns__correct_values_when_err_msg_null(void** state); +void string_matches_one_of__tests__edge_cases(void** state); +void valid_tls_policy_option__is__correct_for_various_inputs(void** state); +void get_mentions__tests__various(void** state); +void release_is_new__tests__various(void** state); + +#endif diff --git a/tests/unittests/tools/test_autocomplete.c b/tests/unittests/tools/test_autocomplete.c index 0377fe87..77a6414d 100644 --- a/tests/unittests/tools/test_autocomplete.c +++ b/tests/unittests/tools/test_autocomplete.c @@ -6,7 +6,7 @@ #include "tools/autocomplete.h" void -clear_empty(void** state) +autocomplete_complete__returns__null_when_empty(void** state) { Autocomplete ac = autocomplete_new(); char* result = autocomplete_complete(ac, "test", TRUE, FALSE); @@ -16,7 +16,7 @@ clear_empty(void** state) } void -reset_after_create(void** state) +autocomplete_reset__updates__after_create(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_reset(ac); @@ -24,7 +24,7 @@ reset_after_create(void** state) } void -find_after_create(void** state) +autocomplete_complete__returns__null_after_create(void** state) { Autocomplete ac = autocomplete_new(); char* result = autocomplete_complete(ac, "hello", TRUE, FALSE); @@ -34,7 +34,7 @@ find_after_create(void** state) } void -get_after_create_returns_null(void** state) +autocomplete_create_list__returns__null_after_create(void** state) { Autocomplete ac = autocomplete_new(); GList* result = autocomplete_create_list(ac); @@ -46,7 +46,7 @@ get_after_create_returns_null(void** state) } void -add_one_and_complete(void** state) +autocomplete_add__updates__one_and_complete(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "Hello"); @@ -59,7 +59,7 @@ add_one_and_complete(void** state) } void -add_two_and_complete_returns_first(void** state) +autocomplete_complete__returns__first_of_two(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "Hello"); @@ -73,7 +73,7 @@ add_two_and_complete_returns_first(void** state) } void -add_two_and_complete_returns_second(void** state) +autocomplete_complete__returns__second_of_two(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "Hello"); @@ -89,7 +89,7 @@ add_two_and_complete_returns_second(void** state) } void -add_two_adds_two(void** state) +autocomplete_add__updates__two_elements(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "Hello"); @@ -103,7 +103,7 @@ add_two_adds_two(void** state) } void -add_two_same_adds_one(void** state) +autocomplete_add__updates__only_once_for_same_value(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "Hello"); @@ -117,7 +117,7 @@ add_two_same_adds_one(void** state) } void -add_two_same_updates(void** state) +autocomplete_add__updates__existing_value(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "Hello"); @@ -135,7 +135,7 @@ add_two_same_updates(void** state) } void -complete_accented_with_accented(void** state) +autocomplete_complete__returns__accented_with_accented(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "èâîô"); @@ -149,7 +149,7 @@ complete_accented_with_accented(void** state) } void -complete_accented_with_base(void** state) +autocomplete_complete__returns__accented_with_base(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "èâîô"); @@ -163,7 +163,7 @@ complete_accented_with_base(void** state) } void -complete_both_with_accented(void** state) +autocomplete_complete__returns__both_with_accented(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "eaooooo"); @@ -180,7 +180,7 @@ complete_both_with_accented(void** state) } void -complete_both_with_base(void** state) +autocomplete_complete__returns__both_with_base(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "eaooooo"); @@ -198,7 +198,7 @@ complete_both_with_base(void** state) } void -complete_ignores_case(void** state) +autocomplete_complete__is__case_insensitive(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "MyBuddy"); @@ -212,7 +212,7 @@ complete_ignores_case(void** state) } void -complete_previous(void** state) +autocomplete_complete__returns__previous(void** state) { Autocomplete ac = autocomplete_new(); autocomplete_add(ac, "MyBuddy1"); diff --git a/tests/unittests/tools/test_autocomplete.h b/tests/unittests/tools/test_autocomplete.h index 3fac7038..047123da 100644 --- a/tests/unittests/tools/test_autocomplete.h +++ b/tests/unittests/tools/test_autocomplete.h @@ -1,16 +1,21 @@ -void clear_empty(void** state); -void reset_after_create(void** state); -void find_after_create(void** state); -void get_after_create_returns_null(void** state); -void add_one_and_complete(void** state); -void add_two_and_complete_returns_first(void** state); -void add_two_and_complete_returns_second(void** state); -void add_two_adds_two(void** state); -void add_two_same_adds_one(void** state); -void add_two_same_updates(void** state); -void complete_accented_with_accented(void** state); -void complete_accented_with_base(void** state); -void complete_both_with_accented(void** state); -void complete_both_with_base(void** state); -void complete_ignores_case(void** state); -void complete_previous(void** state); +#ifndef TESTS_TEST_AUTOCOMPLETE_H +#define TESTS_TEST_AUTOCOMPLETE_H + +void autocomplete_complete__returns__null_when_empty(void** state); +void autocomplete_reset__updates__after_create(void** state); +void autocomplete_complete__returns__null_after_create(void** state); +void autocomplete_create_list__returns__null_after_create(void** state); +void autocomplete_add__updates__one_and_complete(void** state); +void autocomplete_complete__returns__first_of_two(void** state); +void autocomplete_complete__returns__second_of_two(void** state); +void autocomplete_add__updates__two_elements(void** state); +void autocomplete_add__updates__only_once_for_same_value(void** state); +void autocomplete_add__updates__existing_value(void** state); +void autocomplete_complete__returns__accented_with_accented(void** state); +void autocomplete_complete__returns__accented_with_base(void** state); +void autocomplete_complete__returns__both_with_accented(void** state); +void autocomplete_complete__returns__both_with_base(void** state); +void autocomplete_complete__is__case_insensitive(void** state); +void autocomplete_complete__returns__previous(void** state); + +#endif diff --git a/tests/unittests/tools/test_parser.c b/tests/unittests/tools/test_parser.c index b72527f4..3a42c169 100644 --- a/tests/unittests/tools/test_parser.c +++ b/tests/unittests/tools/test_parser.c @@ -4,7 +4,7 @@ #include "tools/parser.h" void -parse_null_returns_null(void** state) +parse_args__returns__null_from_null(void** state) { char* inp = NULL; gboolean result = TRUE; @@ -16,7 +16,7 @@ parse_null_returns_null(void** state) } void -parse_empty_returns_null(void** state) +parse_args__returns__null_from_empty(void** state) { char* inp = ""; gboolean result = TRUE; @@ -28,7 +28,7 @@ parse_empty_returns_null(void** state) } void -parse_space_returns_null(void** state) +parse_args__returns__null_from_space(void** state) { char* inp = " "; gboolean result = TRUE; @@ -40,7 +40,7 @@ parse_space_returns_null(void** state) } void -parse_cmd_no_args_returns_null(void** state) +parse_args__returns__null_when_no_args(void** state) { char* inp = "/cmd"; gboolean result = TRUE; @@ -52,7 +52,7 @@ parse_cmd_no_args_returns_null(void** state) } void -parse_cmd_with_space_returns_null(void** state) +parse_args__returns__null_from_cmd_with_space(void** state) { char* inp = "/cmd "; gboolean result = TRUE; @@ -64,7 +64,7 @@ parse_cmd_with_space_returns_null(void** state) } void -parse_cmd_with_too_few_returns_null(void** state) +parse_args__returns__null_when_too_few(void** state) { char* inp = "/cmd arg1"; gboolean result = TRUE; @@ -76,7 +76,7 @@ parse_cmd_with_too_few_returns_null(void** state) } void -parse_cmd_with_too_many_returns_null(void** state) +parse_args__returns__null_when_too_many(void** state) { char* inp = "/cmd arg1 arg2 arg3 arg4"; gboolean result = TRUE; @@ -88,7 +88,7 @@ parse_cmd_with_too_many_returns_null(void** state) } void -parse_cmd_one_arg(void** state) +parse_args__returns__one_arg(void** state) { char* inp = "/cmd arg1"; gboolean result = FALSE; @@ -101,7 +101,7 @@ parse_cmd_one_arg(void** state) } void -parse_cmd_two_args(void** state) +parse_args__returns__two_args(void** state) { char* inp = "/cmd arg1 arg2"; gboolean result = FALSE; @@ -115,7 +115,7 @@ parse_cmd_two_args(void** state) } void -parse_cmd_three_args(void** state) +parse_args__returns__three_args(void** state) { char* inp = "/cmd arg1 arg2 arg3"; gboolean result = FALSE; @@ -130,7 +130,7 @@ parse_cmd_three_args(void** state) } void -parse_cmd_three_args_with_spaces(void** state) +parse_args__returns__three_args_with_spaces(void** state) { char* inp = " /cmd arg1 arg2 arg3 "; gboolean result = FALSE; @@ -145,7 +145,7 @@ parse_cmd_three_args_with_spaces(void** state) } void -parse_cmd_with_freetext(void** state) +parse_args_with_freetext__returns__freetext(void** state) { char* inp = "/cmd this is some free text"; gboolean result = FALSE; @@ -158,7 +158,7 @@ parse_cmd_with_freetext(void** state) } void -parse_cmd_one_arg_with_freetext(void** state) +parse_args_with_freetext__returns__one_arg_with_freetext(void** state) { char* inp = "/cmd arg1 this is some free text"; gboolean result = FALSE; @@ -172,7 +172,7 @@ parse_cmd_one_arg_with_freetext(void** state) } void -parse_cmd_two_args_with_freetext(void** state) +parse_args_with_freetext__returns__two_args_with_freetext(void** state) { char* inp = "/cmd arg1 arg2 this is some free text"; gboolean result = FALSE; @@ -187,7 +187,7 @@ parse_cmd_two_args_with_freetext(void** state) } void -parse_cmd_min_zero(void** state) +parse_args__returns__zero_args_when_min_zero(void** state) { char* inp = "/cmd"; gboolean result = FALSE; @@ -200,7 +200,7 @@ parse_cmd_min_zero(void** state) } void -parse_cmd_min_zero_with_freetext(void** state) +parse_args_with_freetext__returns__zero_args_when_min_zero(void** state) { char* inp = "/cmd"; gboolean result = FALSE; @@ -213,7 +213,7 @@ parse_cmd_min_zero_with_freetext(void** state) } void -parse_cmd_with_quoted(void** state) +parse_args__returns__quoted_args(void** state) { char* inp = "/cmd \"arg1\" arg2"; gboolean result = FALSE; @@ -227,7 +227,7 @@ parse_cmd_with_quoted(void** state) } void -parse_cmd_with_quoted_and_space(void** state) +parse_args__returns__quoted_args_with_space(void** state) { char* inp = "/cmd \"the arg1\" arg2"; gboolean result = FALSE; @@ -241,7 +241,7 @@ parse_cmd_with_quoted_and_space(void** state) } void -parse_cmd_with_quoted_and_many_spaces(void** state) +parse_args__returns__quoted_args_with_many_spaces(void** state) { char* inp = "/cmd \"the arg1 is here\" arg2"; gboolean result = FALSE; @@ -255,7 +255,7 @@ parse_cmd_with_quoted_and_many_spaces(void** state) } void -parse_cmd_with_many_quoted_and_many_spaces(void** state) +parse_args__returns__many_quoted_args_with_many_spaces(void** state) { char* inp = "/cmd \"the arg1 is here\" \"and arg2 is right here\""; gboolean result = FALSE; @@ -269,7 +269,7 @@ parse_cmd_with_many_quoted_and_many_spaces(void** state) } void -parse_cmd_freetext_with_quoted(void** state) +parse_args_with_freetext__returns__quoted_args(void** state) { char* inp = "/cmd \"arg1\" arg2 hello there what's up"; gboolean result = FALSE; @@ -284,7 +284,7 @@ parse_cmd_freetext_with_quoted(void** state) } void -parse_cmd_freetext_with_quoted_and_space(void** state) +parse_args_with_freetext__returns__quoted_args_with_space(void** state) { char* inp = "/cmd \"the arg1\" arg2 another bit of freetext"; gboolean result = FALSE; @@ -299,7 +299,7 @@ parse_cmd_freetext_with_quoted_and_space(void** state) } void -parse_cmd_freetext_with_quoted_and_many_spaces(void** state) +parse_args_with_freetext__returns__quoted_args_with_many_spaces(void** state) { char* inp = "/cmd \"the arg1 is here\" arg2 some more freetext"; gboolean result = FALSE; @@ -314,7 +314,7 @@ parse_cmd_freetext_with_quoted_and_many_spaces(void** state) } void -parse_cmd_freetext_with_many_quoted_and_many_spaces(void** state) +parse_args_with_freetext__returns__many_quoted_args_with_many_spaces(void** state) { char* inp = "/cmd \"the arg1 is here\" \"and arg2 is right here\" and heres the free text"; gboolean result = FALSE; @@ -329,7 +329,7 @@ parse_cmd_freetext_with_many_quoted_and_many_spaces(void** state) } void -parse_cmd_with_quoted_freetext(void** state) +parse_args_with_freetext__returns__quoted_freetext(void** state) { char* inp = "/cmd arg1 here is \"some\" quoted freetext"; gboolean result = FALSE; @@ -343,7 +343,7 @@ parse_cmd_with_quoted_freetext(void** state) } void -parse_cmd_with_third_arg_quoted_0_min_3_max(void** state) +parse_args_with_freetext__returns__third_arg_quoted(void** state) { char* inp = "/group add friends \"The User\""; gboolean result = FALSE; @@ -359,7 +359,7 @@ parse_cmd_with_third_arg_quoted_0_min_3_max(void** state) } void -parse_cmd_with_second_arg_quoted_0_min_3_max(void** state) +parse_args_with_freetext__returns__second_arg_quoted(void** state) { char* inp = "/group add \"The Group\" friend"; gboolean result = FALSE; @@ -375,7 +375,7 @@ parse_cmd_with_second_arg_quoted_0_min_3_max(void** state) } void -parse_cmd_with_second_and_third_arg_quoted_0_min_3_max(void** state) +parse_args_with_freetext__returns__second_and_third_arg_quoted(void** state) { char* inp = "/group add \"The Group\" \"The User\""; gboolean result = FALSE; @@ -391,7 +391,7 @@ parse_cmd_with_second_and_third_arg_quoted_0_min_3_max(void** state) } void -count_one_token(void** state) +count_tokens__returns__one_token(void** state) { char* inp = "one"; int result = count_tokens(inp); @@ -400,7 +400,7 @@ count_one_token(void** state) } void -count_one_token_quoted_no_whitespace(void** state) +count_tokens__returns__one_token_quoted_no_whitespace(void** state) { char* inp = "\"one\""; int result = count_tokens(inp); @@ -409,7 +409,7 @@ count_one_token_quoted_no_whitespace(void** state) } void -count_one_token_quoted_with_whitespace(void** state) +count_tokens__returns__one_token_quoted_with_whitespace(void** state) { char* inp = "\"one two\""; int result = count_tokens(inp); @@ -418,7 +418,7 @@ count_one_token_quoted_with_whitespace(void** state) } void -count_two_tokens(void** state) +count_tokens__returns__two_tokens(void** state) { char* inp = "one two"; int result = count_tokens(inp); @@ -427,7 +427,7 @@ count_two_tokens(void** state) } void -count_two_tokens_first_quoted(void** state) +count_tokens__returns__two_tokens_first_quoted(void** state) { char* inp = "\"one and\" two"; int result = count_tokens(inp); @@ -436,7 +436,7 @@ count_two_tokens_first_quoted(void** state) } void -count_two_tokens_second_quoted(void** state) +count_tokens__returns__two_tokens_second_quoted(void** state) { char* inp = "one \"two and\""; int result = count_tokens(inp); @@ -445,7 +445,7 @@ count_two_tokens_second_quoted(void** state) } void -count_two_tokens_both_quoted(void** state) +count_tokens__returns__two_tokens_both_quoted(void** state) { char* inp = "\"one and then\" \"two and\""; int result = count_tokens(inp); @@ -454,7 +454,7 @@ count_two_tokens_both_quoted(void** state) } void -get_first_of_one(void** state) +get_start__returns__first_of_one(void** state) { char* inp = "one"; char* result = get_start(inp, 2); @@ -464,7 +464,7 @@ get_first_of_one(void** state) } void -get_first_of_two(void** state) +get_start__returns__first_of_two(void** state) { char* inp = "one two"; char* result = get_start(inp, 2); @@ -474,7 +474,7 @@ get_first_of_two(void** state) } void -get_first_two_of_three(void** state) +get_start__returns__first_two_of_three(void** state) { char* inp = "one two three"; char* result = get_start(inp, 3); @@ -484,7 +484,7 @@ get_first_two_of_three(void** state) } void -get_first_two_of_three_first_quoted(void** state) +get_start__returns__first_two_of_three_first_quoted(void** state) { char* inp = "\"one\" two three"; char* result = get_start(inp, 3); @@ -494,7 +494,7 @@ get_first_two_of_three_first_quoted(void** state) } void -get_first_two_of_three_second_quoted(void** state) +get_start__returns__first_two_of_three_second_quoted(void** state) { char* inp = "one \"two\" three"; char* result = get_start(inp, 3); @@ -504,7 +504,7 @@ get_first_two_of_three_second_quoted(void** state) } void -get_first_two_of_three_first_and_second_quoted(void** state) +get_start__returns__first_two_of_three_first_and_second_quoted(void** state) { char* inp = "\"one\" \"two\" three"; char* result = get_start(inp, 3); @@ -514,7 +514,7 @@ get_first_two_of_three_first_and_second_quoted(void** state) } void -parse_options_when_none_returns_empty_hasmap(void** state) +parse_options__returns__empty_hashmap_when_none(void** state) { gchar* args[] = { "cmd1", "cmd2", NULL }; gchar* keys[] = { "opt1", NULL }; @@ -531,7 +531,7 @@ parse_options_when_none_returns_empty_hasmap(void** state) } void -parse_options_when_opt1_no_val_sets_error(void** state) +parse_options__returns__error_when_opt1_no_val(void** state) { gchar* args[] = { "cmd1", "cmd2", "opt1", NULL }; gchar* keys[] = { "opt1", NULL }; @@ -547,7 +547,7 @@ parse_options_when_opt1_no_val_sets_error(void** state) } void -parse_options_when_one_returns_map(void** state) +parse_options__returns__map_when_one(void** state) { gchar* args[] = { "cmd1", "cmd2", "opt1", "val1", NULL }; gchar* keys[] = { "opt1", NULL }; @@ -565,7 +565,7 @@ parse_options_when_one_returns_map(void** state) } void -parse_options_when_opt2_no_val_sets_error(void** state) +parse_options__returns__error_when_opt2_no_val(void** state) { gchar* args[] = { "cmd1", "cmd2", "opt1", "val1", "opt2", NULL }; gchar* keys[] = { "opt1", "opt2", NULL }; @@ -581,7 +581,7 @@ parse_options_when_opt2_no_val_sets_error(void** state) } void -parse_options_when_two_returns_map(void** state) +parse_options__returns__map_when_two(void** state) { gchar* args[] = { "cmd1", "cmd2", "opt1", "val1", "opt2", "val2", NULL }; gchar* keys[] = { "opt1", "opt2", NULL }; @@ -601,7 +601,7 @@ parse_options_when_two_returns_map(void** state) } void -parse_options_when_opt3_no_val_sets_error(void** state) +parse_options__returns__error_when_opt3_no_val(void** state) { gchar* args[] = { "cmd1", "cmd2", "opt1", "val1", "opt2", "val2", "opt3", NULL }; gchar* keys[] = { "opt1", "opt2", "opt3", NULL }; @@ -617,7 +617,7 @@ parse_options_when_opt3_no_val_sets_error(void** state) } void -parse_options_when_three_returns_map(void** state) +parse_options__returns__map_when_three(void** state) { gchar* args[] = { "cmd1", "cmd2", "opt1", "val1", "opt2", "val2", "opt3", "val3", NULL }; gchar* keys[] = { "opt1", "opt2", "opt3", NULL }; @@ -639,7 +639,7 @@ parse_options_when_three_returns_map(void** state) } void -parse_options_when_unknown_opt_sets_error(void** state) +parse_options__returns__error_when_unknown_opt(void** state) { gchar* args[] = { "cmd1", "cmd2", "opt1", "val1", "oops", "val2", "opt3", "val3", NULL }; gchar* keys[] = { "opt1", "opt2", "opt3", NULL }; @@ -655,7 +655,7 @@ parse_options_when_unknown_opt_sets_error(void** state) } void -parse_options_with_duplicated_option_sets_error(void** state) +parse_options__returns__error_when_duplicated_option(void** state) { gchar* args[] = { "cmd1", "cmd2", "opt1", "val1", "opt2", "val2", "opt1", "val3", NULL }; gchar* keys[] = { "opt1", "opt2", "opt3", NULL }; diff --git a/tests/unittests/tools/test_parser.h b/tests/unittests/tools/test_parser.h index 7babb0be..49cfe784 100644 --- a/tests/unittests/tools/test_parser.h +++ b/tests/unittests/tools/test_parser.h @@ -1,50 +1,55 @@ -void parse_null_returns_null(void** state); -void parse_empty_returns_null(void** state); -void parse_space_returns_null(void** state); -void parse_cmd_no_args_returns_null(void** state); -void parse_cmd_with_space_returns_null(void** state); -void parse_cmd_with_too_few_returns_null(void** state); -void parse_cmd_with_too_many_returns_null(void** state); -void parse_cmd_one_arg(void** state); -void parse_cmd_two_args(void** state); -void parse_cmd_three_args(void** state); -void parse_cmd_three_args_with_spaces(void** state); -void parse_cmd_with_freetext(void** state); -void parse_cmd_one_arg_with_freetext(void** state); -void parse_cmd_two_args_with_freetext(void** state); -void parse_cmd_min_zero(void** state); -void parse_cmd_min_zero_with_freetext(void** state); -void parse_cmd_with_quoted(void** state); -void parse_cmd_with_quoted_and_space(void** state); -void parse_cmd_with_quoted_and_many_spaces(void** state); -void parse_cmd_with_many_quoted_and_many_spaces(void** state); -void parse_cmd_freetext_with_quoted(void** state); -void parse_cmd_freetext_with_quoted_and_space(void** state); -void parse_cmd_freetext_with_quoted_and_many_spaces(void** state); -void parse_cmd_freetext_with_many_quoted_and_many_spaces(void** state); -void parse_cmd_with_quoted_freetext(void** state); -void parse_cmd_with_third_arg_quoted_0_min_3_max(void** state); -void parse_cmd_with_second_arg_quoted_0_min_3_max(void** state); -void parse_cmd_with_second_and_third_arg_quoted_0_min_3_max(void** state); -void count_one_token(void** state); -void count_one_token_quoted_no_whitespace(void** state); -void count_one_token_quoted_with_whitespace(void** state); -void count_two_tokens(void** state); -void count_two_tokens_first_quoted(void** state); -void count_two_tokens_second_quoted(void** state); -void count_two_tokens_both_quoted(void** state); -void get_first_of_one(void** state); -void get_first_of_two(void** state); -void get_first_two_of_three(void** state); -void get_first_two_of_three_first_quoted(void** state); -void get_first_two_of_three_second_quoted(void** state); -void get_first_two_of_three_first_and_second_quoted(void** state); -void parse_options_when_none_returns_empty_hasmap(void** state); -void parse_options_when_opt1_no_val_sets_error(void** state); -void parse_options_when_one_returns_map(void** state); -void parse_options_when_opt2_no_val_sets_error(void** state); -void parse_options_when_two_returns_map(void** state); -void parse_options_when_opt3_no_val_sets_error(void** state); -void parse_options_when_three_returns_map(void** state); -void parse_options_when_unknown_opt_sets_error(void** state); -void parse_options_with_duplicated_option_sets_error(void** state); +#ifndef TESTS_TEST_PARSER_H +#define TESTS_TEST_PARSER_H + +void parse_args__returns__null_from_null(void** state); +void parse_args__returns__null_from_empty(void** state); +void parse_args__returns__null_from_space(void** state); +void parse_args__returns__null_when_no_args(void** state); +void parse_args__returns__null_from_cmd_with_space(void** state); +void parse_args__returns__null_when_too_few(void** state); +void parse_args__returns__null_when_too_many(void** state); +void parse_args__returns__one_arg(void** state); +void parse_args__returns__two_args(void** state); +void parse_args__returns__three_args(void** state); +void parse_args__returns__three_args_with_spaces(void** state); +void parse_args_with_freetext__returns__freetext(void** state); +void parse_args_with_freetext__returns__one_arg_with_freetext(void** state); +void parse_args_with_freetext__returns__two_args_with_freetext(void** state); +void parse_args__returns__zero_args_when_min_zero(void** state); +void parse_args_with_freetext__returns__zero_args_when_min_zero(void** state); +void parse_args__returns__quoted_args(void** state); +void parse_args__returns__quoted_args_with_space(void** state); +void parse_args__returns__quoted_args_with_many_spaces(void** state); +void parse_args__returns__many_quoted_args_with_many_spaces(void** state); +void parse_args_with_freetext__returns__quoted_args(void** state); +void parse_args_with_freetext__returns__quoted_args_with_space(void** state); +void parse_args_with_freetext__returns__quoted_args_with_many_spaces(void** state); +void parse_args_with_freetext__returns__many_quoted_args_with_many_spaces(void** state); +void parse_args_with_freetext__returns__quoted_freetext(void** state); +void parse_args_with_freetext__returns__third_arg_quoted(void** state); +void parse_args_with_freetext__returns__second_arg_quoted(void** state); +void parse_args_with_freetext__returns__second_and_third_arg_quoted(void** state); +void count_tokens__returns__one_token(void** state); +void count_tokens__returns__one_token_quoted_no_whitespace(void** state); +void count_tokens__returns__one_token_quoted_with_whitespace(void** state); +void count_tokens__returns__two_tokens(void** state); +void count_tokens__returns__two_tokens_first_quoted(void** state); +void count_tokens__returns__two_tokens_second_quoted(void** state); +void count_tokens__returns__two_tokens_both_quoted(void** state); +void get_start__returns__first_of_one(void** state); +void get_start__returns__first_of_two(void** state); +void get_start__returns__first_two_of_three(void** state); +void get_start__returns__first_two_of_three_first_quoted(void** state); +void get_start__returns__first_two_of_three_second_quoted(void** state); +void get_start__returns__first_two_of_three_first_and_second_quoted(void** state); +void parse_options__returns__empty_hashmap_when_none(void** state); +void parse_options__returns__error_when_opt1_no_val(void** state); +void parse_options__returns__map_when_one(void** state); +void parse_options__returns__error_when_opt2_no_val(void** state); +void parse_options__returns__map_when_two(void** state); +void parse_options__returns__error_when_opt3_no_val(void** state); +void parse_options__returns__map_when_three(void** state); +void parse_options__returns__error_when_unknown_opt(void** state); +void parse_options__returns__error_when_duplicated_option(void** state); + +#endif diff --git a/tests/unittests/ui/test_keyhandlers.c b/tests/unittests/ui/test_keyhandlers.c index ff7d6a93..c58f9940 100644 --- a/tests/unittests/ui/test_keyhandlers.c +++ b/tests/unittests/ui/test_keyhandlers.c @@ -12,7 +12,8 @@ static char line[INP_WIN_MAX]; // append -void append_to_empty(void **state) +void +key_printable__updates__append_to_empty(void** state) { setlocale(LC_ALL, ""); line[0] = '\0'; @@ -28,7 +29,8 @@ void append_to_empty(void **state) assert_int_equal(pad_start, 0); } -void append_wide_to_empty(void **state) +void +key_printable__updates__append_wide_to_empty(void** state) { setlocale(LC_ALL, ""); line[0] = '\0'; @@ -44,7 +46,8 @@ void append_wide_to_empty(void **state) assert_int_equal(pad_start, 0); } -void append_to_single(void **state) +void +key_printable__updates__append_to_single(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "a", 1); @@ -61,8 +64,8 @@ void append_to_single(void **state) assert_int_equal(pad_start, 0); } - -void append_wide_to_single_non_wide(void **state) +void +key_printable__updates__append_wide_to_single_non_wide(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "a", 1); @@ -79,7 +82,8 @@ void append_wide_to_single_non_wide(void **state) assert_int_equal(pad_start, 0); } -void append_non_wide_to_single_wide(void **state) +void +key_printable__updates__append_non_wide_to_single_wide(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "四", 1); @@ -96,7 +100,8 @@ void append_non_wide_to_single_wide(void **state) assert_int_equal(pad_start, 0); } -void append_wide_to_single_wide(void **state) +void +key_printable__updates__append_wide_to_single_wide(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "四", 1); @@ -113,7 +118,8 @@ void append_wide_to_single_wide(void **state) assert_int_equal(pad_start, 0); } -void append_non_wide_when_overrun(void **state) +void +key_printable__updates__append_non_wide_when_overrun(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "0123456789四1234567", 18); @@ -132,7 +138,8 @@ void append_non_wide_when_overrun(void **state) assert_int_equal(pad_start, 3); } -void insert_non_wide_to_non_wide(void **state) +void +key_printable__updates__insert_non_wide_to_non_wide(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd", 4); @@ -149,7 +156,8 @@ void insert_non_wide_to_non_wide(void **state) assert_int_equal(pad_start, 0); } -void insert_single_non_wide_when_pad_scrolled(void **state) +void +key_printable__updates__insert_single_non_wide_when_pad_scrolled(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "AAAAAAAAAAAAAAA", 15); @@ -166,7 +174,8 @@ void insert_single_non_wide_when_pad_scrolled(void **state) assert_int_equal(pad_start, 2); } -void insert_many_non_wide_when_pad_scrolled(void **state) +void +key_printable__updates__insert_many_non_wide_when_pad_scrolled(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "AAAAAAAAAAAAAAA", 15); @@ -185,7 +194,8 @@ void insert_many_non_wide_when_pad_scrolled(void **state) assert_int_equal(pad_start, 2); } -void insert_single_non_wide_last_column(void **state) +void +key_printable__updates__insert_single_non_wide_last_column(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcdefghijklmno", 15); @@ -202,7 +212,8 @@ void insert_single_non_wide_last_column(void **state) assert_int_equal(pad_start, 3); } -void insert_many_non_wide_last_column(void **state) +void +key_printable__updates__insert_many_non_wide_last_column(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcdefghijklmno", 15); @@ -220,7 +231,8 @@ void insert_many_non_wide_last_column(void **state) assert_int_equal(pad_start, 4); } -void ctrl_left_when_no_input(void **state) +void +key_ctrl_left__updates__when_no_input(void** state) { setlocale(LC_ALL, ""); line[0] = '\0'; @@ -235,7 +247,8 @@ void ctrl_left_when_no_input(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_at_start(void **state) +void +key_ctrl_left__updates__when_at_start(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -251,7 +264,8 @@ void ctrl_left_when_at_start(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_in_first_word(void **state) +void +key_ctrl_left__updates__when_in_first_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -267,7 +281,8 @@ void ctrl_left_when_in_first_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_in_first_space(void **state) +void +key_ctrl_left__updates__when_in_first_space(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -283,7 +298,8 @@ void ctrl_left_when_in_first_space(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_at_start_of_second_word(void **state) +void +key_ctrl_left__updates__at_start_of_second_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -299,7 +315,8 @@ void ctrl_left_when_at_start_of_second_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_in_second_word(void **state) +void +key_ctrl_left__updates__when_in_second_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -315,7 +332,8 @@ void ctrl_left_when_in_second_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_at_end_of_second_word(void **state) +void +key_ctrl_left__updates__at_end_of_second_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -331,7 +349,8 @@ void ctrl_left_when_at_end_of_second_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_in_second_space(void **state) +void +key_ctrl_left__updates__when_in_second_space(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -347,7 +366,8 @@ void ctrl_left_when_in_second_space(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_at_start_of_third_word(void **state) +void +key_ctrl_left__updates__at_start_of_third_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -363,7 +383,8 @@ void ctrl_left_when_at_start_of_third_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_in_third_word(void **state) +void +key_ctrl_left__updates__when_in_third_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -379,7 +400,8 @@ void ctrl_left_when_in_third_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_at_end_of_third_word(void **state) +void +key_ctrl_left__updates__at_end_of_third_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -395,7 +417,8 @@ void ctrl_left_when_at_end_of_third_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_in_third_space(void **state) +void +key_ctrl_left__updates__when_in_third_space(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -411,7 +434,8 @@ void ctrl_left_when_in_third_space(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_at_end(void **state) +void +key_ctrl_left__updates__when_at_end(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "abcd efghij klmn opqr", 21); @@ -427,7 +451,8 @@ void ctrl_left_when_at_end(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_in_only_whitespace(void **state) +void +key_ctrl_left__updates__when_in_only_whitespace(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, " ", 7); @@ -443,7 +468,8 @@ void ctrl_left_when_in_only_whitespace(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_start_whitespace_start_of_word(void **state) +void +key_ctrl_left__updates__when_start_whitespace_start_of_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, " hello", 9); @@ -459,7 +485,8 @@ void ctrl_left_when_start_whitespace_start_of_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_start_whitespace_middle_of_word(void **state) +void +key_ctrl_left__updates__when_start_whitespace_middle_of_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, " hello", 9); @@ -475,7 +502,8 @@ void ctrl_left_when_start_whitespace_middle_of_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_in_whitespace_between_words(void **state) +void +key_ctrl_left__updates__in_whitespace_between_words(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "hey hello", 12); @@ -491,7 +519,8 @@ void ctrl_left_in_whitespace_between_words(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_in_whitespace_between_words_start_of_word(void **state) +void +key_ctrl_left__updates__in_whitespace_between_words_start_of_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "hey hello", 12); @@ -507,7 +536,8 @@ void ctrl_left_in_whitespace_between_words_start_of_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_in_whitespace_between_words_middle_of_word(void **state) +void +key_ctrl_left__updates__in_whitespace_between_words_middle_of_word(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "hey hello", 12); @@ -523,7 +553,8 @@ void ctrl_left_in_whitespace_between_words_middle_of_word(void **state) assert_int_equal(pad_start, 0); } -void ctrl_left_when_word_overrun_to_left(void **state) +void +key_ctrl_left__updates__when_word_overrun_to_left(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "someword anotherword", 20); @@ -539,7 +570,8 @@ void ctrl_left_when_word_overrun_to_left(void **state) assert_int_equal(pad_start, 9); } -void ctrl_right_when_no_input(void **state) +void +key_ctrl_right__updates__when_no_input(void** state) { setlocale(LC_ALL, ""); line[0] = '\0'; @@ -554,7 +586,8 @@ void ctrl_right_when_no_input(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_when_at_end(void **state) +void +key_ctrl_right__updates__when_at_end(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "someword anotherword", 20); @@ -570,7 +603,8 @@ void ctrl_right_when_at_end(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_one_word_at_start(void **state) +void +key_ctrl_right__updates__one_word_at_start(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "someword", 8); @@ -586,7 +620,8 @@ void ctrl_right_one_word_at_start(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_one_word_in_middle(void **state) +void +key_ctrl_right__updates__one_word_in_middle(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "someword", 8); @@ -602,7 +637,8 @@ void ctrl_right_one_word_in_middle(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_one_word_at_end(void **state) +void +key_ctrl_right__updates__one_word_at_end(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "someword", 8); @@ -618,7 +654,8 @@ void ctrl_right_one_word_at_end(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_two_words_from_middle_first(void **state) +void +key_ctrl_right__updates__two_words_from_middle_first(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "someword anotherword", 20); @@ -634,7 +671,8 @@ void ctrl_right_two_words_from_middle_first(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_two_words_from_end_first(void **state) +void +key_ctrl_right__updates__two_words_from_end_first(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "someword anotherword", 20); @@ -650,7 +688,8 @@ void ctrl_right_two_words_from_end_first(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_two_words_from_space(void **state) +void +key_ctrl_right__updates__two_words_from_space(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "someword anotherword", 20); @@ -666,7 +705,8 @@ void ctrl_right_two_words_from_space(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_two_words_from_start_second(void **state) +void +key_ctrl_right__updates__two_words_from_start_second(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "someword anotherword", 20); @@ -682,7 +722,8 @@ void ctrl_right_two_words_from_start_second(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_one_word_leading_whitespace(void **state) +void +key_ctrl_right__updates__one_word_leading_whitespace(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, " someword", 15); @@ -698,7 +739,8 @@ void ctrl_right_one_word_leading_whitespace(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_two_words_in_whitespace(void **state) +void +key_ctrl_right__updates__two_words_in_whitespace(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, " someword adfasdf", 30); @@ -714,7 +756,8 @@ void ctrl_right_two_words_in_whitespace(void **state) assert_int_equal(pad_start, 0); } -void ctrl_right_trailing_whitespace_from_middle(void **state) +void +key_ctrl_right__updates__trailing_whitespace_from_middle(void** state) { setlocale(LC_ALL, ""); g_utf8_strncpy(line, "someword ", 16); diff --git a/tests/unittests/ui/test_keyhandlers.h b/tests/unittests/ui/test_keyhandlers.h index 910efe97..ff70ee57 100644 --- a/tests/unittests/ui/test_keyhandlers.h +++ b/tests/unittests/ui/test_keyhandlers.h @@ -1,47 +1,52 @@ -void append_to_empty(void **state); -void append_wide_to_empty(void **state); -void append_to_single(void **state); -void append_wide_to_single_non_wide(void **state); -void append_non_wide_to_single_wide(void **state); -void append_wide_to_single_wide(void **state); -void append_non_wide_when_overrun(void **state); +#ifndef TESTS_TEST_KEYHANDLERS_H +#define TESTS_TEST_KEYHANDLERS_H -void insert_non_wide_to_non_wide(void **state); -void insert_single_non_wide_when_pad_scrolled(void **state); -void insert_many_non_wide_when_pad_scrolled(void **state); -void insert_single_non_wide_last_column(void **state); -void insert_many_non_wide_last_column(void **state); +void key_printable__updates__append_to_empty(void** state); +void key_printable__updates__append_wide_to_empty(void** state); +void key_printable__updates__append_to_single(void** state); +void key_printable__updates__append_wide_to_single_non_wide(void** state); +void key_printable__updates__append_non_wide_to_single_wide(void** state); +void key_printable__updates__append_wide_to_single_wide(void** state); +void key_printable__updates__append_non_wide_when_overrun(void** state); -void ctrl_left_when_no_input(void **state); -void ctrl_left_when_at_start(void **state); -void ctrl_left_when_in_first_word(void **state); -void ctrl_left_when_in_first_space(void **state); -void ctrl_left_when_at_start_of_second_word(void **state); -void ctrl_left_when_in_second_word(void **state); -void ctrl_left_when_at_end_of_second_word(void **state); -void ctrl_left_when_in_second_space(void **state); -void ctrl_left_when_at_start_of_third_word(void **state); -void ctrl_left_when_in_third_word(void **state); -void ctrl_left_when_at_end_of_third_word(void **state); -void ctrl_left_when_in_third_space(void **state); -void ctrl_left_when_at_end(void **state); -void ctrl_left_when_in_only_whitespace(void **state); -void ctrl_left_when_start_whitespace_start_of_word(void **state); -void ctrl_left_when_start_whitespace_middle_of_word(void **state); -void ctrl_left_in_whitespace_between_words(void **state); -void ctrl_left_in_whitespace_between_words_start_of_word(void **state); -void ctrl_left_in_whitespace_between_words_middle_of_word(void **state); -void ctrl_left_when_word_overrun_to_left(void **state); +void key_printable__updates__insert_non_wide_to_non_wide(void** state); +void key_printable__updates__insert_single_non_wide_when_pad_scrolled(void** state); +void key_printable__updates__insert_many_non_wide_when_pad_scrolled(void** state); +void key_printable__updates__insert_single_non_wide_last_column(void** state); +void key_printable__updates__insert_many_non_wide_last_column(void** state); -void ctrl_right_when_no_input(void **state); -void ctrl_right_when_at_end(void **state); -void ctrl_right_one_word_at_start(void **state); -void ctrl_right_one_word_in_middle(void **state); -void ctrl_right_one_word_at_end(void **state); -void ctrl_right_two_words_from_middle_first(void **state); -void ctrl_right_two_words_from_end_first(void **state); -void ctrl_right_two_words_from_space(void **state); -void ctrl_right_two_words_from_start_second(void **state); -void ctrl_right_one_word_leading_whitespace(void **state); -void ctrl_right_two_words_in_whitespace(void **state); -void ctrl_right_trailing_whitespace_from_middle(void **state); +void key_ctrl_left__updates__when_no_input(void** state); +void key_ctrl_left__updates__when_at_start(void** state); +void key_ctrl_left__updates__when_in_first_word(void** state); +void key_ctrl_left__updates__when_in_first_space(void** state); +void key_ctrl_left__updates__at_start_of_second_word(void** state); +void key_ctrl_left__updates__when_in_second_word(void** state); +void key_ctrl_left__updates__at_end_of_second_word(void** state); +void key_ctrl_left__updates__when_in_second_space(void** state); +void key_ctrl_left__updates__at_start_of_third_word(void** state); +void key_ctrl_left__updates__when_in_third_word(void** state); +void key_ctrl_left__updates__at_end_of_third_word(void** state); +void key_ctrl_left__updates__when_in_third_space(void** state); +void key_ctrl_left__updates__when_at_end(void** state); +void key_ctrl_left__updates__when_in_only_whitespace(void** state); +void key_ctrl_left__updates__when_start_whitespace_start_of_word(void** state); +void key_ctrl_left__updates__when_start_whitespace_middle_of_word(void** state); +void key_ctrl_left__updates__in_whitespace_between_words(void** state); +void key_ctrl_left__updates__in_whitespace_between_words_start_of_word(void** state); +void key_ctrl_left__updates__in_whitespace_between_words_middle_of_word(void** state); +void key_ctrl_left__updates__when_word_overrun_to_left(void** state); + +void key_ctrl_right__updates__when_no_input(void** state); +void key_ctrl_right__updates__when_at_end(void** state); +void key_ctrl_right__updates__one_word_at_start(void** state); +void key_ctrl_right__updates__one_word_in_middle(void** state); +void key_ctrl_right__updates__one_word_at_end(void** state); +void key_ctrl_right__updates__two_words_from_middle_first(void** state); +void key_ctrl_right__updates__two_words_from_end_first(void** state); +void key_ctrl_right__updates__two_words_from_space(void** state); +void key_ctrl_right__updates__two_words_from_start_second(void** state); +void key_ctrl_right__updates__one_word_leading_whitespace(void** state); +void key_ctrl_right__updates__two_words_in_whitespace(void** state); +void key_ctrl_right__updates__trailing_whitespace_from_middle(void** state); + +#endif diff --git a/tests/unittests/unittests.c b/tests/unittests/unittests.c index 5f2cb89b..c0b95a19 100644 --- a/tests/unittests/unittests.c +++ b/tests/unittests/unittests.c @@ -61,596 +61,596 @@ main(int argc, char* argv[]) const struct CMUnitTest all_tests[] = { - cmocka_unit_test(replace_one_substr), - cmocka_unit_test(replace_one_substr_beginning), - cmocka_unit_test(replace_one_substr_end), - cmocka_unit_test(replace_two_substr), - cmocka_unit_test(replace_char), - cmocka_unit_test(replace_when_none), - cmocka_unit_test(replace_when_match), - cmocka_unit_test(replace_when_string_empty), - cmocka_unit_test(replace_when_string_null), - cmocka_unit_test(replace_when_sub_empty), - cmocka_unit_test(replace_when_sub_null), - cmocka_unit_test(replace_when_new_empty), - cmocka_unit_test(replace_when_new_null), - cmocka_unit_test(test_online_is_valid_resource_presence_string), - cmocka_unit_test(test_chat_is_valid_resource_presence_string), - cmocka_unit_test(test_away_is_valid_resource_presence_string), - cmocka_unit_test(test_xa_is_valid_resource_presence_string), - cmocka_unit_test(test_dnd_is_valid_resource_presence_string), - cmocka_unit_test(test_available_is_not_valid_resource_presence_string), - cmocka_unit_test(test_unavailable_is_not_valid_resource_presence_string), - cmocka_unit_test(test_blah_is_not_valid_resource_presence_string), - cmocka_unit_test(utf8_display_len_null_str), - cmocka_unit_test(utf8_display_len_1_non_wide), - cmocka_unit_test(utf8_display_len_1_wide), - cmocka_unit_test(utf8_display_len_non_wide), - cmocka_unit_test(utf8_display_len_wide), - cmocka_unit_test(utf8_display_len_all_wide), - cmocka_unit_test(strip_quotes_does_nothing_when_no_quoted), - cmocka_unit_test(strip_quotes_strips_first), - cmocka_unit_test(strip_quotes_strips_last), - cmocka_unit_test(strip_quotes_strips_both), - cmocka_unit_test(format_call_external_argv_td), - cmocka_unit_test(unique_filename_from_url_td), - cmocka_unit_test(test_string_to_verbosity), - cmocka_unit_test(test_get_expanded_path), - cmocka_unit_test(test_strtoi_range_valid_input), - cmocka_unit_test(test_strtoi_range_out_of_range), - cmocka_unit_test(test_strtoi_range_invalid_input), - cmocka_unit_test(test_strtoi_range_null_empty_input), - cmocka_unit_test(test_strtoi_range_null_err_msg), - cmocka_unit_test(test_string_matches_one_of_edge_cases), - cmocka_unit_test(test_valid_tls_policy_option), - cmocka_unit_test(clear_empty), - cmocka_unit_test(reset_after_create), - cmocka_unit_test(find_after_create), - cmocka_unit_test(get_after_create_returns_null), - cmocka_unit_test(add_one_and_complete), - cmocka_unit_test(add_two_and_complete_returns_first), - cmocka_unit_test(add_two_and_complete_returns_second), - cmocka_unit_test(add_two_adds_two), - cmocka_unit_test(add_two_same_adds_one), - cmocka_unit_test(add_two_same_updates), - cmocka_unit_test(complete_accented_with_accented), - cmocka_unit_test(complete_accented_with_base), - cmocka_unit_test(complete_both_with_accented), - cmocka_unit_test(complete_both_with_base), - cmocka_unit_test(complete_ignores_case), - cmocka_unit_test(complete_previous), + cmocka_unit_test(str_replace__returns__one_substr), + cmocka_unit_test(str_replace__returns__one_substr_beginning), + cmocka_unit_test(str_replace__returns__one_substr_end), + cmocka_unit_test(str_replace__returns__two_substr), + cmocka_unit_test(str_replace__returns__char), + cmocka_unit_test(str_replace__returns__original_when_none), + cmocka_unit_test(str_replace__returns__replaced_when_match), + cmocka_unit_test(str_replace__returns__empty_when_string_empty), + cmocka_unit_test(str_replace__returns__null_when_string_null), + cmocka_unit_test(str_replace__returns__original_when_sub_empty), + cmocka_unit_test(str_replace__returns__original_when_sub_null), + cmocka_unit_test(str_replace__returns__empty_when_new_empty), + cmocka_unit_test(str_replace__returns__original_when_new_null), + cmocka_unit_test(valid_resource_presence_string__is__true_for_online), + cmocka_unit_test(valid_resource_presence_string__is__true_for_chat), + cmocka_unit_test(valid_resource_presence_string__is__true_for_away), + cmocka_unit_test(valid_resource_presence_string__is__true_for_xa), + cmocka_unit_test(valid_resource_presence_string__is__true_for_dnd), + cmocka_unit_test(valid_resource_presence_string__is__false_for_available), + cmocka_unit_test(valid_resource_presence_string__is__false_for_unavailable), + cmocka_unit_test(valid_resource_presence_string__is__false_for_blah), + cmocka_unit_test(utf8_display_len__returns__0_for_null), + cmocka_unit_test(utf8_display_len__returns__1_for_non_wide), + cmocka_unit_test(utf8_display_len__returns__2_for_wide), + cmocka_unit_test(utf8_display_len__returns__correct_for_non_wide), + cmocka_unit_test(utf8_display_len__returns__correct_for_wide), + cmocka_unit_test(utf8_display_len__returns__correct_for_all_wide), + cmocka_unit_test(strip_arg_quotes__returns__original_when_no_quotes), + cmocka_unit_test(strip_arg_quotes__returns__stripped_first), + cmocka_unit_test(strip_arg_quotes__returns__stripped_last), + cmocka_unit_test(strip_arg_quotes__returns__stripped_both), + cmocka_unit_test(format_call_external_argv__tests__table_driven), + cmocka_unit_test(unique_filename_from_url__tests__table_driven), + cmocka_unit_test(string_to_verbosity__returns__correct_values), + cmocka_unit_test(get_expanded_path__returns__expanded), + cmocka_unit_test(strtoi_range__returns__true_for_valid_input), + cmocka_unit_test(strtoi_range__returns__false_for_out_of_range), + cmocka_unit_test(strtoi_range__returns__false_for_invalid_input), + cmocka_unit_test(strtoi_range__returns__false_for_null_empty_input), + cmocka_unit_test(strtoi_range__returns__correct_values_when_err_msg_null), + cmocka_unit_test(string_matches_one_of__tests__edge_cases), + cmocka_unit_test(valid_tls_policy_option__is__correct_for_various_inputs), + cmocka_unit_test(autocomplete_complete__returns__null_when_empty), + cmocka_unit_test(autocomplete_reset__updates__after_create), + cmocka_unit_test(autocomplete_complete__returns__null_after_create), + cmocka_unit_test(autocomplete_create_list__returns__null_after_create), + cmocka_unit_test(autocomplete_add__updates__one_and_complete), + cmocka_unit_test(autocomplete_complete__returns__first_of_two), + cmocka_unit_test(autocomplete_complete__returns__second_of_two), + cmocka_unit_test(autocomplete_add__updates__two_elements), + cmocka_unit_test(autocomplete_add__updates__only_once_for_same_value), + cmocka_unit_test(autocomplete_add__updates__existing_value), + cmocka_unit_test(autocomplete_complete__returns__accented_with_accented), + cmocka_unit_test(autocomplete_complete__returns__accented_with_base), + cmocka_unit_test(autocomplete_complete__returns__both_with_accented), + cmocka_unit_test(autocomplete_complete__returns__both_with_base), + cmocka_unit_test(autocomplete_complete__is__case_insensitive), + cmocka_unit_test(autocomplete_complete__returns__previous), - cmocka_unit_test(create_jid_from_null_returns_null), - cmocka_unit_test(create_jid_from_empty_string_returns_null), - cmocka_unit_test(create_jid_from_full_returns_full), - cmocka_unit_test(create_jid_from_full_returns_bare), - cmocka_unit_test(create_jid_from_full_returns_resourcepart), - cmocka_unit_test(create_jid_from_full_returns_localpart), - cmocka_unit_test(create_jid_from_full_returns_domainpart), - cmocka_unit_test(create_jid_from_full_nolocal_returns_full), - cmocka_unit_test(create_jid_from_full_nolocal_returns_bare), - cmocka_unit_test(create_jid_from_full_nolocal_returns_resourcepart), - cmocka_unit_test(create_jid_from_full_nolocal_returns_domainpart), - cmocka_unit_test(create_jid_from_full_nolocal_returns_null_localpart), - cmocka_unit_test(create_jid_from_bare_returns_null_full), - cmocka_unit_test(create_jid_from_bare_returns_null_resource), - cmocka_unit_test(create_jid_from_bare_returns_bare), - cmocka_unit_test(create_jid_from_bare_returns_localpart), - cmocka_unit_test(create_jid_from_bare_returns_domainpart), - cmocka_unit_test(create_room_jid_returns_room), - cmocka_unit_test(create_room_jid_returns_nick), - cmocka_unit_test(create_with_slash_in_resource), - cmocka_unit_test(create_with_at_in_resource), - cmocka_unit_test(create_with_at_and_slash_in_resource), - cmocka_unit_test(create_full_with_trailing_slash), - cmocka_unit_test(returns_fulljid_when_exists), - cmocka_unit_test(returns_barejid_when_fulljid_not_exists), + cmocka_unit_test(jid_create__returns__null_from_null), + cmocka_unit_test(jid_create__returns__null_from_empty_string), + cmocka_unit_test(jid_create__returns__full_from_full), + cmocka_unit_test(jid_create__returns__bare_from_full), + cmocka_unit_test(jid_create__returns__resourcepart_from_full), + cmocka_unit_test(jid_create__returns__localpart_from_full), + cmocka_unit_test(jid_create__returns__domainpart_from_full), + cmocka_unit_test(jid_create__returns__full_from_full_nolocal), + cmocka_unit_test(jid_create__returns__bare_from_full_nolocal), + cmocka_unit_test(jid_create__returns__resourcepart_from_full_nolocal), + cmocka_unit_test(jid_create__returns__domainpart_from_full_nolocal), + cmocka_unit_test(jid_create__returns__null_localpart_from_full_nolocal), + cmocka_unit_test(jid_create__returns__null_full_from_bare), + cmocka_unit_test(jid_create__returns__null_resource_from_bare), + cmocka_unit_test(jid_create__returns__bare_from_bare), + cmocka_unit_test(jid_create__returns__localpart_from_bare), + cmocka_unit_test(jid_create__returns__domainpart_from_bare), + cmocka_unit_test(jid_create_from_bare_and_resource__returns__room), + cmocka_unit_test(jid_create_from_bare_and_resource__returns__nick), + cmocka_unit_test(jid_create__returns__correct_parts_with_slash_in_resource), + cmocka_unit_test(jid_create__returns__correct_parts_with_at_in_resource), + cmocka_unit_test(jid_create__returns__correct_parts_with_at_and_slash_in_resource), + cmocka_unit_test(jid_create__returns__correct_parts_with_trailing_slash), + cmocka_unit_test(jid_fulljid_or_barejid__returns__fulljid_when_exists), + cmocka_unit_test(jid_fulljid_or_barejid__returns__barejid_when_fulljid_not_exists), - cmocka_unit_test(parse_null_returns_null), - cmocka_unit_test(parse_empty_returns_null), - cmocka_unit_test(parse_space_returns_null), - cmocka_unit_test(parse_cmd_no_args_returns_null), - cmocka_unit_test(parse_cmd_with_space_returns_null), - cmocka_unit_test(parse_cmd_with_too_few_returns_null), - cmocka_unit_test(parse_cmd_with_too_many_returns_null), - cmocka_unit_test(parse_cmd_one_arg), - cmocka_unit_test(parse_cmd_two_args), - cmocka_unit_test(parse_cmd_three_args), - cmocka_unit_test(parse_cmd_three_args_with_spaces), - cmocka_unit_test(parse_cmd_with_freetext), - cmocka_unit_test(parse_cmd_one_arg_with_freetext), - cmocka_unit_test(parse_cmd_two_args_with_freetext), - cmocka_unit_test(parse_cmd_min_zero), - cmocka_unit_test(parse_cmd_min_zero_with_freetext), - cmocka_unit_test(parse_cmd_with_quoted), - cmocka_unit_test(parse_cmd_with_quoted_and_space), - cmocka_unit_test(parse_cmd_with_quoted_and_many_spaces), - cmocka_unit_test(parse_cmd_with_many_quoted_and_many_spaces), - cmocka_unit_test(parse_cmd_freetext_with_quoted), - cmocka_unit_test(parse_cmd_freetext_with_quoted_and_space), - cmocka_unit_test(parse_cmd_freetext_with_quoted_and_many_spaces), - cmocka_unit_test(parse_cmd_freetext_with_many_quoted_and_many_spaces), - cmocka_unit_test(parse_cmd_with_quoted_freetext), - cmocka_unit_test(parse_cmd_with_third_arg_quoted_0_min_3_max), - cmocka_unit_test(parse_cmd_with_second_arg_quoted_0_min_3_max), - cmocka_unit_test(parse_cmd_with_second_and_third_arg_quoted_0_min_3_max), - cmocka_unit_test(count_one_token), - cmocka_unit_test(count_one_token_quoted_no_whitespace), - cmocka_unit_test(count_one_token_quoted_with_whitespace), - cmocka_unit_test(count_two_tokens), - cmocka_unit_test(count_two_tokens_first_quoted), - cmocka_unit_test(count_two_tokens_second_quoted), - cmocka_unit_test(count_two_tokens_both_quoted), - cmocka_unit_test(get_first_of_one), - cmocka_unit_test(get_first_of_two), - cmocka_unit_test(get_first_two_of_three), - cmocka_unit_test(get_first_two_of_three_first_quoted), - cmocka_unit_test(get_first_two_of_three_second_quoted), - cmocka_unit_test(get_first_two_of_three_first_and_second_quoted), - cmocka_unit_test(parse_options_when_none_returns_empty_hasmap), - cmocka_unit_test(parse_options_when_opt1_no_val_sets_error), - cmocka_unit_test(parse_options_when_one_returns_map), - cmocka_unit_test(parse_options_when_opt2_no_val_sets_error), - cmocka_unit_test(parse_options_when_two_returns_map), - cmocka_unit_test(parse_options_when_opt3_no_val_sets_error), - cmocka_unit_test(parse_options_when_three_returns_map), - cmocka_unit_test(parse_options_when_unknown_opt_sets_error), - cmocka_unit_test(parse_options_with_duplicated_option_sets_error), + cmocka_unit_test(parse_args__returns__null_from_null), + cmocka_unit_test(parse_args__returns__null_from_empty), + cmocka_unit_test(parse_args__returns__null_from_space), + cmocka_unit_test(parse_args__returns__null_when_no_args), + cmocka_unit_test(parse_args__returns__null_from_cmd_with_space), + cmocka_unit_test(parse_args__returns__null_when_too_few), + cmocka_unit_test(parse_args__returns__null_when_too_many), + cmocka_unit_test(parse_args__returns__one_arg), + cmocka_unit_test(parse_args__returns__two_args), + cmocka_unit_test(parse_args__returns__three_args), + cmocka_unit_test(parse_args__returns__three_args_with_spaces), + cmocka_unit_test(parse_args_with_freetext__returns__freetext), + cmocka_unit_test(parse_args_with_freetext__returns__one_arg_with_freetext), + cmocka_unit_test(parse_args_with_freetext__returns__two_args_with_freetext), + cmocka_unit_test(parse_args__returns__zero_args_when_min_zero), + cmocka_unit_test(parse_args_with_freetext__returns__zero_args_when_min_zero), + cmocka_unit_test(parse_args__returns__quoted_args), + cmocka_unit_test(parse_args__returns__quoted_args_with_space), + cmocka_unit_test(parse_args__returns__quoted_args_with_many_spaces), + cmocka_unit_test(parse_args__returns__many_quoted_args_with_many_spaces), + cmocka_unit_test(parse_args_with_freetext__returns__quoted_args), + cmocka_unit_test(parse_args_with_freetext__returns__quoted_args_with_space), + cmocka_unit_test(parse_args_with_freetext__returns__quoted_args_with_many_spaces), + cmocka_unit_test(parse_args_with_freetext__returns__many_quoted_args_with_many_spaces), + cmocka_unit_test(parse_args_with_freetext__returns__quoted_freetext), + cmocka_unit_test(parse_args_with_freetext__returns__third_arg_quoted), + cmocka_unit_test(parse_args_with_freetext__returns__second_arg_quoted), + cmocka_unit_test(parse_args_with_freetext__returns__second_and_third_arg_quoted), + cmocka_unit_test(count_tokens__returns__one_token), + cmocka_unit_test(count_tokens__returns__one_token_quoted_no_whitespace), + cmocka_unit_test(count_tokens__returns__one_token_quoted_with_whitespace), + cmocka_unit_test(count_tokens__returns__two_tokens), + cmocka_unit_test(count_tokens__returns__two_tokens_first_quoted), + cmocka_unit_test(count_tokens__returns__two_tokens_second_quoted), + cmocka_unit_test(count_tokens__returns__two_tokens_both_quoted), + cmocka_unit_test(get_start__returns__first_of_one), + cmocka_unit_test(get_start__returns__first_of_two), + cmocka_unit_test(get_start__returns__first_two_of_three), + cmocka_unit_test(get_start__returns__first_two_of_three_first_quoted), + cmocka_unit_test(get_start__returns__first_two_of_three_second_quoted), + cmocka_unit_test(get_start__returns__first_two_of_three_first_and_second_quoted), + cmocka_unit_test(parse_options__returns__empty_hashmap_when_none), + cmocka_unit_test(parse_options__returns__error_when_opt1_no_val), + cmocka_unit_test(parse_options__returns__map_when_one), + cmocka_unit_test(parse_options__returns__error_when_opt2_no_val), + cmocka_unit_test(parse_options__returns__map_when_two), + cmocka_unit_test(parse_options__returns__error_when_opt3_no_val), + cmocka_unit_test(parse_options__returns__map_when_three), + cmocka_unit_test(parse_options__returns__error_when_unknown_opt), + cmocka_unit_test(parse_options__returns__error_when_duplicated_option), - cmocka_unit_test(empty_list_when_none_added), - cmocka_unit_test(contains_one_element), - cmocka_unit_test(first_element_correct), - cmocka_unit_test(contains_two_elements), - cmocka_unit_test(first_and_second_elements_correct), - cmocka_unit_test(contains_three_elements), - cmocka_unit_test(first_three_elements_correct), - cmocka_unit_test(add_twice_at_beginning_adds_once), - cmocka_unit_test(add_twice_in_middle_adds_once), - cmocka_unit_test(add_twice_at_end_adds_once), - cmocka_unit_test(find_first_exists), - cmocka_unit_test(find_second_exists), - cmocka_unit_test(find_third_exists), - cmocka_unit_test(find_returns_null), - cmocka_unit_test(find_on_empty_returns_null), - cmocka_unit_test(find_twice_returns_second_when_two_match), - cmocka_unit_test(find_five_times_finds_fifth), - cmocka_unit_test(find_twice_returns_first_when_two_match_and_reset), - cmocka_unit_test(add_contact_with_no_group), - cmocka_unit_test(add_contact_with_group), - cmocka_unit_test(add_contact_with_two_groups), - cmocka_unit_test(add_contact_with_three_groups), - cmocka_unit_test(add_contact_with_three_groups_update_adding_two), - cmocka_unit_test(add_contact_with_three_groups_update_removing_one), - cmocka_unit_test(add_contact_with_three_groups_update_removing_two), - cmocka_unit_test(add_contact_with_three_groups_update_removing_three), - cmocka_unit_test(add_contact_with_three_groups_update_two_new), - cmocka_unit_test(add_remove_contact_groups), - cmocka_unit_test(add_contacts_with_different_groups), - cmocka_unit_test(add_contacts_with_same_groups), - cmocka_unit_test(add_contacts_with_overlapping_groups), - cmocka_unit_test(remove_contact_with_remaining_in_group), - cmocka_unit_test(get_contact_display_name), - cmocka_unit_test(get_contact_display_name_is_barejid_if_name_is_empty), - cmocka_unit_test(get_contact_display_name_is_passed_barejid_if_contact_does_not_exist), + cmocka_unit_test(roster_get_contacts__returns__empty_list_when_none_added), + cmocka_unit_test(roster_get_contacts__returns__one_element), + cmocka_unit_test(roster_get_contacts__returns__correct_first_element), + cmocka_unit_test(roster_get_contacts__returns__two_elements), + cmocka_unit_test(roster_get_contacts__returns__correct_first_and_second_elements), + cmocka_unit_test(roster_get_contacts__returns__three_elements), + cmocka_unit_test(roster_get_contacts__returns__correct_first_three_elements), + cmocka_unit_test(roster_add__updates__adds_once_when_called_twice_at_beginning), + cmocka_unit_test(roster_add__updates__adds_once_when_called_twice_in_middle), + cmocka_unit_test(roster_add__updates__adds_once_when_called_twice_at_end), + cmocka_unit_test(roster_contact_autocomplete__returns__first_exists), + cmocka_unit_test(roster_contact_autocomplete__returns__second_exists), + cmocka_unit_test(roster_contact_autocomplete__returns__third_exists), + cmocka_unit_test(roster_contact_autocomplete__returns__null_when_no_match), + cmocka_unit_test(roster_contact_autocomplete__returns__null_on_empty_roster), + cmocka_unit_test(roster_contact_autocomplete__returns__second_when_two_match), + cmocka_unit_test(roster_contact_autocomplete__returns__fifth_when_multiple_match), + cmocka_unit_test(roster_contact_autocomplete__returns__first_when_two_match_and_reset), + cmocka_unit_test(roster_get_groups__returns__empty_for_no_group), + cmocka_unit_test(roster_get_groups__returns__one_group), + cmocka_unit_test(roster_get_groups__returns__two_groups), + cmocka_unit_test(roster_get_groups__returns__three_groups), + cmocka_unit_test(roster_update__updates__adding_two_groups), + cmocka_unit_test(roster_update__updates__removing_one_group), + cmocka_unit_test(roster_update__updates__removing_two_groups), + cmocka_unit_test(roster_update__updates__removing_three_groups), + cmocka_unit_test(roster_update__updates__two_new_groups), + cmocka_unit_test(roster_remove__updates__contact_groups), + cmocka_unit_test(roster_add__updates__different_groups), + cmocka_unit_test(roster_add__updates__same_groups), + cmocka_unit_test(roster_add__updates__overlapping_groups), + cmocka_unit_test(roster_remove__updates__remaining_in_group), + cmocka_unit_test(roster_get_display_name__returns__nickname_when_exists), + cmocka_unit_test(roster_get_display_name__returns__barejid_when_nickname_empty), + cmocka_unit_test(roster_get_display_name__returns__barejid_when_not_exists), - cmocka_unit_test_setup_teardown(returns_false_when_chat_session_does_not_exist, + cmocka_unit_test_setup_teardown(chat_session_get__returns__null_when_no_session, init_chat_sessions, close_chat_sessions), - cmocka_unit_test_setup_teardown(creates_chat_session_on_recipient_activity, + cmocka_unit_test_setup_teardown(chat_session_recipient_active__updates__new_session, init_chat_sessions, close_chat_sessions), - cmocka_unit_test_setup_teardown(replaces_chat_session_on_recipient_activity_with_different_resource, + cmocka_unit_test_setup_teardown(chat_session_recipient_active__updates__replace_resource, init_chat_sessions, close_chat_sessions), - cmocka_unit_test_setup_teardown(removes_chat_session, + cmocka_unit_test_setup_teardown(chat_session_remove__updates__session_removed, init_chat_sessions, close_chat_sessions), - cmocka_unit_test_setup_teardown(cmd_connect_shows_message_when_disconnecting, + cmocka_unit_test_setup_teardown(cmd_connect__shows__message_when_disconnecting, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_message_when_connecting, + cmocka_unit_test_setup_teardown(cmd_connect__shows__message_when_connecting, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_message_when_connected, + cmocka_unit_test_setup_teardown(cmd_connect__shows__message_when_connected, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_when_no_account, + cmocka_unit_test_setup_teardown(cmd_connect__tests__no_account, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_fail_message, + cmocka_unit_test_setup_teardown(cmd_connect__shows__fail_message, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_lowercases_argument_with_account, + cmocka_unit_test_setup_teardown(cmd_connect__tests__lowercases_argument_with_account, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_lowercases_argument_with_no_account, + cmocka_unit_test_setup_teardown(cmd_connect__tests__lowercases_argument_with_no_account, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_asks_password_when_not_in_account, + cmocka_unit_test_setup_teardown(cmd_connect__tests__asks_password_when_not_in_account, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_usage_when_no_server_value, + cmocka_unit_test_setup_teardown(cmd_connect__shows__usage_when_no_server_value, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_message_when_connecting_with_account, + cmocka_unit_test_setup_teardown(cmd_connect__shows__message_when_connecting_with_account, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_connects_with_account, + cmocka_unit_test_setup_teardown(cmd_connect__tests__connects_with_account, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_usage_when_server_no_port_value, + cmocka_unit_test_setup_teardown(cmd_connect__shows__usage_when_server_no_port_value, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_usage_when_no_port_value, + cmocka_unit_test_setup_teardown(cmd_connect__shows__usage_when_no_port_value, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_usage_when_port_no_server_value, + cmocka_unit_test_setup_teardown(cmd_connect__shows__usage_when_port_no_server_value, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_message_when_port_0, + cmocka_unit_test_setup_teardown(cmd_connect__shows__message_when_port_0, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_message_when_port_minus1, + cmocka_unit_test_setup_teardown(cmd_connect__shows__message_when_port_minus1, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_message_when_port_65536, + cmocka_unit_test_setup_teardown(cmd_connect__shows__message_when_port_65536, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_message_when_port_contains_chars, + cmocka_unit_test_setup_teardown(cmd_connect__shows__message_when_port_contains_chars, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_with_server_when_provided, + cmocka_unit_test_setup_teardown(cmd_connect__tests__with_server_when_provided, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_with_port_when_provided, + cmocka_unit_test_setup_teardown(cmd_connect__tests__with_port_when_provided, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_with_server_and_port_when_provided, + cmocka_unit_test_setup_teardown(cmd_connect__tests__with_server_and_port_when_provided, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_usage_when_server_provided_twice, + cmocka_unit_test_setup_teardown(cmd_connect__shows__usage_when_server_provided_twice, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_usage_when_port_provided_twice, + cmocka_unit_test_setup_teardown(cmd_connect__shows__usage_when_port_provided_twice, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_usage_when_invalid_first_property, + cmocka_unit_test_setup_teardown(cmd_connect__shows__usage_when_invalid_first_property, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_connect_shows_usage_when_invalid_second_property, + cmocka_unit_test_setup_teardown(cmd_connect__shows__usage_when_invalid_second_property, load_preferences, close_preferences), - cmocka_unit_test(cmd_rooms_shows_message_when_disconnected), - cmocka_unit_test(cmd_rooms_shows_message_when_disconnecting), - cmocka_unit_test(cmd_rooms_shows_message_when_connecting), - cmocka_unit_test(cmd_rooms_uses_account_default_when_no_arg), - cmocka_unit_test(cmd_rooms_service_arg_used_when_passed), - cmocka_unit_test(cmd_rooms_filter_arg_used_when_passed), + cmocka_unit_test(cmd_rooms__shows__message_when_disconnected), + cmocka_unit_test(cmd_rooms__shows__message_when_disconnecting), + cmocka_unit_test(cmd_rooms__shows__message_when_connecting), + cmocka_unit_test(cmd_rooms__tests__account_default_when_no_arg), + cmocka_unit_test(cmd_rooms__tests__service_arg_used_when_passed), + cmocka_unit_test(cmd_rooms__tests__filter_arg_used_when_passed), - cmocka_unit_test(cmd_account_shows_usage_when_not_connected_and_no_args), - cmocka_unit_test(cmd_account_shows_account_when_connected_and_no_args), - cmocka_unit_test(cmd_account_list_shows_accounts), - cmocka_unit_test(cmd_account_show_shows_usage_when_no_arg), - cmocka_unit_test(cmd_account_show_shows_message_when_account_does_not_exist), - cmocka_unit_test(cmd_account_show_shows_account_when_exists), - cmocka_unit_test(cmd_account_add_shows_usage_when_no_arg), - cmocka_unit_test(cmd_account_add_adds_account), - cmocka_unit_test(cmd_account_enable_shows_usage_when_no_arg), - cmocka_unit_test(cmd_account_enable_enables_account), - cmocka_unit_test(cmd_account_enable_shows_message_when_account_doesnt_exist), - cmocka_unit_test(cmd_account_disable_shows_usage_when_no_arg), - cmocka_unit_test(cmd_account_disable_disables_account), - cmocka_unit_test(cmd_account_disable_shows_message_when_account_doesnt_exist), - cmocka_unit_test(cmd_account_rename_shows_usage_when_no_args), - cmocka_unit_test(cmd_account_rename_shows_usage_when_one_arg), - cmocka_unit_test(cmd_account_rename_renames_account), - cmocka_unit_test(cmd_account_rename_shows_message_when_not_renamed), - cmocka_unit_test(cmd_account_set_shows_usage_when_no_args), - cmocka_unit_test(cmd_account_set_shows_usage_when_one_arg), - cmocka_unit_test(cmd_account_set_shows_usage_when_two_args), - cmocka_unit_test(cmd_account_set_shows_message_when_account_doesnt_exist), - cmocka_unit_test(cmd_account_set_jid_shows_message_for_malformed_jid), - cmocka_unit_test(cmd_account_set_jid_sets_barejid), - cmocka_unit_test(cmd_account_set_jid_sets_resource), - cmocka_unit_test(cmd_account_set_server_sets_server), - cmocka_unit_test(cmd_account_set_resource_sets_resource), - cmocka_unit_test(cmd_account_set_resource_sets_resource_with_online_message), - cmocka_unit_test(cmd_account_set_password_sets_password), - cmocka_unit_test(cmd_account_set_eval_password_sets_eval_password), - cmocka_unit_test(cmd_account_set_password_when_eval_password_set), - cmocka_unit_test(cmd_account_set_eval_password_when_password_set), - cmocka_unit_test(cmd_account_set_muc_sets_muc), - cmocka_unit_test(cmd_account_set_nick_sets_nick), + cmocka_unit_test(cmd_account__shows__usage_when_not_connected_and_no_args), + cmocka_unit_test(cmd_account__shows__account_when_connected_and_no_args), + cmocka_unit_test(cmd_account_list__shows__accounts), + cmocka_unit_test(cmd_account_show__shows__usage_when_no_arg), + cmocka_unit_test(cmd_account_show__shows__message_when_account_does_not_exist), + cmocka_unit_test(cmd_account_show__shows__account_when_exists), + cmocka_unit_test(cmd_account_add__shows__usage_when_no_arg), + cmocka_unit_test(cmd_account_add__updates__adds_account), + cmocka_unit_test(cmd_account_enable__shows__usage_when_no_arg), + cmocka_unit_test(cmd_account_enable__updates__enables_account), + cmocka_unit_test(cmd_account_enable__shows__message_when_account_doesnt_exist), + cmocka_unit_test(cmd_account_disable__shows__usage_when_no_arg), + cmocka_unit_test(cmd_account_disable__updates__disables_account), + cmocka_unit_test(cmd_account_disable__shows__message_when_account_doesnt_exist), + cmocka_unit_test(cmd_account_rename__shows__usage_when_no_args), + cmocka_unit_test(cmd_account_rename__shows__usage_when_one_arg), + cmocka_unit_test(cmd_account_rename__updates__renames_account), + cmocka_unit_test(cmd_account_rename__shows__message_when_not_renamed), + cmocka_unit_test(cmd_account_set__shows__usage_when_no_args), + cmocka_unit_test(cmd_account_set__shows__usage_when_one_arg), + cmocka_unit_test(cmd_account_set__shows__usage_when_two_args), + cmocka_unit_test(cmd_account_set__shows__message_when_account_doesnt_exist), + cmocka_unit_test(cmd_account_set__shows__message_for_malformed_jid), + cmocka_unit_test(cmd_account_set__updates__jid_sets_barejid), + cmocka_unit_test(cmd_account_set__updates__jid_sets_resource), + cmocka_unit_test(cmd_account_set__updates__server_sets_server), + cmocka_unit_test(cmd_account_set__updates__resource_sets_resource), + cmocka_unit_test(cmd_account_set__shows__resource_sets_resource_with_online_message), + cmocka_unit_test(cmd_account_set__updates__password_sets_password), + cmocka_unit_test(cmd_account_set__updates__eval_password_sets_eval_password), + cmocka_unit_test(cmd_account_set__shows__password_when_eval_password_set), + cmocka_unit_test(cmd_account_set__shows__eval_password_when_password_set), + cmocka_unit_test(cmd_account_set__updates__muc_sets_muc), + cmocka_unit_test(cmd_account_set__updates__nick_sets_nick), #ifdef HAVE_LIBOTR - cmocka_unit_test(cmd_account_show_message_for_missing_otr_policy), - cmocka_unit_test(cmd_account_show_message_for_invalid_otr_policy), - cmocka_unit_test(cmd_account_set_otr_sets_otr), + cmocka_unit_test(cmd_account_set__shows__message_for_missing_otr_policy), + cmocka_unit_test(cmd_account_set__shows__message_for_invalid_otr_policy), + cmocka_unit_test(cmd_account_set__updates__otr_sets_otr), #endif - cmocka_unit_test(cmd_account_set_status_shows_message_when_invalid_status), - cmocka_unit_test(cmd_account_set_status_sets_status_when_valid), - cmocka_unit_test(cmd_account_set_status_sets_status_when_last), - cmocka_unit_test(cmd_account_set_invalid_presence_string_priority_shows_message), - cmocka_unit_test(cmd_account_set_last_priority_shows_message), - cmocka_unit_test(cmd_account_set_online_priority_sets_preference), - cmocka_unit_test(cmd_account_set_chat_priority_sets_preference), - cmocka_unit_test(cmd_account_set_away_priority_sets_preference), - cmocka_unit_test(cmd_account_set_xa_priority_sets_preference), - cmocka_unit_test(cmd_account_set_dnd_priority_sets_preference), - cmocka_unit_test(cmd_account_set_priority_too_low_shows_message), - cmocka_unit_test(cmd_account_set_priority_too_high_shows_message), - cmocka_unit_test(cmd_account_set_priority_when_not_number_shows_message), - cmocka_unit_test(cmd_account_set_priority_when_empty_shows_message), - cmocka_unit_test(cmd_account_set_priority_updates_presence_when_account_connected_with_presence), - cmocka_unit_test(cmd_account_clear_shows_usage_when_no_args), - cmocka_unit_test(cmd_account_clear_shows_usage_when_one_arg), - cmocka_unit_test(cmd_account_clear_shows_message_when_account_doesnt_exist), - cmocka_unit_test(cmd_account_clear_shows_message_when_invalid_property), + cmocka_unit_test(cmd_account_set__shows__message_when_invalid_status), + cmocka_unit_test(cmd_account_set__updates__status_sets_status_when_valid), + cmocka_unit_test(cmd_account_set__updates__status_sets_status_when_last), + cmocka_unit_test(cmd_account_set__shows__invalid_presence_string_priority_message), + cmocka_unit_test(cmd_account_set__shows__last_priority_message), + cmocka_unit_test(cmd_account_set__updates__online_priority_sets_preference), + cmocka_unit_test(cmd_account_set__updates__chat_priority_sets_preference), + cmocka_unit_test(cmd_account_set__updates__away_priority_sets_preference), + cmocka_unit_test(cmd_account_set__updates__xa_priority_sets_preference), + cmocka_unit_test(cmd_account_set__updates__dnd_priority_sets_preference), + cmocka_unit_test(cmd_account_set__shows__priority_too_low_message), + cmocka_unit_test(cmd_account_set__shows__priority_too_high_message), + cmocka_unit_test(cmd_account_set__shows__priority_when_not_number_message), + cmocka_unit_test(cmd_account_set__shows__priority_when_empty_message), + cmocka_unit_test(cmd_account_set__updates__priority_updates_presence_when_connected), + cmocka_unit_test(cmd_account_clear__shows__usage_when_no_args), + cmocka_unit_test(cmd_account_clear__shows__usage_when_one_arg), + cmocka_unit_test(cmd_account_clear__shows__message_when_account_doesnt_exist), + cmocka_unit_test(cmd_account_clear__shows__message_when_invalid_property), - cmocka_unit_test(cmd_sub_shows_message_when_not_connected), - cmocka_unit_test(cmd_sub_shows_usage_when_no_arg), + cmocka_unit_test(cmd_sub__shows__message_when_not_connected), + cmocka_unit_test(cmd_sub__shows__usage_when_no_arg), - cmocka_unit_test(contact_in_group), - cmocka_unit_test(contact_not_in_group), - cmocka_unit_test(contact_name_when_name_exists), - cmocka_unit_test(contact_jid_when_name_not_exists), - cmocka_unit_test(contact_string_when_name_exists), - cmocka_unit_test(contact_string_when_name_not_exists), - cmocka_unit_test(contact_string_when_default_resource), - cmocka_unit_test(contact_presence_offline), - cmocka_unit_test(contact_presence_uses_highest_priority), - cmocka_unit_test(contact_presence_chat_when_same_prioroty), - cmocka_unit_test(contact_presence_online_when_same_prioroty), - cmocka_unit_test(contact_presence_away_when_same_prioroty), - cmocka_unit_test(contact_presence_xa_when_same_prioroty), - cmocka_unit_test(contact_presence_dnd), - cmocka_unit_test(contact_subscribed_when_to), - cmocka_unit_test(contact_subscribed_when_both), - cmocka_unit_test(contact_not_subscribed_when_from), - cmocka_unit_test(contact_not_subscribed_when_no_subscription_value), - cmocka_unit_test(contact_not_available), - cmocka_unit_test(contact_not_available_when_highest_priority_away), - cmocka_unit_test(contact_not_available_when_highest_priority_xa), - cmocka_unit_test(contact_not_available_when_highest_priority_dnd), - cmocka_unit_test(contact_available_when_highest_priority_online), - cmocka_unit_test(contact_available_when_highest_priority_chat), + cmocka_unit_test(p_contact_in_group__is__true_when_in_group), + cmocka_unit_test(p_contact_in_group__is__false_when_not_in_group), + cmocka_unit_test(p_contact_name_or_jid__returns__name_when_exists), + cmocka_unit_test(p_contact_name_or_jid__returns__jid_when_name_not_exists), + cmocka_unit_test(p_contact_create_display_string__returns__name_and_resource_when_name_exists), + cmocka_unit_test(p_contact_create_display_string__returns__jid_and_resource_when_name_not_exists), + cmocka_unit_test(p_contact_create_display_string__returns__name_when_default_resource), + cmocka_unit_test(p_contact_presence__returns__offline_when_no_resources), + cmocka_unit_test(p_contact_presence__returns__highest_priority_presence), + cmocka_unit_test(p_contact_presence__returns__chat_when_same_priority), + cmocka_unit_test(p_contact_presence__returns__online_when_same_priority), + cmocka_unit_test(p_contact_presence__returns__away_when_same_priority), + cmocka_unit_test(p_contact_presence__returns__xa_when_same_priority), + cmocka_unit_test(p_contact_presence__returns__dnd), + cmocka_unit_test(p_contact_subscribed__is__true_when_to), + cmocka_unit_test(p_contact_subscribed__is__true_when_both), + cmocka_unit_test(p_contact_subscribed__is__false_when_from), + cmocka_unit_test(p_contact_subscribed__is__false_when_no_subscription_value), + cmocka_unit_test(p_contact_is_available__is__false_when_offline), + cmocka_unit_test(p_contact_is_available__is__false_when_highest_priority_away), + cmocka_unit_test(p_contact_is_available__is__false_when_highest_priority_xa), + cmocka_unit_test(p_contact_is_available__is__false_when_highest_priority_dnd), + cmocka_unit_test(p_contact_is_available__is__true_when_highest_priority_online), + cmocka_unit_test(p_contact_is_available__is__true_when_highest_priority_chat), - cmocka_unit_test(cmd_presence_shows_usage_when_bad_subcmd), - cmocka_unit_test(cmd_presence_shows_usage_when_bad_console_setting), - cmocka_unit_test(cmd_presence_shows_usage_when_bad_chat_setting), - cmocka_unit_test(cmd_presence_shows_usage_when_bad_muc_setting), - cmocka_unit_test_setup_teardown(cmd_presence_console_sets_all, + cmocka_unit_test(cmd_presence__shows__usage_when_bad_subcmd), + cmocka_unit_test(cmd_presence__shows__usage_when_bad_console_setting), + cmocka_unit_test(cmd_presence__shows__usage_when_bad_chat_setting), + cmocka_unit_test(cmd_presence__shows__usage_when_bad_muc_setting), + cmocka_unit_test_setup_teardown(cmd_presence__updates__console_all, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_presence_console_sets_online, + cmocka_unit_test_setup_teardown(cmd_presence__updates__console_online, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_presence_console_sets_none, + cmocka_unit_test_setup_teardown(cmd_presence__updates__console_none, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_presence_chat_sets_all, + cmocka_unit_test_setup_teardown(cmd_presence__updates__chat_all, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_presence_chat_sets_online, + cmocka_unit_test_setup_teardown(cmd_presence__updates__chat_online, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_presence_chat_sets_none, + cmocka_unit_test_setup_teardown(cmd_presence__updates__chat_none, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_presence_room_sets_all, + cmocka_unit_test_setup_teardown(cmd_presence__updates__room_all, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_presence_room_sets_online, + cmocka_unit_test_setup_teardown(cmd_presence__updates__room_online, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_presence_room_sets_none, + cmocka_unit_test_setup_teardown(cmd_presence__updates__room_none, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(statuses_console_defaults_to_all, + cmocka_unit_test_setup_teardown(prefs_get_string__returns__all_for_console_default, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(statuses_chat_defaults_to_all, + cmocka_unit_test_setup_teardown(prefs_get_string__returns__none_for_chat_default, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(statuses_muc_defaults_to_all, + cmocka_unit_test_setup_teardown(prefs_get_string__returns__none_for_muc_default, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(console_shows_online_presence_when_set_online, + cmocka_unit_test_setup_teardown(sv_ev_contact_online__shows__presence_in_console_when_set_online, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(console_shows_online_presence_when_set_all, + cmocka_unit_test_setup_teardown(sv_ev_contact_online__shows__presence_in_console_when_set_all, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(console_shows_dnd_presence_when_set_all, + cmocka_unit_test_setup_teardown(sv_ev_contact_online__shows__dnd_presence_in_console_when_set_all, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(handle_offline_removes_chat_session, + cmocka_unit_test_setup_teardown(sv_ev_contact_offline__updates__removes_chat_session, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(lost_connection_clears_chat_sessions, + cmocka_unit_test_setup_teardown(sv_ev_lost_connection__updates__clears_chat_sessions, load_preferences, close_preferences), - cmocka_unit_test(cmd_alias_add_shows_usage_when_no_args), - cmocka_unit_test(cmd_alias_add_shows_usage_when_no_value), - cmocka_unit_test(cmd_alias_remove_shows_usage_when_no_args), - cmocka_unit_test(cmd_alias_show_usage_when_invalid_subcmd), - cmocka_unit_test_setup_teardown(cmd_alias_add_adds_alias, + cmocka_unit_test(cmd_alias__shows__usage_when_add_no_args), + cmocka_unit_test(cmd_alias__shows__usage_when_add_no_value), + cmocka_unit_test(cmd_alias__shows__usage_when_remove_no_args), + cmocka_unit_test(cmd_alias__shows__usage_when_invalid_subcmd), + cmocka_unit_test_setup_teardown(cmd_alias__updates__adds_alias, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_alias_add_shows_message_when_exists, + cmocka_unit_test_setup_teardown(cmd_alias__shows__message_when_add_exists, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_alias_remove_removes_alias, + cmocka_unit_test_setup_teardown(cmd_alias__updates__removes_alias, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_alias_remove_shows_message_when_no_alias, + cmocka_unit_test_setup_teardown(cmd_alias__shows__message_when_remove_no_alias, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_alias_list_shows_all_aliases, + cmocka_unit_test_setup_teardown(cmd_alias__shows__all_aliases, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(test_muc_invites_add, muc_before_test, muc_after_test), - cmocka_unit_test_setup_teardown(test_muc_remove_invite, muc_before_test, muc_after_test), - cmocka_unit_test_setup_teardown(test_muc_invites_count_0, muc_before_test, muc_after_test), - cmocka_unit_test_setup_teardown(test_muc_invites_count_5, muc_before_test, muc_after_test), - cmocka_unit_test_setup_teardown(test_muc_room_is_not_active, muc_before_test, muc_after_test), - cmocka_unit_test_setup_teardown(test_muc_active, muc_before_test, muc_after_test), + cmocka_unit_test_setup_teardown(muc_invites_add__updates__invites_list, muc_before_test, muc_after_test), + cmocka_unit_test_setup_teardown(muc_invites_remove__updates__invites_list, muc_before_test, muc_after_test), + cmocka_unit_test_setup_teardown(muc_invites_count__returns__0_when_no_invites, muc_before_test, muc_after_test), + cmocka_unit_test_setup_teardown(muc_invites_count__returns__5_when_five_invites_added, muc_before_test, muc_after_test), + cmocka_unit_test_setup_teardown(muc_active__is__false_when_not_joined, muc_before_test, muc_after_test), + cmocka_unit_test_setup_teardown(muc_active__is__true_when_joined, muc_before_test, muc_after_test), - cmocka_unit_test(cmd_bookmark_shows_message_when_disconnected), - cmocka_unit_test(cmd_bookmark_shows_message_when_disconnecting), - cmocka_unit_test(cmd_bookmark_shows_message_when_connecting), - cmocka_unit_test(cmd_bookmark_shows_usage_when_no_args), - cmocka_unit_test(cmd_bookmark_list_shows_bookmarks), - cmocka_unit_test(cmd_bookmark_add_shows_message_when_invalid_jid), - cmocka_unit_test(cmd_bookmark_add_adds_bookmark_with_jid), - muc_unit_test(cmd_bookmark_uses_roomjid_in_room), - muc_unit_test(cmd_bookmark_add_uses_roomjid_in_room), - muc_unit_test(cmd_bookmark_add_uses_supplied_jid_in_room), - muc_unit_test(cmd_bookmark_remove_uses_roomjid_in_room), - muc_unit_test(cmd_bookmark_remove_uses_supplied_jid_in_room), - cmocka_unit_test(cmd_bookmark_add_adds_bookmark_with_jid_nick), - cmocka_unit_test(cmd_bookmark_add_adds_bookmark_with_jid_autojoin), - cmocka_unit_test(cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin), - cmocka_unit_test(cmd_bookmark_remove_removes_bookmark), - cmocka_unit_test(cmd_bookmark_remove_shows_message_when_no_bookmark), + cmocka_unit_test(cmd_bookmark__shows__message_when_disconnected), + cmocka_unit_test(cmd_bookmark__shows__message_when_disconnecting), + cmocka_unit_test(cmd_bookmark__shows__message_when_connecting), + cmocka_unit_test(cmd_bookmark__shows__usage_when_no_args), + cmocka_unit_test(cmd_bookmark_list__shows__bookmarks), + cmocka_unit_test(cmd_bookmark_add__shows__message_when_invalid_jid), + cmocka_unit_test(cmd_bookmark_add__updates__bookmark_with_jid), + muc_unit_test(cmd_bookmark__tests__uses_roomjid_in_room), + muc_unit_test(cmd_bookmark_add__tests__uses_roomjid_in_room), + muc_unit_test(cmd_bookmark_add__tests__uses_supplied_jid_in_room), + muc_unit_test(cmd_bookmark_remove__tests__uses_roomjid_in_room), + muc_unit_test(cmd_bookmark_remove__tests__uses_supplied_jid_in_room), + cmocka_unit_test(cmd_bookmark_add__updates__bookmark_with_jid_nick), + cmocka_unit_test(cmd_bookmark_add__updates__bookmark_with_jid_autojoin), + cmocka_unit_test(cmd_bookmark_add__updates__bookmark_with_jid_nick_autojoin), + cmocka_unit_test(cmd_bookmark_remove__updates__removes_bookmark), + cmocka_unit_test(cmd_bookmark_remove__shows__message_when_no_bookmark), #ifdef HAVE_LIBOTR - cmocka_unit_test(cmd_otr_log_shows_usage_when_no_args), - cmocka_unit_test(cmd_otr_log_shows_usage_when_invalid_subcommand), - cmocka_unit_test_setup_teardown(cmd_otr_log_on_enables_logging, + cmocka_unit_test(cmd_otr_log__shows__usage_when_no_args), + cmocka_unit_test(cmd_otr_log__shows__usage_when_invalid_subcommand), + cmocka_unit_test_setup_teardown(cmd_otr_log__updates__enables_logging, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_otr_log_off_disables_logging, + cmocka_unit_test_setup_teardown(cmd_otr_log__updates__disables_logging, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_otr_redact_redacts_logging, + cmocka_unit_test_setup_teardown(cmd_otr_log__updates__redacts_logging, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_otr_log_on_shows_warning_when_chlog_disabled, + cmocka_unit_test_setup_teardown(cmd_otr_log__shows__warning_when_chlog_disabled, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(cmd_otr_log_redact_shows_warning_when_chlog_disabled, + cmocka_unit_test_setup_teardown(cmd_otr_log__shows__redact_warning_when_chlog_disabled, load_preferences, close_preferences), - cmocka_unit_test(cmd_otr_libver_shows_libotr_version), - cmocka_unit_test(cmd_otr_gen_shows_message_when_not_connected), - cmocka_unit_test(cmd_otr_gen_generates_key_for_connected_account), - cmocka_unit_test(cmd_otr_gen_shows_message_when_disconnected), - cmocka_unit_test(cmd_otr_gen_shows_message_when_connecting), - cmocka_unit_test(cmd_otr_gen_shows_message_when_disconnecting), - cmocka_unit_test(cmd_otr_myfp_shows_message_when_disconnected), - cmocka_unit_test(cmd_otr_myfp_shows_message_when_connecting), - cmocka_unit_test(cmd_otr_myfp_shows_message_when_disconnecting), - cmocka_unit_test(cmd_otr_myfp_shows_message_when_no_key), - cmocka_unit_test(cmd_otr_myfp_shows_my_fingerprint), - cmocka_unit_test(cmd_otr_theirfp_shows_message_when_in_console), - cmocka_unit_test(cmd_otr_theirfp_shows_message_when_in_muc), - cmocka_unit_test(cmd_otr_theirfp_shows_message_when_in_private), - cmocka_unit_test(cmd_otr_theirfp_shows_message_when_non_otr_chat_window), - cmocka_unit_test(cmd_otr_theirfp_shows_fingerprint), - cmocka_unit_test(cmd_otr_start_shows_message_when_in_console), - cmocka_unit_test(cmd_otr_start_shows_message_when_in_muc), - cmocka_unit_test(cmd_otr_start_shows_message_when_in_private), - cmocka_unit_test(cmd_otr_start_shows_message_when_already_started), - cmocka_unit_test(cmd_otr_start_shows_message_when_no_key), - cmocka_unit_test_setup_teardown(cmd_otr_start_sends_otr_query_message_to_current_recipeint, + cmocka_unit_test(cmd_otr_libver__shows__libotr_version), + cmocka_unit_test(cmd_otr_gen__shows__message_when_not_connected), + cmocka_unit_test(cmd_otr_gen__tests__generates_key_for_connected_account), + cmocka_unit_test(cmd_otr_gen__shows__message_when_disconnected), + cmocka_unit_test(cmd_otr_gen__shows__message_when_connecting), + cmocka_unit_test(cmd_otr_gen__shows__message_when_disconnecting), + cmocka_unit_test(cmd_otr_myfp__shows__message_when_disconnected), + cmocka_unit_test(cmd_otr_myfp__shows__message_when_connecting), + cmocka_unit_test(cmd_otr_myfp__shows__message_when_disconnecting), + cmocka_unit_test(cmd_otr_myfp__shows__message_when_no_key), + cmocka_unit_test(cmd_otr_myfp__shows__my_fingerprint), + cmocka_unit_test(cmd_otr_theirfp__shows__message_when_in_console), + cmocka_unit_test(cmd_otr_theirfp__shows__message_when_in_muc), + cmocka_unit_test(cmd_otr_theirfp__shows__message_when_in_private), + cmocka_unit_test(cmd_otr_theirfp__shows__message_when_non_otr_chat_window), + cmocka_unit_test(cmd_otr_theirfp__shows__fingerprint), + cmocka_unit_test(cmd_otr_start__shows__message_when_in_console), + cmocka_unit_test(cmd_otr_start__shows__message_when_in_muc), + cmocka_unit_test(cmd_otr_start__shows__message_when_in_private), + cmocka_unit_test(cmd_otr_start__shows__message_when_already_started), + cmocka_unit_test(cmd_otr_start__shows__message_when_no_key), + cmocka_unit_test_setup_teardown(cmd_otr_start__tests__sends_otr_query_message_to_current_recipeint, load_preferences, close_preferences), #else - cmocka_unit_test(cmd_otr_shows_message_when_otr_unsupported), + cmocka_unit_test(cmd_otr__shows__message_when_otr_unsupported), #endif #ifdef HAVE_LIBGPGME - cmocka_unit_test(cmd_pgp_shows_usage_when_no_args), - cmocka_unit_test(cmd_pgp_start_shows_message_when_disconnected), - cmocka_unit_test(cmd_pgp_start_shows_message_when_disconnecting), - cmocka_unit_test(cmd_pgp_start_shows_message_when_connecting), - cmocka_unit_test(cmd_pgp_start_shows_message_when_no_arg_in_console), - cmocka_unit_test(cmd_pgp_start_shows_message_when_no_arg_in_muc), - cmocka_unit_test(cmd_pgp_start_shows_message_when_no_arg_in_conf), - cmocka_unit_test(cmd_pgp_start_shows_message_when_no_arg_in_private), - cmocka_unit_test(cmd_pgp_start_shows_message_when_no_arg_in_xmlconsole), + cmocka_unit_test(cmd_pgp__shows__usage_when_no_args), + cmocka_unit_test(cmd_pgp_start__shows__message_when_disconnected), + cmocka_unit_test(cmd_pgp_start__shows__message_when_disconnecting), + cmocka_unit_test(cmd_pgp_start__shows__message_when_connecting), + cmocka_unit_test(cmd_pgp_start__shows__message_when_no_arg_in_console), + cmocka_unit_test(cmd_pgp_start__shows__message_when_no_arg_in_muc), + cmocka_unit_test(cmd_pgp_start__shows__message_when_no_arg_in_conf), + cmocka_unit_test(cmd_pgp_start__shows__message_when_no_arg_in_private), + cmocka_unit_test(cmd_pgp_start__shows__message_when_no_arg_in_xmlconsole), #else - cmocka_unit_test(cmd_pgp_shows_message_when_pgp_unsupported), + cmocka_unit_test(cmd_pgp__shows__message_when_pgp_unsupported), #endif - cmocka_unit_test(cmd_join_shows_message_when_disconnecting), - cmocka_unit_test(cmd_join_shows_message_when_connecting), - cmocka_unit_test(cmd_join_shows_message_when_disconnected), - cmocka_unit_test(cmd_join_shows_error_message_when_invalid_room_jid), - muc_unit_test(cmd_join_uses_account_mucservice_when_no_service_specified), - muc_unit_test(cmd_join_uses_supplied_nick), - muc_unit_test(cmd_join_uses_account_nick_when_not_supplied), - muc_unit_test(cmd_join_uses_password_when_supplied), + cmocka_unit_test(cmd_join__shows__message_when_disconnecting), + cmocka_unit_test(cmd_join__shows__message_when_connecting), + cmocka_unit_test(cmd_join__shows__message_when_disconnected), + cmocka_unit_test(cmd_join__shows__error_message_when_invalid_room_jid), + muc_unit_test(cmd_join__tests__uses_account_mucservice_when_no_service_specified), + muc_unit_test(cmd_join__tests__uses_supplied_nick), + muc_unit_test(cmd_join__tests__uses_account_nick_when_not_supplied), + muc_unit_test(cmd_join__tests__uses_password_when_supplied), - cmocka_unit_test(cmd_roster_shows_message_when_disconnecting), - cmocka_unit_test(cmd_roster_shows_message_when_connecting), - cmocka_unit_test(cmd_roster_shows_message_when_disconnected), - cmocka_unit_test(cmd_roster_shows_roster_when_no_args), - cmocka_unit_test(cmd_roster_add_shows_message_when_no_jid), - cmocka_unit_test(cmd_roster_add_sends_roster_add_request), - cmocka_unit_test(cmd_roster_remove_shows_message_when_no_jid), - cmocka_unit_test(cmd_roster_remove_sends_roster_remove_request), - cmocka_unit_test(cmd_roster_remove_nickname_sends_roster_remove_request), - cmocka_unit_test(cmd_roster_nick_shows_message_when_no_jid), - cmocka_unit_test(cmd_roster_nick_shows_message_when_no_nick), - cmocka_unit_test(cmd_roster_nick_shows_message_when_no_contact_exists), - cmocka_unit_test(cmd_roster_nick_sends_name_change_request), - cmocka_unit_test(cmd_roster_clearnick_shows_message_when_no_jid), - cmocka_unit_test(cmd_roster_clearnick_shows_message_when_no_contact_exists), - cmocka_unit_test(cmd_roster_clearnick_sends_name_change_request_with_empty_nick), + cmocka_unit_test(cmd_roster__shows__message_when_disconnecting), + cmocka_unit_test(cmd_roster__shows__message_when_connecting), + cmocka_unit_test(cmd_roster__shows__message_when_disconnected), + cmocka_unit_test(cmd_roster__shows__roster_when_no_args), + cmocka_unit_test(cmd_roster__shows__message_when_add_no_jid), + cmocka_unit_test(cmd_roster__tests__add_sends_roster_add_request), + cmocka_unit_test(cmd_roster__shows__message_when_remove_no_jid), + cmocka_unit_test(cmd_roster__tests__remove_sends_roster_remove_request), + cmocka_unit_test(cmd_roster__tests__remove_nickname_sends_roster_remove_request), + cmocka_unit_test(cmd_roster__shows__message_when_nick_no_jid), + cmocka_unit_test(cmd_roster__shows__message_when_nick_no_nick), + cmocka_unit_test(cmd_roster__shows__message_when_nick_no_contact_exists), + cmocka_unit_test(cmd_roster__tests__nick_sends_name_change_request), + cmocka_unit_test(cmd_roster__shows__message_when_clearnick_no_jid), + cmocka_unit_test(cmd_roster__shows__message_when_clearnick_no_contact_exists), + cmocka_unit_test(cmd_roster__tests__clearnick_sends_name_change_request_with_empty_nick), - cmocka_unit_test(get_form_type_field_returns_null_no_fields), - cmocka_unit_test(get_form_type_field_returns_null_when_not_present), - cmocka_unit_test(get_form_type_field_returns_value_when_present), - cmocka_unit_test(get_field_type_returns_unknown_when_no_fields), - cmocka_unit_test(get_field_type_returns_correct_type), - cmocka_unit_test(set_value_adds_when_none), - cmocka_unit_test(set_value_updates_when_one), - cmocka_unit_test(add_unique_value_adds_when_none), - cmocka_unit_test(add_unique_value_does_nothing_when_exists), - cmocka_unit_test(add_unique_value_adds_when_doesnt_exist), - cmocka_unit_test(add_value_adds_when_none), - cmocka_unit_test(add_value_adds_when_some), - cmocka_unit_test(add_value_adds_when_exists), - cmocka_unit_test(remove_value_does_nothing_when_none), - cmocka_unit_test(remove_value_does_nothing_when_doesnt_exist), - cmocka_unit_test(remove_value_removes_when_one), - cmocka_unit_test(remove_value_removes_when_many), - cmocka_unit_test(remove_text_multi_value_does_nothing_when_none), - cmocka_unit_test(remove_text_multi_value_does_nothing_when_doesnt_exist), - cmocka_unit_test(remove_text_multi_value_removes_when_one), - cmocka_unit_test(remove_text_multi_value_removes_when_many), + cmocka_unit_test(form_get_form_type_field__returns__null_no_fields), + cmocka_unit_test(form_get_form_type_field__returns__null_when_not_present), + cmocka_unit_test(form_get_form_type_field__returns__value_when_present), + cmocka_unit_test(form_get_field_type__returns__unknown_when_no_fields), + cmocka_unit_test(form_get_field_type__returns__correct_type), + cmocka_unit_test(form_set_value__updates__adds_when_none), + cmocka_unit_test(form_set_value__updates__updates_when_one), + cmocka_unit_test(form_add_unique_value__updates__adds_when_none), + cmocka_unit_test(form_add_unique_value__updates__does_nothing_when_exists), + cmocka_unit_test(form_add_unique_value__updates__adds_when_doesnt_exist), + cmocka_unit_test(form_add_value__updates__adds_when_none), + cmocka_unit_test(form_add_value__updates__adds_when_some), + cmocka_unit_test(form_add_value__updates__adds_when_exists), + cmocka_unit_test(form_remove_value__updates__does_nothing_when_none), + cmocka_unit_test(form_remove_value__updates__does_nothing_when_doesnt_exist), + cmocka_unit_test(form_remove_value__updates__removes_when_one), + cmocka_unit_test(form_remove_value__updates__removes_when_many), + cmocka_unit_test(form_remove_text_multi_value__updates__does_nothing_when_none), + cmocka_unit_test(form_remove_text_multi_value__updates__does_nothing_when_doesnt_exist), + cmocka_unit_test(form_remove_text_multi_value__updates__removes_when_one), + cmocka_unit_test(form_remove_text_multi_value__updates__removes_when_many), - cmocka_unit_test_setup_teardown(clears_chat_sessions, + cmocka_unit_test_setup_teardown(cmd_disconnect__updates__clears_chat_sessions, load_preferences, close_preferences), - cmocka_unit_test(prof_partial_occurrences_tests), - cmocka_unit_test(prof_whole_occurrences_tests), - cmocka_unit_test(prof_occurrences_of_large_message_tests), - cmocka_unit_test(get_mentions_tests), - cmocka_unit_test(release_is_new_tests), + cmocka_unit_test(prof_occurrences__tests__partial), + cmocka_unit_test(prof_occurrences__tests__whole), + cmocka_unit_test(prof_occurrences__tests__large_message), + cmocka_unit_test(get_mentions__tests__various), + cmocka_unit_test(release_is_new__tests__various), - cmocka_unit_test_setup_teardown(returns_no_commands, + cmocka_unit_test_setup_teardown(plugins_get_command_names__returns__no_commands, load_preferences, close_preferences), - cmocka_unit_test_setup_teardown(returns_commands, + cmocka_unit_test_setup_teardown(plugins_get_command_names__returns__commands_when_added, load_preferences, close_preferences), - cmocka_unit_test(returns_empty_list_when_none), - cmocka_unit_test(returns_added_feature), - cmocka_unit_test(resets_features_on_close), - cmocka_unit_test(returns_all_added_features), - cmocka_unit_test(does_not_add_duplicate_feature), - cmocka_unit_test(removes_plugin_features), - cmocka_unit_test(does_not_remove_feature_when_more_than_one_reference), + cmocka_unit_test(disco_get_features__returns__empty_list_when_none), + cmocka_unit_test(disco_add_feature__updates__added_feature), + cmocka_unit_test(disco_close__updates__resets_features), + cmocka_unit_test(disco_get_features__returns__all_added_features), + cmocka_unit_test(disco_add_feature__updates__not_duplicate_feature), + cmocka_unit_test(disco_remove_features__updates__removes_plugin_features), + cmocka_unit_test(disco_remove_features__updates__not_remove_when_more_than_one_reference), }; return cmocka_run_group_tests(all_tests, NULL, NULL); } diff --git a/tests/unittests/xmpp/test_chat_session.c b/tests/unittests/xmpp/test_chat_session.c index 86ce0743..5ba632d9 100644 --- a/tests/unittests/xmpp/test_chat_session.c +++ b/tests/unittests/xmpp/test_chat_session.c @@ -5,14 +5,14 @@ #include "xmpp/chat_session.h" void -returns_false_when_chat_session_does_not_exist(void** state) +chat_session_get__returns__null_when_no_session(void** state) { ChatSession* session = chat_session_get("somejid@server.org"); assert_null(session); } void -creates_chat_session_on_recipient_activity(void** state) +chat_session_recipient_active__updates__new_session(void** state) { char* barejid = "myjid@server.org"; char* resource = "tablet"; @@ -25,7 +25,7 @@ creates_chat_session_on_recipient_activity(void** state) } void -replaces_chat_session_on_recipient_activity_with_different_resource(void** state) +chat_session_recipient_active__updates__replace_resource(void** state) { char* barejid = "myjid@server.org"; char* resource1 = "tablet"; @@ -39,7 +39,7 @@ replaces_chat_session_on_recipient_activity_with_different_resource(void** state } void -removes_chat_session(void** state) +chat_session_remove__updates__session_removed(void** state) { char* barejid = "myjid@server.org"; char* resource1 = "laptop"; diff --git a/tests/unittests/xmpp/test_chat_session.h b/tests/unittests/xmpp/test_chat_session.h index f2201be8..009f4530 100644 --- a/tests/unittests/xmpp/test_chat_session.h +++ b/tests/unittests/xmpp/test_chat_session.h @@ -1,4 +1,9 @@ -void returns_false_when_chat_session_does_not_exist(void** state); -void creates_chat_session_on_recipient_activity(void** state); -void replaces_chat_session_on_recipient_activity_with_different_resource(void** state); -void removes_chat_session(void** state); +#ifndef TESTS_TEST_CHAT_SESSION_H +#define TESTS_TEST_CHAT_SESSION_H + +void chat_session_get__returns__null_when_no_session(void** state); +void chat_session_recipient_active__updates__new_session(void** state); +void chat_session_recipient_active__updates__replace_resource(void** state); +void chat_session_remove__updates__session_removed(void** state); + +#endif diff --git a/tests/unittests/xmpp/test_contact.c b/tests/unittests/xmpp/test_contact.c index 118ea462..6b538f4f 100644 --- a/tests/unittests/xmpp/test_contact.c +++ b/tests/unittests/xmpp/test_contact.c @@ -6,7 +6,7 @@ #include "xmpp/contact.h" void -contact_in_group(void** state) +p_contact_in_group__is__true_when_in_group(void** state) { GSList* groups = NULL; groups = g_slist_append(groups, g_strdup("somegroup")); @@ -22,7 +22,7 @@ contact_in_group(void** state) } void -contact_not_in_group(void** state) +p_contact_in_group__is__false_when_not_in_group(void** state) { GSList* groups = NULL; groups = g_slist_append(groups, g_strdup("somegroup")); @@ -38,7 +38,7 @@ contact_not_in_group(void** state) } void -contact_name_when_name_exists(void** state) +p_contact_name_or_jid__returns__name_when_exists(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -51,7 +51,7 @@ contact_name_when_name_exists(void** state) } void -contact_jid_when_name_not_exists(void** state) +p_contact_name_or_jid__returns__jid_when_name_not_exists(void** state) { PContact contact = p_contact_new("bob@server.com", NULL, NULL, "both", "is offline", FALSE); @@ -64,7 +64,7 @@ contact_jid_when_name_not_exists(void** state) } void -contact_string_when_name_exists(void** state) +p_contact_create_display_string__returns__name_and_resource_when_name_exists(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -78,7 +78,7 @@ contact_string_when_name_exists(void** state) } void -contact_string_when_name_not_exists(void** state) +p_contact_create_display_string__returns__jid_and_resource_when_name_not_exists(void** state) { PContact contact = p_contact_new("bob@server.com", NULL, NULL, "both", "is offline", FALSE); @@ -92,7 +92,7 @@ contact_string_when_name_not_exists(void** state) } void -contact_string_when_default_resource(void** state) +p_contact_create_display_string__returns__name_when_default_resource(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -106,7 +106,7 @@ contact_string_when_default_resource(void** state) } void -contact_presence_offline(void** state) +p_contact_presence__returns__offline_when_no_resources(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -119,7 +119,7 @@ contact_presence_offline(void** state) } void -contact_presence_uses_highest_priority(void** state) +p_contact_presence__returns__highest_priority_presence(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -143,7 +143,7 @@ contact_presence_uses_highest_priority(void** state) } void -contact_presence_chat_when_same_prioroty(void** state) +p_contact_presence__returns__chat_when_same_priority(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -167,7 +167,7 @@ contact_presence_chat_when_same_prioroty(void** state) } void -contact_presence_online_when_same_prioroty(void** state) +p_contact_presence__returns__online_when_same_priority(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -189,7 +189,7 @@ contact_presence_online_when_same_prioroty(void** state) } void -contact_presence_away_when_same_prioroty(void** state) +p_contact_presence__returns__away_when_same_priority(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -209,7 +209,7 @@ contact_presence_away_when_same_prioroty(void** state) } void -contact_presence_xa_when_same_prioroty(void** state) +p_contact_presence__returns__xa_when_same_priority(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -227,7 +227,7 @@ contact_presence_xa_when_same_prioroty(void** state) } void -contact_presence_dnd(void** state) +p_contact_presence__returns__dnd(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -243,7 +243,7 @@ contact_presence_dnd(void** state) } void -contact_subscribed_when_to(void** state) +p_contact_subscribed__is__true_when_to(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "to", "is offline", FALSE); @@ -256,7 +256,7 @@ contact_subscribed_when_to(void** state) } void -contact_subscribed_when_both(void** state) +p_contact_subscribed__is__true_when_both(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "both", "is offline", FALSE); @@ -269,7 +269,7 @@ contact_subscribed_when_both(void** state) } void -contact_not_subscribed_when_from(void** state) +p_contact_subscribed__is__false_when_from(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, "from", "is offline", FALSE); @@ -282,7 +282,7 @@ contact_not_subscribed_when_from(void** state) } void -contact_not_subscribed_when_no_subscription_value(void** state) +p_contact_subscribed__is__false_when_no_subscription_value(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL, "is offline", FALSE); @@ -295,7 +295,7 @@ contact_not_subscribed_when_no_subscription_value(void** state) } void -contact_not_available(void** state) +p_contact_is_available__is__false_when_offline(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL, "is offline", FALSE); @@ -308,7 +308,7 @@ contact_not_available(void** state) } void -contact_not_available_when_highest_priority_away(void** state) +p_contact_is_available__is__false_when_highest_priority_away(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL, "is offline", FALSE); @@ -332,7 +332,7 @@ contact_not_available_when_highest_priority_away(void** state) } void -contact_not_available_when_highest_priority_xa(void** state) +p_contact_is_available__is__false_when_highest_priority_xa(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL, "is offline", FALSE); @@ -356,7 +356,7 @@ contact_not_available_when_highest_priority_xa(void** state) } void -contact_not_available_when_highest_priority_dnd(void** state) +p_contact_is_available__is__false_when_highest_priority_dnd(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL, "is offline", FALSE); @@ -380,7 +380,7 @@ contact_not_available_when_highest_priority_dnd(void** state) } void -contact_available_when_highest_priority_online(void** state) +p_contact_is_available__is__true_when_highest_priority_online(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL, "is offline", FALSE); @@ -404,7 +404,7 @@ contact_available_when_highest_priority_online(void** state) } void -contact_available_when_highest_priority_chat(void** state) +p_contact_is_available__is__true_when_highest_priority_chat(void** state) { PContact contact = p_contact_new("bob@server.com", "bob", NULL, NULL, "is offline", FALSE); diff --git a/tests/unittests/xmpp/test_contact.h b/tests/unittests/xmpp/test_contact.h index 605573ea..f68293e4 100644 --- a/tests/unittests/xmpp/test_contact.h +++ b/tests/unittests/xmpp/test_contact.h @@ -1,24 +1,29 @@ -void contact_in_group(void** state); -void contact_not_in_group(void** state); -void contact_name_when_name_exists(void** state); -void contact_jid_when_name_not_exists(void** state); -void contact_string_when_name_exists(void** state); -void contact_string_when_name_not_exists(void** state); -void contact_string_when_default_resource(void** state); -void contact_presence_offline(void** state); -void contact_presence_uses_highest_priority(void** state); -void contact_presence_chat_when_same_prioroty(void** state); -void contact_presence_online_when_same_prioroty(void** state); -void contact_presence_away_when_same_prioroty(void** state); -void contact_presence_xa_when_same_prioroty(void** state); -void contact_presence_dnd(void** state); -void contact_subscribed_when_to(void** state); -void contact_subscribed_when_both(void** state); -void contact_not_subscribed_when_from(void** state); -void contact_not_subscribed_when_no_subscription_value(void** state); -void contact_not_available(void** state); -void contact_not_available_when_highest_priority_away(void** state); -void contact_not_available_when_highest_priority_xa(void** state); -void contact_not_available_when_highest_priority_dnd(void** state); -void contact_available_when_highest_priority_online(void** state); -void contact_available_when_highest_priority_chat(void** state); +#ifndef TESTS_TEST_CONTACT_H +#define TESTS_TEST_CONTACT_H + +void p_contact_in_group__is__true_when_in_group(void** state); +void p_contact_in_group__is__false_when_not_in_group(void** state); +void p_contact_name_or_jid__returns__name_when_exists(void** state); +void p_contact_name_or_jid__returns__jid_when_name_not_exists(void** state); +void p_contact_create_display_string__returns__name_and_resource_when_name_exists(void** state); +void p_contact_create_display_string__returns__jid_and_resource_when_name_not_exists(void** state); +void p_contact_create_display_string__returns__name_when_default_resource(void** state); +void p_contact_presence__returns__offline_when_no_resources(void** state); +void p_contact_presence__returns__highest_priority_presence(void** state); +void p_contact_presence__returns__chat_when_same_priority(void** state); +void p_contact_presence__returns__online_when_same_priority(void** state); +void p_contact_presence__returns__away_when_same_priority(void** state); +void p_contact_presence__returns__xa_when_same_priority(void** state); +void p_contact_presence__returns__dnd(void** state); +void p_contact_subscribed__is__true_when_to(void** state); +void p_contact_subscribed__is__true_when_both(void** state); +void p_contact_subscribed__is__false_when_from(void** state); +void p_contact_subscribed__is__false_when_no_subscription_value(void** state); +void p_contact_is_available__is__false_when_offline(void** state); +void p_contact_is_available__is__false_when_highest_priority_away(void** state); +void p_contact_is_available__is__false_when_highest_priority_xa(void** state); +void p_contact_is_available__is__false_when_highest_priority_dnd(void** state); +void p_contact_is_available__is__true_when_highest_priority_online(void** state); +void p_contact_is_available__is__true_when_highest_priority_chat(void** state); + +#endif diff --git a/tests/unittests/xmpp/test_form.c b/tests/unittests/xmpp/test_form.c index 2f6b70eb..103512be 100644 --- a/tests/unittests/xmpp/test_form.c +++ b/tests/unittests/xmpp/test_form.c @@ -42,7 +42,7 @@ _new_field(void) } void -get_form_type_field_returns_null_no_fields(void** state) +form_get_form_type_field__returns__null_no_fields(void** state) { DataForm* form = _new_form(); @@ -54,7 +54,7 @@ get_form_type_field_returns_null_no_fields(void** state) } void -get_form_type_field_returns_null_when_not_present(void** state) +form_get_form_type_field__returns__null_when_not_present(void** state) { DataForm* form = _new_form(); FormField* field = _new_field(); @@ -70,7 +70,7 @@ get_form_type_field_returns_null_when_not_present(void** state) } void -get_form_type_field_returns_value_when_present(void** state) +form_get_form_type_field__returns__value_when_present(void** state) { DataForm* form = _new_form(); @@ -97,7 +97,7 @@ get_form_type_field_returns_value_when_present(void** state) } void -get_field_type_returns_unknown_when_no_fields(void** state) +form_get_field_type__returns__unknown_when_no_fields(void** state) { DataForm* form = _new_form(); @@ -109,7 +109,7 @@ get_field_type_returns_unknown_when_no_fields(void** state) } void -get_field_type_returns_correct_type(void** state) +form_get_field_type__returns__correct_type(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -135,7 +135,7 @@ get_field_type_returns_correct_type(void** state) } void -set_value_adds_when_none(void** state) +form_set_value__updates__adds_when_none(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -174,7 +174,7 @@ set_value_adds_when_none(void** state) } void -set_value_updates_when_one(void** state) +form_set_value__updates__updates_when_one(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -213,7 +213,7 @@ set_value_updates_when_one(void** state) } void -add_unique_value_adds_when_none(void** state) +form_add_unique_value__updates__adds_when_none(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -253,7 +253,7 @@ add_unique_value_adds_when_none(void** state) } void -add_unique_value_does_nothing_when_exists(void** state) +form_add_unique_value__updates__does_nothing_when_exists(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -294,7 +294,7 @@ add_unique_value_does_nothing_when_exists(void** state) } void -add_unique_value_adds_when_doesnt_exist(void** state) +form_add_unique_value__updates__adds_when_doesnt_exist(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -343,7 +343,7 @@ add_unique_value_adds_when_doesnt_exist(void** state) } void -add_value_adds_when_none(void** state) +form_add_value__updates__adds_when_none(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -375,7 +375,7 @@ add_value_adds_when_none(void** state) } void -add_value_adds_when_some(void** state) +form_add_value__updates__adds_when_some(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -416,7 +416,7 @@ add_value_adds_when_some(void** state) } void -add_value_adds_when_exists(void** state) +form_add_value__updates__adds_when_exists(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -458,7 +458,7 @@ add_value_adds_when_exists(void** state) } void -remove_value_does_nothing_when_none(void** state) +form_remove_value__updates__does_nothing_when_none(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -487,7 +487,7 @@ remove_value_does_nothing_when_none(void** state) } void -remove_value_does_nothing_when_doesnt_exist(void** state) +form_remove_value__updates__does_nothing_when_doesnt_exist(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -529,7 +529,7 @@ remove_value_does_nothing_when_doesnt_exist(void** state) } void -remove_value_removes_when_one(void** state) +form_remove_value__updates__removes_when_one(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -559,7 +559,7 @@ remove_value_removes_when_one(void** state) } void -remove_value_removes_when_many(void** state) +form_remove_value__updates__removes_when_many(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -601,7 +601,7 @@ remove_value_removes_when_many(void** state) } void -remove_text_multi_value_does_nothing_when_none(void** state) +form_remove_text_multi_value__updates__does_nothing_when_none(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -630,7 +630,7 @@ remove_text_multi_value_does_nothing_when_none(void** state) } void -remove_text_multi_value_does_nothing_when_doesnt_exist(void** state) +form_remove_text_multi_value__updates__does_nothing_when_doesnt_exist(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -672,7 +672,7 @@ remove_text_multi_value_does_nothing_when_doesnt_exist(void** state) } void -remove_text_multi_value_removes_when_one(void** state) +form_remove_text_multi_value__updates__removes_when_one(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); @@ -702,7 +702,7 @@ remove_text_multi_value_removes_when_one(void** state) } void -remove_text_multi_value_removes_when_many(void** state) +form_remove_text_multi_value__updates__removes_when_many(void** state) { DataForm* form = _new_form(); g_hash_table_insert(form->tag_to_var, g_strdup("tag1"), g_strdup("var1")); diff --git a/tests/unittests/xmpp/test_form.h b/tests/unittests/xmpp/test_form.h index a7ae04c5..432b9898 100644 --- a/tests/unittests/xmpp/test_form.h +++ b/tests/unittests/xmpp/test_form.h @@ -1,21 +1,26 @@ -void get_form_type_field_returns_null_no_fields(void** state); -void get_form_type_field_returns_null_when_not_present(void** state); -void get_form_type_field_returns_value_when_present(void** state); -void get_field_type_returns_unknown_when_no_fields(void** state); -void get_field_type_returns_correct_type(void** state); -void set_value_adds_when_none(void** state); -void set_value_updates_when_one(void** state); -void add_unique_value_adds_when_none(void** state); -void add_unique_value_does_nothing_when_exists(void** state); -void add_unique_value_adds_when_doesnt_exist(void** state); -void add_value_adds_when_none(void** state); -void add_value_adds_when_some(void** state); -void add_value_adds_when_exists(void** state); -void remove_value_does_nothing_when_none(void** state); -void remove_value_does_nothing_when_doesnt_exist(void** state); -void remove_value_removes_when_one(void** state); -void remove_value_removes_when_many(void** state); -void remove_text_multi_value_does_nothing_when_none(void** state); -void remove_text_multi_value_does_nothing_when_doesnt_exist(void** state); -void remove_text_multi_value_removes_when_one(void** state); -void remove_text_multi_value_removes_when_many(void** state); +#ifndef TESTS_TEST_FORM_H +#define TESTS_TEST_FORM_H + +void form_get_form_type_field__returns__null_no_fields(void** state); +void form_get_form_type_field__returns__null_when_not_present(void** state); +void form_get_form_type_field__returns__value_when_present(void** state); +void form_get_field_type__returns__unknown_when_no_fields(void** state); +void form_get_field_type__returns__correct_type(void** state); +void form_set_value__updates__adds_when_none(void** state); +void form_set_value__updates__updates_when_one(void** state); +void form_add_unique_value__updates__adds_when_none(void** state); +void form_add_unique_value__updates__does_nothing_when_exists(void** state); +void form_add_unique_value__updates__adds_when_doesnt_exist(void** state); +void form_add_value__updates__adds_when_none(void** state); +void form_add_value__updates__adds_when_some(void** state); +void form_add_value__updates__adds_when_exists(void** state); +void form_remove_value__updates__does_nothing_when_none(void** state); +void form_remove_value__updates__does_nothing_when_doesnt_exist(void** state); +void form_remove_value__updates__removes_when_one(void** state); +void form_remove_value__updates__removes_when_many(void** state); +void form_remove_text_multi_value__updates__does_nothing_when_none(void** state); +void form_remove_text_multi_value__updates__does_nothing_when_doesnt_exist(void** state); +void form_remove_text_multi_value__updates__removes_when_one(void** state); +void form_remove_text_multi_value__updates__removes_when_many(void** state); + +#endif diff --git a/tests/unittests/xmpp/test_jid.c b/tests/unittests/xmpp/test_jid.c index 6c472d0f..51f66f08 100644 --- a/tests/unittests/xmpp/test_jid.c +++ b/tests/unittests/xmpp/test_jid.c @@ -4,21 +4,21 @@ #include "xmpp/jid.h" void -create_jid_from_null_returns_null(void** state) +jid_create__returns__null_from_null(void** state) { Jid* result = jid_create(NULL); assert_null(result); } void -create_jid_from_empty_string_returns_null(void** state) +jid_create__returns__null_from_empty_string(void** state) { Jid* result = jid_create(""); assert_null(result); } void -create_jid_from_full_returns_full(void** state) +jid_create__returns__full_from_full(void** state) { Jid* result = jid_create("myuser@mydomain/laptop"); assert_string_equal("myuser@mydomain/laptop", result->fulljid); @@ -26,7 +26,7 @@ create_jid_from_full_returns_full(void** state) } void -create_jid_from_full_returns_bare(void** state) +jid_create__returns__bare_from_full(void** state) { Jid* result = jid_create("myuser@mydomain/laptop"); assert_string_equal("myuser@mydomain", result->barejid); @@ -34,7 +34,7 @@ create_jid_from_full_returns_bare(void** state) } void -create_jid_from_full_returns_resourcepart(void** state) +jid_create__returns__resourcepart_from_full(void** state) { Jid* result = jid_create("myuser@mydomain/laptop"); assert_string_equal("laptop", result->resourcepart); @@ -42,7 +42,7 @@ create_jid_from_full_returns_resourcepart(void** state) } void -create_jid_from_full_returns_localpart(void** state) +jid_create__returns__localpart_from_full(void** state) { Jid* result = jid_create("myuser@mydomain/laptop"); assert_string_equal("myuser", result->localpart); @@ -50,7 +50,7 @@ create_jid_from_full_returns_localpart(void** state) } void -create_jid_from_full_returns_domainpart(void** state) +jid_create__returns__domainpart_from_full(void** state) { Jid* result = jid_create("myuser@mydomain/laptop"); assert_string_equal("mydomain", result->domainpart); @@ -58,7 +58,7 @@ create_jid_from_full_returns_domainpart(void** state) } void -create_jid_from_full_nolocal_returns_full(void** state) +jid_create__returns__full_from_full_nolocal(void** state) { Jid* result = jid_create("mydomain/laptop"); assert_string_equal("mydomain/laptop", result->fulljid); @@ -66,7 +66,7 @@ create_jid_from_full_nolocal_returns_full(void** state) } void -create_jid_from_full_nolocal_returns_bare(void** state) +jid_create__returns__bare_from_full_nolocal(void** state) { Jid* result = jid_create("mydomain/laptop"); assert_string_equal("mydomain", result->barejid); @@ -74,7 +74,7 @@ create_jid_from_full_nolocal_returns_bare(void** state) } void -create_jid_from_full_nolocal_returns_resourcepart(void** state) +jid_create__returns__resourcepart_from_full_nolocal(void** state) { Jid* result = jid_create("mydomain/laptop"); assert_string_equal("laptop", result->resourcepart); @@ -82,7 +82,7 @@ create_jid_from_full_nolocal_returns_resourcepart(void** state) } void -create_jid_from_full_nolocal_returns_domainpart(void** state) +jid_create__returns__domainpart_from_full_nolocal(void** state) { Jid* result = jid_create("mydomain/laptop"); assert_string_equal("mydomain", result->domainpart); @@ -90,7 +90,7 @@ create_jid_from_full_nolocal_returns_domainpart(void** state) } void -create_jid_from_full_nolocal_returns_null_localpart(void** state) +jid_create__returns__null_localpart_from_full_nolocal(void** state) { Jid* result = jid_create("mydomain/laptop"); assert_null(result->localpart); @@ -98,7 +98,7 @@ create_jid_from_full_nolocal_returns_null_localpart(void** state) } void -create_jid_from_bare_returns_null_full(void** state) +jid_create__returns__null_full_from_bare(void** state) { Jid* result = jid_create("myuser@mydomain"); assert_null(result->fulljid); @@ -106,7 +106,7 @@ create_jid_from_bare_returns_null_full(void** state) } void -create_jid_from_bare_returns_null_resource(void** state) +jid_create__returns__null_resource_from_bare(void** state) { Jid* result = jid_create("myuser@mydomain"); assert_null(result->resourcepart); @@ -114,7 +114,7 @@ create_jid_from_bare_returns_null_resource(void** state) } void -create_jid_from_bare_returns_bare(void** state) +jid_create__returns__bare_from_bare(void** state) { Jid* result = jid_create("myuser@mydomain"); assert_string_equal("myuser@mydomain", result->barejid); @@ -122,7 +122,7 @@ create_jid_from_bare_returns_bare(void** state) } void -create_jid_from_bare_returns_localpart(void** state) +jid_create__returns__localpart_from_bare(void** state) { Jid* result = jid_create("myuser@mydomain"); assert_string_equal("myuser", result->localpart); @@ -130,7 +130,7 @@ create_jid_from_bare_returns_localpart(void** state) } void -create_jid_from_bare_returns_domainpart(void** state) +jid_create__returns__domainpart_from_bare(void** state) { Jid* result = jid_create("myuser@mydomain"); assert_string_equal("mydomain", result->domainpart); @@ -138,7 +138,7 @@ create_jid_from_bare_returns_domainpart(void** state) } void -create_room_jid_returns_room(void** state) +jid_create_from_bare_and_resource__returns__room(void** state) { Jid* result = jid_create_from_bare_and_resource("room@conference.domain.org", "myname"); @@ -147,7 +147,7 @@ create_room_jid_returns_room(void** state) } void -create_room_jid_returns_nick(void** state) +jid_create_from_bare_and_resource__returns__nick(void** state) { Jid* result = jid_create_from_bare_and_resource("room@conference.domain.org", "myname"); @@ -156,7 +156,7 @@ create_room_jid_returns_nick(void** state) } void -create_with_slash_in_resource(void** state) +jid_create__returns__correct_parts_with_slash_in_resource(void** state) { Jid* result = jid_create("room@conference.domain.org/my/nick"); @@ -170,7 +170,7 @@ create_with_slash_in_resource(void** state) } void -create_with_at_in_resource(void** state) +jid_create__returns__correct_parts_with_at_in_resource(void** state) { Jid* result = jid_create("room@conference.domain.org/my@nick"); @@ -184,7 +184,7 @@ create_with_at_in_resource(void** state) } void -create_with_at_and_slash_in_resource(void** state) +jid_create__returns__correct_parts_with_at_and_slash_in_resource(void** state) { Jid* result = jid_create("room@conference.domain.org/my@nick/something"); @@ -198,7 +198,7 @@ create_with_at_and_slash_in_resource(void** state) } void -create_full_with_trailing_slash(void** state) +jid_create__returns__correct_parts_with_trailing_slash(void** state) { Jid* result = jid_create("room@conference.domain.org/nick/"); @@ -212,7 +212,7 @@ create_full_with_trailing_slash(void** state) } void -returns_fulljid_when_exists(void** state) +jid_fulljid_or_barejid__returns__fulljid_when_exists(void** state) { Jid* jid = jid_create("localpart@domainpart/resourcepart"); @@ -224,7 +224,7 @@ returns_fulljid_when_exists(void** state) } void -returns_barejid_when_fulljid_not_exists(void** state) +jid_fulljid_or_barejid__returns__barejid_when_fulljid_not_exists(void** state) { Jid* jid = jid_create("localpart@domainpart"); diff --git a/tests/unittests/xmpp/test_jid.h b/tests/unittests/xmpp/test_jid.h index 000b820a..4afccf23 100644 --- a/tests/unittests/xmpp/test_jid.h +++ b/tests/unittests/xmpp/test_jid.h @@ -1,25 +1,30 @@ -void create_jid_from_null_returns_null(void** state); -void create_jid_from_empty_string_returns_null(void** state); -void create_jid_from_full_returns_full(void** state); -void create_jid_from_full_returns_bare(void** state); -void create_jid_from_full_returns_resourcepart(void** state); -void create_jid_from_full_returns_localpart(void** state); -void create_jid_from_full_returns_domainpart(void** state); -void create_jid_from_full_nolocal_returns_full(void** state); -void create_jid_from_full_nolocal_returns_bare(void** state); -void create_jid_from_full_nolocal_returns_resourcepart(void** state); -void create_jid_from_full_nolocal_returns_domainpart(void** state); -void create_jid_from_full_nolocal_returns_null_localpart(void** state); -void create_jid_from_bare_returns_null_full(void** state); -void create_jid_from_bare_returns_null_resource(void** state); -void create_jid_from_bare_returns_bare(void** state); -void create_jid_from_bare_returns_localpart(void** state); -void create_jid_from_bare_returns_domainpart(void** state); -void create_room_jid_returns_room(void** state); -void create_room_jid_returns_nick(void** state); -void create_with_slash_in_resource(void** state); -void create_with_at_in_resource(void** state); -void create_with_at_and_slash_in_resource(void** state); -void create_full_with_trailing_slash(void** state); -void returns_fulljid_when_exists(void** state); -void returns_barejid_when_fulljid_not_exists(void** state); +#ifndef TESTS_TEST_JID_H +#define TESTS_TEST_JID_H + +void jid_create__returns__null_from_null(void** state); +void jid_create__returns__null_from_empty_string(void** state); +void jid_create__returns__full_from_full(void** state); +void jid_create__returns__bare_from_full(void** state); +void jid_create__returns__resourcepart_from_full(void** state); +void jid_create__returns__localpart_from_full(void** state); +void jid_create__returns__domainpart_from_full(void** state); +void jid_create__returns__full_from_full_nolocal(void** state); +void jid_create__returns__bare_from_full_nolocal(void** state); +void jid_create__returns__resourcepart_from_full_nolocal(void** state); +void jid_create__returns__domainpart_from_full_nolocal(void** state); +void jid_create__returns__null_localpart_from_full_nolocal(void** state); +void jid_create__returns__null_full_from_bare(void** state); +void jid_create__returns__null_resource_from_bare(void** state); +void jid_create__returns__bare_from_bare(void** state); +void jid_create__returns__localpart_from_bare(void** state); +void jid_create__returns__domainpart_from_bare(void** state); +void jid_create_from_bare_and_resource__returns__room(void** state); +void jid_create_from_bare_and_resource__returns__nick(void** state); +void jid_create__returns__correct_parts_with_slash_in_resource(void** state); +void jid_create__returns__correct_parts_with_at_in_resource(void** state); +void jid_create__returns__correct_parts_with_at_and_slash_in_resource(void** state); +void jid_create__returns__correct_parts_with_trailing_slash(void** state); +void jid_fulljid_or_barejid__returns__fulljid_when_exists(void** state); +void jid_fulljid_or_barejid__returns__barejid_when_fulljid_not_exists(void** state); + +#endif diff --git a/tests/unittests/xmpp/test_muc.c b/tests/unittests/xmpp/test_muc.c index bf396619..38ad7e1f 100644 --- a/tests/unittests/xmpp/test_muc.c +++ b/tests/unittests/xmpp/test_muc.c @@ -20,7 +20,7 @@ muc_after_test(void** state) } void -test_muc_invites_add(void** state) +muc_invites_add__updates__invites_list(void** state) { char* room = "room@conf.server"; muc_invites_add(room, NULL); @@ -31,7 +31,7 @@ test_muc_invites_add(void** state) } void -test_muc_remove_invite(void** state) +muc_invites_remove__updates__invites_list(void** state) { char* room = "room@conf.server"; muc_invites_add(room, NULL); @@ -43,7 +43,7 @@ test_muc_remove_invite(void** state) } void -test_muc_invites_count_0(void** state) +muc_invites_count__returns__0_when_no_invites(void** state) { int invite_count = muc_invites_count(); @@ -51,7 +51,7 @@ test_muc_invites_count_0(void** state) } void -test_muc_invites_count_5(void** state) +muc_invites_count__returns__5_when_five_invites_added(void** state) { muc_invites_add("room1@conf.server", NULL); muc_invites_add("room2@conf.server", NULL); @@ -65,7 +65,7 @@ test_muc_invites_count_5(void** state) } void -test_muc_room_is_not_active(void** state) +muc_active__is__false_when_not_joined(void** state) { char* room = "room@server.org"; @@ -75,7 +75,7 @@ test_muc_room_is_not_active(void** state) } void -test_muc_active(void** state) +muc_active__is__true_when_joined(void** state) { char* room = "room@server.org"; char* nick = "bob"; diff --git a/tests/unittests/xmpp/test_muc.h b/tests/unittests/xmpp/test_muc.h index df89d6d1..431c3457 100644 --- a/tests/unittests/xmpp/test_muc.h +++ b/tests/unittests/xmpp/test_muc.h @@ -1,9 +1,14 @@ +#ifndef TESTS_TEST_MUC_H +#define TESTS_TEST_MUC_H + int muc_before_test(void** state); int muc_after_test(void** state); -void test_muc_invites_add(void** state); -void test_muc_remove_invite(void** state); -void test_muc_invites_count_0(void** state); -void test_muc_invites_count_5(void** state); -void test_muc_room_is_not_active(void** state); -void test_muc_active(void** state); +void muc_invites_add__updates__invites_list(void** state); +void muc_invites_remove__updates__invites_list(void** state); +void muc_invites_count__returns__0_when_no_invites(void** state); +void muc_invites_count__returns__5_when_five_invites_added(void** state); +void muc_active__is__false_when_not_joined(void** state); +void muc_active__is__true_when_joined(void** state); + +#endif diff --git a/tests/unittests/xmpp/test_roster_list.c b/tests/unittests/xmpp/test_roster_list.c index cc28063b..8eacfe78 100644 --- a/tests/unittests/xmpp/test_roster_list.c +++ b/tests/unittests/xmpp/test_roster_list.c @@ -7,7 +7,7 @@ #include "xmpp/roster_list.h" void -empty_list_when_none_added(void** state) +roster_get_contacts__returns__empty_list_when_none_added(void** state) { roster_create(); GSList* list = roster_get_contacts(ROSTER_ORD_NAME); @@ -18,7 +18,7 @@ empty_list_when_none_added(void** state) } void -contains_one_element(void** state) +roster_get_contacts__returns__one_element(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -30,7 +30,7 @@ contains_one_element(void** state) } void -first_element_correct(void** state) +roster_get_contacts__returns__correct_first_element(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -44,7 +44,7 @@ first_element_correct(void** state) } void -contains_two_elements(void** state) +roster_get_contacts__returns__two_elements(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -58,7 +58,7 @@ contains_two_elements(void** state) } void -first_and_second_elements_correct(void** state) +roster_get_contacts__returns__correct_first_and_second_elements(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -76,7 +76,7 @@ first_and_second_elements_correct(void** state) } void -contains_three_elements(void** state) +roster_get_contacts__returns__three_elements(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -91,7 +91,7 @@ contains_three_elements(void** state) } void -first_three_elements_correct(void** state) +roster_get_contacts__returns__correct_first_three_elements(void** state) { roster_create(); roster_add("Bob", NULL, NULL, NULL, FALSE); @@ -111,7 +111,7 @@ first_three_elements_correct(void** state) } void -add_twice_at_beginning_adds_once(void** state) +roster_add__updates__adds_once_when_called_twice_at_beginning(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -133,7 +133,7 @@ add_twice_at_beginning_adds_once(void** state) } void -add_twice_in_middle_adds_once(void** state) +roster_add__updates__adds_once_when_called_twice_in_middle(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -155,7 +155,7 @@ add_twice_in_middle_adds_once(void** state) } void -add_twice_at_end_adds_once(void** state) +roster_add__updates__adds_once_when_called_twice_at_end(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -177,7 +177,7 @@ add_twice_at_end_adds_once(void** state) } void -find_first_exists(void** state) +roster_contact_autocomplete__returns__first_exists(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -194,7 +194,7 @@ find_first_exists(void** state) } void -find_second_exists(void** state) +roster_contact_autocomplete__returns__second_exists(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -208,7 +208,7 @@ find_second_exists(void** state) } void -find_third_exists(void** state) +roster_contact_autocomplete__returns__third_exists(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -222,7 +222,7 @@ find_third_exists(void** state) } void -find_returns_null(void** state) +roster_contact_autocomplete__returns__null_when_no_match(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -235,7 +235,7 @@ find_returns_null(void** state) } void -find_on_empty_returns_null(void** state) +roster_contact_autocomplete__returns__null_on_empty_roster(void** state) { roster_create(); char* result = roster_contact_autocomplete("James", FALSE, NULL); @@ -244,7 +244,7 @@ find_on_empty_returns_null(void** state) } void -find_twice_returns_second_when_two_match(void** state) +roster_contact_autocomplete__returns__second_when_two_match(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -260,7 +260,7 @@ find_twice_returns_second_when_two_match(void** state) } void -find_five_times_finds_fifth(void** state) +roster_contact_autocomplete__returns__fifth_when_multiple_match(void** state) { roster_create(); roster_add("Jama", NULL, NULL, NULL, FALSE); @@ -289,7 +289,7 @@ find_five_times_finds_fifth(void** state) } void -find_twice_returns_first_when_two_match_and_reset(void** state) +roster_contact_autocomplete__returns__first_when_two_match_and_reset(void** state) { roster_create(); roster_add("James", NULL, NULL, NULL, FALSE); @@ -306,7 +306,7 @@ find_twice_returns_first_when_two_match_and_reset(void** state) } void -add_contact_with_no_group(void** state) +roster_get_groups__returns__empty_for_no_group(void** state) { roster_create(); roster_add("person@server.org", NULL, NULL, NULL, FALSE); @@ -319,7 +319,7 @@ add_contact_with_no_group(void** state) } void -add_contact_with_group(void** state) +roster_get_groups__returns__one_group(void** state) { roster_create(); @@ -339,7 +339,7 @@ add_contact_with_group(void** state) } void -add_contact_with_two_groups(void** state) +roster_get_groups__returns__two_groups(void** state) { roster_create(); @@ -363,7 +363,7 @@ add_contact_with_two_groups(void** state) } void -add_contact_with_three_groups(void** state) +roster_get_groups__returns__three_groups(void** state) { roster_create(); @@ -391,7 +391,7 @@ add_contact_with_three_groups(void** state) } void -add_contact_with_three_groups_update_adding_two(void** state) +roster_update__updates__adding_two_groups(void** state) { roster_create(); @@ -433,7 +433,7 @@ add_contact_with_three_groups_update_adding_two(void** state) } void -add_contact_with_three_groups_update_removing_one(void** state) +roster_update__updates__removing_one_group(void** state) { roster_create(); @@ -463,7 +463,7 @@ add_contact_with_three_groups_update_removing_one(void** state) } void -add_contact_with_three_groups_update_removing_two(void** state) +roster_update__updates__removing_two_groups(void** state) { roster_create(); @@ -489,7 +489,7 @@ add_contact_with_three_groups_update_removing_two(void** state) } void -add_contact_with_three_groups_update_removing_three(void** state) +roster_update__updates__removing_three_groups(void** state) { roster_create(); @@ -509,7 +509,7 @@ add_contact_with_three_groups_update_removing_three(void** state) } void -add_contact_with_three_groups_update_two_new(void** state) +roster_update__updates__two_new_groups(void** state) { roster_create(); @@ -537,7 +537,7 @@ add_contact_with_three_groups_update_two_new(void** state) } void -add_remove_contact_groups(void** state) +roster_remove__updates__contact_groups(void** state) { roster_create(); @@ -557,7 +557,7 @@ add_remove_contact_groups(void** state) } void -add_contacts_with_different_groups(void** state) +roster_add__updates__different_groups(void** state) { roster_create(); @@ -591,7 +591,7 @@ add_contacts_with_different_groups(void** state) } void -add_contacts_with_same_groups(void** state) +roster_add__updates__same_groups(void** state) { roster_create(); @@ -622,7 +622,7 @@ add_contacts_with_same_groups(void** state) } void -add_contacts_with_overlapping_groups(void** state) +roster_add__updates__overlapping_groups(void** state) { roster_create(); @@ -655,7 +655,7 @@ add_contacts_with_overlapping_groups(void** state) } void -remove_contact_with_remaining_in_group(void** state) +roster_remove__updates__remaining_in_group(void** state) { roster_create(); @@ -688,7 +688,7 @@ remove_contact_with_remaining_in_group(void** state) } void -get_contact_display_name(void** state) +roster_get_display_name__returns__nickname_when_exists(void** state) { roster_create(); roster_add("person@server.org", "nickname", NULL, NULL, FALSE); @@ -699,7 +699,7 @@ get_contact_display_name(void** state) } void -get_contact_display_name_is_barejid_if_name_is_empty(void** state) +roster_get_display_name__returns__barejid_when_nickname_empty(void** state) { roster_create(); roster_add("person@server.org", NULL, NULL, NULL, FALSE); @@ -710,7 +710,7 @@ get_contact_display_name_is_barejid_if_name_is_empty(void** state) } void -get_contact_display_name_is_passed_barejid_if_contact_does_not_exist(void** state) +roster_get_display_name__returns__barejid_when_not_exists(void** state) { roster_create(); diff --git a/tests/unittests/xmpp/test_roster_list.h b/tests/unittests/xmpp/test_roster_list.h index 81983d46..378ff275 100644 --- a/tests/unittests/xmpp/test_roster_list.h +++ b/tests/unittests/xmpp/test_roster_list.h @@ -1,35 +1,40 @@ -void empty_list_when_none_added(void** state); -void contains_one_element(void** state); -void first_element_correct(void** state); -void contains_two_elements(void** state); -void first_and_second_elements_correct(void** state); -void contains_three_elements(void** state); -void first_three_elements_correct(void** state); -void add_twice_at_beginning_adds_once(void** state); -void add_twice_in_middle_adds_once(void** state); -void add_twice_at_end_adds_once(void** state); -void find_first_exists(void** state); -void find_second_exists(void** state); -void find_third_exists(void** state); -void find_returns_null(void** state); -void find_on_empty_returns_null(void** state); -void find_twice_returns_second_when_two_match(void** state); -void find_five_times_finds_fifth(void** state); -void find_twice_returns_first_when_two_match_and_reset(void** state); -void add_contact_with_no_group(void** state); -void add_contact_with_group(void** state); -void add_contact_with_two_groups(void** state); -void add_contact_with_three_groups(void** state); -void add_contact_with_three_groups_update_adding_two(void** state); -void add_contact_with_three_groups_update_removing_one(void** state); -void add_contact_with_three_groups_update_removing_two(void** state); -void add_contact_with_three_groups_update_removing_three(void** state); -void add_contact_with_three_groups_update_two_new(void** state); -void add_remove_contact_groups(void** state); -void add_contacts_with_different_groups(void** state); -void add_contacts_with_same_groups(void** state); -void add_contacts_with_overlapping_groups(void** state); -void remove_contact_with_remaining_in_group(void** state); -void get_contact_display_name(void** state); -void get_contact_display_name_is_barejid_if_name_is_empty(void** state); -void get_contact_display_name_is_passed_barejid_if_contact_does_not_exist(void** state); +#ifndef TESTS_TEST_ROSTER_LIST_H +#define TESTS_TEST_ROSTER_LIST_H + +void roster_get_contacts__returns__empty_list_when_none_added(void** state); +void roster_get_contacts__returns__one_element(void** state); +void roster_get_contacts__returns__correct_first_element(void** state); +void roster_get_contacts__returns__two_elements(void** state); +void roster_get_contacts__returns__correct_first_and_second_elements(void** state); +void roster_get_contacts__returns__three_elements(void** state); +void roster_get_contacts__returns__correct_first_three_elements(void** state); +void roster_add__updates__adds_once_when_called_twice_at_beginning(void** state); +void roster_add__updates__adds_once_when_called_twice_in_middle(void** state); +void roster_add__updates__adds_once_when_called_twice_at_end(void** state); +void roster_contact_autocomplete__returns__first_exists(void** state); +void roster_contact_autocomplete__returns__second_exists(void** state); +void roster_contact_autocomplete__returns__third_exists(void** state); +void roster_contact_autocomplete__returns__null_when_no_match(void** state); +void roster_contact_autocomplete__returns__null_on_empty_roster(void** state); +void roster_contact_autocomplete__returns__second_when_two_match(void** state); +void roster_contact_autocomplete__returns__fifth_when_multiple_match(void** state); +void roster_contact_autocomplete__returns__first_when_two_match_and_reset(void** state); +void roster_get_groups__returns__empty_for_no_group(void** state); +void roster_get_groups__returns__one_group(void** state); +void roster_get_groups__returns__two_groups(void** state); +void roster_get_groups__returns__three_groups(void** state); +void roster_update__updates__adding_two_groups(void** state); +void roster_update__updates__removing_one_group(void** state); +void roster_update__updates__removing_two_groups(void** state); +void roster_update__updates__removing_three_groups(void** state); +void roster_update__updates__two_new_groups(void** state); +void roster_remove__updates__contact_groups(void** state); +void roster_add__updates__different_groups(void** state); +void roster_add__updates__same_groups(void** state); +void roster_add__updates__overlapping_groups(void** state); +void roster_remove__updates__remaining_in_group(void** state); +void roster_get_display_name__returns__nickname_when_exists(void** state); +void roster_get_display_name__returns__barejid_when_nickname_empty(void** state); +void roster_get_display_name__returns__barejid_when_not_exists(void** state); + +#endif