Implement new output functionality

3 files changed, 324 insertions, 3 deletions

diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 31d79df6..9be94f6d 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -8,9 +8,9 @@ check_PROGRAMS = @EXTRA_TEST@
 AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
         -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
-EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3
+EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3 test_generic_output
 
-np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t
+np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t test_generic_output.t
 np_test_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini
 EXTRA_DIST = $(np_test_scripts) $(np_test_files) var
 
@@ -29,7 +29,7 @@ AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
 AM_LDFLAGS = $(tap_ldflags) -ltap
 LDADD = $(top_srcdir)/lib/libmonitoringplug.a $(top_srcdir)/gl/libgnu.a $(LIB_CRYPTO)
 
-SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c
+SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c test_generic_output.c
 
 test: ${noinst_PROGRAMS}
         perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
diff --git a/lib/tests/test_generic_output.c b/lib/tests/test_generic_output.c
new file mode 100644
index 00000000..e67aefc9
--- /dev/null
+++ b/lib/tests/test_generic_output.c
@@ -0,0 +1,315 @@
+#include "../lib/output.h"
+#include "../../tap/tap.h"
+#include "./states.h"
+
+#include <string.h>
+
+void test_one_subcheck(void);
+void test_two_subchecks(void);
+
+void test_perfdata_formatting(void);
+void test_perfdata_formatting2(void);
+
+void test_deep_check_hierarchy(void);
+void test_deep_check_hierarchy2(void);
+
+void test_default_states1(void);
+void test_default_states2(void);
+
+int main(void) {
+        plan_tests(19);
+
+        diag("Simple test with one subcheck");
+        test_one_subcheck();
+
+        diag("Test with two subchecks");
+        test_two_subchecks();
+
+        diag("Test for performance data formatting");
+        test_perfdata_formatting();
+
+        diag("Another test for performance data formatting");
+        test_perfdata_formatting2();
+
+        diag("Test for deeper hierarchies");
+        test_deep_check_hierarchy();
+
+        diag("Another test for deeper hierarchies");
+        test_deep_check_hierarchy2();
+
+        diag("Testing the default state logic");
+        test_default_states1();
+
+        diag("Testing the default state logic #2");
+        test_default_states2();
+
+        return exit_status();
+}
+
+void test_one_subcheck(void) {
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        mp_check check = mp_check_init();
+        mp_add_subcheck_to_check(&check, sc1);
+
+        ok(mp_compute_check_state(check) == STATE_WARNING, "Main state should be warning");
+
+        char *output = mp_fmt_output(check);
+
+        // diag("Formatted output");
+        // diag(output);
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n";
+
+        // diag("Expected output");
+        // diag(expected);
+
+        ok(strcmp(output, expected) == 0, "Simple output test");
+}
+
+void test_perfdata_formatting2(void) {
+        mp_perfdata pd1 = perfdata_init();
+        mp_perfdata pd2 = perfdata_init();
+
+        pd1.label = "foo";
+        pd2.label = "bar";
+
+        pd1 = mp_set_pd_value(pd1, 23);
+        pd2 = mp_set_pd_value(pd2, 1LL);
+
+        pd_list *tmp = pd_list_init();
+
+        pd_list_append(tmp, pd1);
+        pd_list_append(tmp, pd2);
+
+        char *result = pd_list_to_string(*tmp);
+
+        ok(strcmp(result, "foo=23;;; bar=1;;;") == 0, "Perfdata string formatting");
+}
+
+void test_perfdata_formatting(void) {
+        mp_perfdata pd1 = perfdata_init();
+
+        pd1.uom = "s";
+        pd1.label = "foo";
+
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        char *pd_string = pd_to_string(pd1);
+
+        ok(strcmp(pd_string, "foo=23s;;;") == 0, "Perfdata string formatting");
+}
+
+void test_two_subchecks(void) {
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        ok(mp_compute_subcheck_state(sc1) == STATE_WARNING, "Test subcheck state directly after setting it");
+
+        mp_perfdata pd1 = perfdata_init();
+
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        pd1.uom = "s";
+        pd1.label = "foo";
+
+        mp_add_perfdata_to_subcheck(&sc1, pd1);
+
+        mp_subcheck sc2 = mp_subcheck_init();
+        sc2.output = "baz";
+        sc2 = mp_set_subcheck_state(sc2, STATE_OK);
+
+        ok(mp_compute_subcheck_state(sc2) == STATE_OK, "Test subcheck 2 state after setting it");
+
+        mp_add_subcheck_to_subcheck(&sc1, sc2);
+
+        ok(mp_compute_subcheck_state(sc1) == STATE_WARNING, "Test subcheck state after adding a subcheck");
+
+        mp_check check = mp_check_init();
+        mp_add_subcheck_to_check(&check, sc1);
+
+        ok(mp_compute_check_state(check) == STATE_WARNING, "Test main check result");
+
+        char *output = mp_fmt_output(check);
+
+        // diag("Formatted output. Length: %u", strlen(output));
+        // diag(output);
+
+        ok(output != NULL, "Output should not be NULL");
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n"
+                                          "\t\t\\_[OK] - baz\n"
+                                          "|foo=23s;;; \n";
+
+        // diag("Expected output. Length: %u", strlen(expected));
+        // diag(expected);
+
+        ok(strcmp(output, expected) == 0, "Output is as expected");
+}
+
+void test_deep_check_hierarchy(void) {
+        // level 4
+        mp_subcheck sc4 = mp_subcheck_init();
+        sc4.output = "level4";
+        sc4 = mp_set_subcheck_state(sc4, STATE_OK);
+
+        // level 3
+        mp_subcheck sc3 = mp_subcheck_init();
+        sc3.output = "level3";
+        sc3 = mp_set_subcheck_state(sc3, STATE_OK);
+
+        // level 2
+        mp_subcheck sc2 = mp_subcheck_init();
+        sc2.output = "baz";
+        sc2 = mp_set_subcheck_state(sc2, STATE_OK);
+
+        // level 1
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        mp_perfdata pd1 = perfdata_init();
+
+        pd1.uom = "s";
+        pd1.label = "foo";
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        mp_add_perfdata_to_subcheck(&sc1, pd1);
+
+        // main check
+        mp_check check = mp_check_init();
+
+        mp_add_subcheck_to_subcheck(&sc3, sc4);
+        mp_add_subcheck_to_subcheck(&sc2, sc3);
+        mp_add_subcheck_to_subcheck(&sc1, sc2);
+        mp_add_subcheck_to_check(&check, sc1);
+
+        char *output = mp_fmt_output(check);
+
+        size_t output_length = strlen(output);
+
+        // diag("Formatted output of length %i", output_length);
+        // diag(output);
+
+        ok(output != NULL, "Output should not be NULL");
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n"
+                                          "\t\t\\_[OK] - baz\n"
+                                          "\t\t\t\\_[OK] - level3\n"
+                                          "\t\t\t\t\\_[OK] - level4\n"
+                                          "|foo=23s;;; \n";
+
+        size_t expected_length = strlen(expected);
+
+        // diag("Expected output of length: %i", expected_length);
+        // diag(expected);
+
+        ok(output_length == expected_length, "Outputs are of equal length");
+        ok(strcmp(output, expected) == 0, "Output is as expected");
+}
+
+void test_deep_check_hierarchy2(void) {
+        // level 1
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        mp_perfdata pd1 = perfdata_init();
+        pd1.uom = "s";
+        pd1.label = "foo";
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        mp_add_perfdata_to_subcheck(&sc1, pd1);
+
+        // level 2
+        mp_subcheck sc2 = mp_subcheck_init();
+        sc2.output = "baz";
+        sc2 = mp_set_subcheck_state(sc2, STATE_OK);
+
+        mp_perfdata pd2 = perfdata_init();
+        pd2.uom = "B";
+        pd2.label = "baz";
+        pd2 = mp_set_pd_value(pd2, 1024);
+        mp_add_perfdata_to_subcheck(&sc2, pd2);
+
+        // level 3
+        mp_subcheck sc3 = mp_subcheck_init();
+        sc3.output = "level3";
+        sc3 = mp_set_subcheck_state(sc3, STATE_OK);
+
+        mp_perfdata pd3 = perfdata_init();
+        pd3.label = "floatMe";
+        pd3 = mp_set_pd_value(pd3, 1024.1024);
+        mp_add_perfdata_to_subcheck(&sc3, pd3);
+
+        // level 4
+        mp_subcheck sc4 = mp_subcheck_init();
+        sc4.output = "level4";
+        sc4 = mp_set_subcheck_state(sc4, STATE_OK);
+
+        mp_check check = mp_check_init();
+
+        mp_add_subcheck_to_subcheck(&sc3, sc4);
+        mp_add_subcheck_to_subcheck(&sc2, sc3);
+        mp_add_subcheck_to_subcheck(&sc1, sc2);
+        mp_add_subcheck_to_check(&check, sc1);
+
+        char *output = mp_fmt_output(check);
+
+        // diag("Formatted output of length: %i", strlen(output));
+        // diag(output);
+
+        ok(output != NULL, "Output should not be NULL");
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n"
+                                          "\t\t\\_[OK] - baz\n"
+                                          "\t\t\t\\_[OK] - level3\n"
+                                          "\t\t\t\t\\_[OK] - level4\n"
+                                          "|foo=23s;;; baz=1024B;;; floatMe=1024.102400;;; \n";
+
+        // diag("Expected output of length: %i", strlen(expected));
+        // diag(expected);
+
+        ok(strcmp(output, expected) == 0, "Output is as expected");
+}
+
+void test_default_states1(void) {
+        mp_subcheck sc = mp_subcheck_init();
+
+        mp_state_enum state1 = mp_compute_subcheck_state(sc);
+        ok(state1 == STATE_UNKNOWN, "Default default state is Unknown");
+
+        sc = mp_set_subcheck_default_state(sc, STATE_CRITICAL);
+
+        mp_state_enum state2 = mp_compute_subcheck_state(sc);
+        ok(state2 == STATE_CRITICAL, "Default state is Critical");
+
+        sc = mp_set_subcheck_state(sc, STATE_OK);
+
+        mp_state_enum state3 = mp_compute_subcheck_state(sc);
+        ok(state3 == STATE_OK, "Default state is Critical");
+}
+
+void test_default_states2(void) {
+        mp_check check = mp_check_init();
+
+        mp_subcheck sc = mp_subcheck_init();
+        sc.output = "placeholder";
+        sc = mp_set_subcheck_default_state(sc, STATE_CRITICAL);
+
+        mp_add_subcheck_to_check(&check, sc);
+
+        mp_state_enum result_state = mp_compute_check_state(check);
+        ok(result_state == STATE_CRITICAL, "Derived state is the proper default state");
+}
diff --git a/lib/tests/test_generic_output.t b/lib/tests/test_generic_output.t
new file mode 100644
index 00000000..48c2ddf4
--- /dev/null
+++ b/lib/tests/test_generic_output.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_generic_output") {
+        plan skip_all => "./test_generic_output not compiled - please enable libtap library to test";
+}
+exec "./test_generic_output";