Refactor: libcrmcommon: Reduce output test setup/teardown duplication

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

Author: nrwahl2

include/crm/common/unittest_internal.h

@@ -139,6 +139,8 @@ void pcmk__cib_test_cleanup(char *out_path);
 void pcmk__test_init_logging(const char *name, const char *filename);
 
 pcmk__output_t *pcmk__mk_fake_text_output(char **argv);
+int pcmk__output_test_setup_group(void **state);
+int pcmk__output_test_teardown_group(void **state);
 void pcmk__set_fake_text_init_succeeds(bool value);
 void pcmk__set_testing_output_free(bool value);
 void pcmk__set_testing_output_and_clear_error(bool value);

lib/common/tests/output/pcmk__call_message_test.c

@@ -41,20 +41,6 @@ message_fn_2(pcmk__output_t *out, va_list args)
     return pcmk_rc_ok;
 }
 
-static int
-setup(void **state)
-{
-    pcmk__register_format(NULL, "text", pcmk__mk_fake_text_output, NULL);
-    return 0;
-}
-
-static int
-teardown(void **state)
-{
-    pcmk__unregister_formats();
-    return 0;
-}
-
 static void
 no_such_message(void **state)
 {
@@ -132,7 +118,7 @@ default_called(void **state)
     pcmk__output_free(out);
 }
 
-PCMK__UNIT_TEST(setup, teardown,
+PCMK__UNIT_TEST(pcmk__output_test_setup_group, pcmk__output_test_teardown_group,
                 cmocka_unit_test(no_such_message),
                 cmocka_unit_test(message_return_value),
                 cmocka_unit_test(wrong_format),

lib/common/tests/output/pcmk__output_and_clear_error_test.c

@@ -19,14 +19,14 @@ static int
 setup(void **state)
 {
     pcmk__set_testing_output_and_clear_error(true);
-    pcmk__register_format(NULL, "text", pcmk__mk_fake_text_output, NULL);
+    pcmk__output_test_setup_group(state);
     return 0;
 }
 
 static int
 teardown(void **state)
 {
-    pcmk__unregister_formats();
+    pcmk__output_test_teardown_group(state);
     pcmk__set_testing_output_and_clear_error(false);
     return 0;
 }

lib/common/tests/output/pcmk__output_free_test.c

@@ -23,14 +23,14 @@ static int
 setup(void **state)
 {
     pcmk__set_testing_output_free(true);
-    pcmk__register_format(NULL, "text", pcmk__mk_fake_text_output, NULL);
+    pcmk__output_test_setup_group(state);
     return 0;
 }
 
 static int
 teardown(void **state)
 {
-    pcmk__unregister_formats();
+    pcmk__output_test_teardown_group(state);
     pcmk__set_testing_output_free(false);
     return 0;
 }

lib/common/tests/output/pcmk__output_new_test.c

@@ -15,20 +15,6 @@
 
 #include "mock_private.h"
 
-static int
-setup(void **state)
-{
-    pcmk__register_format(NULL, "text", pcmk__mk_fake_text_output, NULL);
-    return 0;
-}
-
-static int
-teardown(void **state)
-{
-    pcmk__unregister_formats();
-    return 0;
-}
-
 static void
 empty_formatters(void **state)
 {
@@ -131,7 +117,7 @@ no_fmt_name_given(void **state)
     pcmk__output_free(out);
 }
 
-PCMK__UNIT_TEST(setup, teardown,
+PCMK__UNIT_TEST(pcmk__output_test_setup_group, pcmk__output_test_teardown_group,
                 cmocka_unit_test(empty_formatters),
                 cmocka_unit_test(invalid_params),
                 cmocka_unit_test(no_such_format),

lib/common/tests/output/pcmk__register_message_test.c

@@ -27,20 +27,6 @@ null_message_fn_2(pcmk__output_t *out, va_list args)
     return pcmk_rc_ok;
 }
 
-static int
-setup(void **state)
-{
-    pcmk__register_format(NULL, "text", pcmk__mk_fake_text_output, NULL);
-    return 0;
-}
-
-static int
-teardown(void **state)
-{
-    pcmk__unregister_formats();
-    return 0;
-}
-
 static void
 null_params(void **state)
 {
@@ -83,6 +69,6 @@ add_message(void **state)
     pcmk__output_free(out);
 }
 
-PCMK__UNIT_TEST(setup, teardown,
+PCMK__UNIT_TEST(pcmk__output_test_setup_group, pcmk__output_test_teardown_group,
                 cmocka_unit_test(null_params),
                 cmocka_unit_test(add_message))

lib/common/tests/output/pcmk__register_messages_test.c

@@ -27,20 +27,6 @@ null_message_fn_2(pcmk__output_t *out, va_list args)
     return pcmk_rc_ok;
 }
 
-static int
-setup(void **state)
-{
-    pcmk__register_format(NULL, "text", pcmk__mk_fake_text_output, NULL);
-    return 0;
-}
-
-static int
-teardown(void **state)
-{
-    pcmk__unregister_formats();
-    return 0;
-}
-
 static void
 invalid_entries(void **state)
 {
@@ -172,7 +158,7 @@ override_default_handler(void **state)
     pcmk__output_free(out);
 }
 
-PCMK__UNIT_TEST(setup, teardown,
+PCMK__UNIT_TEST(pcmk__output_test_setup_group, pcmk__output_test_teardown_group,
                 cmocka_unit_test(invalid_entries),
                 cmocka_unit_test(valid_entries),
                 cmocka_unit_test(duplicate_message_ids),

lib/common/unittest.c

@@ -224,6 +224,20 @@ pcmk__mk_fake_text_output(char **argv)
     return retval;
 }
 
+int
+pcmk__output_test_setup_group(void **state)
+{
+    pcmk__register_format(NULL, "text", pcmk__mk_fake_text_output, NULL);
+    return 0;
+}
+
+int
+pcmk__output_test_teardown_group(void **state)
+{
+    pcmk__unregister_formats();
+    return 0;
+}
+
 void
 pcmk__set_fake_text_init_succeeds(bool value)
 {