Refactor test setup and teardown functions

This commit is contained in:
James Booth
2014-02-16 18:07:41 +00:00
parent e1fe7783c0
commit 6ef1174bf4
3 changed files with 69 additions and 37 deletions

View File

@@ -313,64 +313,64 @@ int main(int argc, char* argv[]) {
unit_test(cmd_statuses_shows_usage_when_bad_chat_setting),
unit_test(cmd_statuses_shows_usage_when_bad_muc_setting),
unit_test_setup_teardown(cmd_statuses_console_sets_all,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_console_sets_online,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_console_sets_none,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_chat_sets_all,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_chat_sets_online,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_chat_sets_none,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_muc_sets_on,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_statuses_muc_sets_off,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(statuses_console_defaults_to_all,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(statuses_chat_defaults_to_all,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(statuses_muc_defaults_to_on,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(console_doesnt_show_online_presence_when_set_none,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(console_shows_online_presence_when_set_online,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(console_shows_online_presence_when_set_all,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(console_doesnt_show_dnd_presence_when_set_none,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(console_doesnt_show_dnd_presence_when_set_online,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(console_shows_dnd_presence_when_set_all,
init_preferences,
load_preferences,
close_preferences),
unit_test(handle_message_error_when_no_recipient),
unit_test_setup_teardown(handle_message_error_when_recipient_cancel,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(handle_message_error_when_recipient_cancel_disables_chat_session,
init_preferences,
load_preferences,
close_preferences),
unit_test(handle_message_error_when_recipient_and_no_type),
unit_test(handle_presence_error_when_no_recipient),
@@ -384,19 +384,19 @@ int main(int argc, char* argv[]) {
unit_test(cmd_alias_remove_shows_usage_when_no_args),
unit_test(cmd_alias_show_usage_when_invalid_subcmd),
unit_test_setup_teardown(cmd_alias_add_adds_alias,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_alias_add_shows_message_when_exists,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_alias_remove_removes_alias,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_alias_remove_shows_message_when_no_alias,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_alias_list_shows_all_aliases,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(test_muc_add_invite, muc_before_test, muc_after_test),
@@ -433,27 +433,27 @@ int main(int argc, char* argv[]) {
unit_test(cmd_otr_log_shows_usage_when_no_args),
unit_test(cmd_otr_log_shows_usage_when_invalid_subcommand),
unit_test_setup_teardown(cmd_otr_log_on_enables_logging,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_otr_log_off_disables_logging,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_otr_redact_redacts_logging,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_otr_log_on_shows_warning_when_chlog_disabled,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_otr_log_redact_shows_warning_when_chlog_disabled,
init_preferences,
load_preferences,
close_preferences),
unit_test(cmd_otr_warn_shows_usage_when_no_args),
unit_test(cmd_otr_warn_shows_usage_when_invalid_arg),
unit_test_setup_teardown(cmd_otr_warn_on_enables_unencrypted_warning,
init_preferences,
load_preferences,
close_preferences),
unit_test_setup_teardown(cmd_otr_warn_off_disables_unencrypted_warning,
init_preferences,
load_preferences,
close_preferences),
unit_test(cmd_otr_libver_shows_libotr_version),
#else