Clearly defined thresholds & ranges in docs. Added get_status routine. Added

set_thresholds routine. Tests enhanced to check new routines


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1304 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 56 insertions, 21 deletions

diff --git a/plugins/tests/test_utils.c b/plugins/tests/test_utils.c
index 1fda3675..5604bacd 100644
--- a/plugins/tests/test_utils.c
+++ b/plugins/tests/test_utils.c
@@ -29,77 +29,112 @@ const char *progname = "utils";
 int
 main (int argc, char **argv)
 {
-        threshold *range;
-        double temp;
+        range   *range;
+        double  temp;
+        thresholds *thresholds;
+        int     rc;
 
-        plan_tests(40);
+        plan_tests(66);
 
-        range = parse_threshold("6");
-        ok( range != NULL, "'6' is valid threshold");
+        range = parse_range_string("6");
+        ok( range != NULL, "'6' is valid range");
         ok( range->start == 0, "Start correct");
         ok( range->start_infinity == FALSE, "Not using negative infinity");
         ok( range->end == 6, "End correct");
         ok( range->end_infinity == FALSE, "Not using infinity");
         free(range);
 
-        range = parse_threshold("-7:23");
-        ok( range != NULL, "'-7:23' is valid threshold");
+        range = parse_range_string("-7:23");
+        ok( range != NULL, "'-7:23' is valid range");
         ok( range->start == -7, "Start correct");
         ok( range->start_infinity == FALSE, "Not using negative infinity");
         ok( range->end == 23, "End correct");
         ok( range->end_infinity == FALSE, "Not using infinity");
         free(range);
 
-        range = parse_threshold(":5.75");
-        ok( range != NULL, "':5.75' is valid threshold");
+        range = parse_range_string(":5.75");
+        ok( range != NULL, "':5.75' is valid range");
         ok( range->start == 0, "Start correct");
         ok( range->start_infinity == FALSE, "Not using negative infinity");
         ok( range->end == 5.75, "End correct");
         ok( range->end_infinity == FALSE, "Not using infinity");
         free(range);
 
-        range = parse_threshold("~:-95.99");
-        ok( range != NULL, "~:-95.99' is valid threshold");
+        range = parse_range_string("~:-95.99");
+        ok( range != NULL, "~:-95.99' is valid range");
         ok( range->start_infinity == TRUE, "Using negative infinity");
         ok( range->end == -95.99, "End correct (with rounding errors)");
         ok( range->end_infinity == FALSE, "Not using infinity");
         free(range);
 
-        range = parse_threshold("12345678901234567890:");
+        range = parse_range_string("12345678901234567890:");
         temp = atof("12345678901234567890");            /* Can't just use this because number too large */
-        ok( range != NULL, "'12345678901234567890:' is valid threshold");
+        ok( range != NULL, "'12345678901234567890:' is valid range");
         ok( range->start == temp, "Start correct");
         ok( range->start_infinity == FALSE, "Not using negative infinity");
         ok( range->end_infinity == TRUE, "Using infinity");
+        /* Cannot do a "-1" on temp, as it appears to be same value */
+        ok( check_range(temp/1.1, range) == TRUE, "12345678901234567890/1.1 - alert");
+        ok( check_range(temp, range) == FALSE, "12345678901234567890 - no alert");
+        ok( check_range(temp*2, range) == FALSE, "12345678901234567890*2 - no alert");
         free(range);
 
-        range = parse_threshold("~:0");
-        ok( range != NULL, "'~:0' is valid threshold");
+        range = parse_range_string("~:0");
+        ok( range != NULL, "'~:0' is valid range");
         ok( range->start_infinity == TRUE, "Using negative infinity");
         ok( range->end == 0, "End correct");
         ok( range->end_infinity == FALSE, "Not using infinity");
         ok( range->alert_on == OUTSIDE, "Will alert on outside of this range");
+        ok( check_range(0.5, range) == TRUE, "0.5 - alert");
+        ok( check_range(-10, range) == FALSE, "-10 - no alert");
+        ok( check_range(0, range)   == FALSE, "0 - no alert");
         free(range);
         
-        range = parse_threshold("@0:657.8210567");
-        ok( range != 0, "@0:657.8210567' is a valid threshold");
+        range = parse_range_string("@0:657.8210567");
+        ok( range != 0, "@0:657.8210567' is a valid range");
         ok( range->start == 0, "Start correct");
         ok( range->start_infinity == FALSE, "Not using negative infinity");
         ok( range->end == 657.8210567, "End correct");
         ok( range->end_infinity == FALSE, "Not using infinity");
         ok( range->alert_on == INSIDE, "Will alert on inside of this range" );
+        ok( check_range(32.88, range) == TRUE, "32.88 - alert");
+        ok( check_range(-2, range)    == FALSE, "-2 - no alert");
+        ok( check_range(657.8210567, range) == TRUE, "657.8210567 - alert");
+        ok( check_range(0, range)     == TRUE, "0 - alert");
         free(range);
 
-        range = parse_threshold("1:1");
-        ok( range != NULL, "'1:1' is a valid threshold");
+        range = parse_range_string("1:1");
+        ok( range != NULL, "'1:1' is a valid range");
         ok( range->start == 1, "Start correct");
         ok( range->start_infinity == FALSE, "Not using negative infinity");
         ok( range->end == 1, "End correct");
         ok( range->end_infinity == FALSE, "Not using infinity");
+        ok( check_range(0.5, range) == TRUE, "0.5 - alert");
+        ok( check_range(1, range) == FALSE, "1 - no alert");
+        ok( check_range(5.2, range) == TRUE, "5.2 - alert");
         free(range);
 
-        range = parse_threshold("2:1");
-        ok( range == NULL, "''2:1' rejected");
+        range = parse_range_string("2:1");
+        ok( range == NULL, "'2:1' rejected");
+
+        rc = _set_thresholds(&thresholds, NULL, "80");
+        ok( rc == 0, "Thresholds (NULL, '80') set");
+        ok( thresholds->warning == NULL, "Warning not set");
+        ok( thresholds->critical->end == 80, "Critical set correctly");
+
+        rc = _set_thresholds(&thresholds, "5:33", NULL);
+        ok( rc == 0, "Thresholds ('5:33', NULL) set");
+        ok( thresholds->warning->start == 5, "Warning start set");
+        ok( thresholds->warning->end == 33, "Warning end set");
+        ok( thresholds->critical == NULL, "Critical not set");
+
+        rc = _set_thresholds(&thresholds, "30", "60");
+        ok( rc == 0, "Thresholds ('30', '60') set");
+        ok( thresholds->warning->end == 30, "Warning set correctly");
+        ok( thresholds->critical->end == 60, "Critical set correctly");
+        ok( get_status(15.3, thresholds) == STATE_OK, "15.3 - ok");
+        ok( get_status(30.0001, thresholds) == STATE_WARNING, "30.0001 - warning");
+        ok( get_status(69, thresholds) == STATE_CRITICAL, "69 - critical");
 
         return exit_status();
 }