is_set method to see if a range has been set

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

2 files changed, 10 insertions, 9 deletions

diff --git a/t/Nagios-Plugin-Performance.t b/t/Nagios-Plugin-Performance.t
index aa0ab64..b10a988 100644
--- a/t/Nagios-Plugin-Performance.t
+++ b/t/Nagios-Plugin-Performance.t
@@ -1,6 +1,6 @@
 
 use strict;
-use Test::More tests => 43;
+use Test::More tests => 49;
 BEGIN { use_ok('Nagios::Plugin::Performance') };
 
 use Nagios::Plugin::Base;
@@ -65,12 +65,13 @@ cmp_ok( $p[0]->threshold->critical, 'eq', "10", "crit okay");
 cmp_ok( $p[1]->label, "eq", "size", "label okay");
 cmp_ok( $p[1]->value, "==", 426, "value okay");
 cmp_ok( $p[1]->uom, "eq", "B", "uom okay");
-    ok( ! defined $p[1]->threshold->warning, "warn okay");
-    ok( ! defined $p[1]->threshold->critical, "crit okay");
+    ok( ! $p[1]->threshold->warning->is_set, "warn okay");
+    ok( ! $p[1]->threshold->critical->is_set, "crit okay");
 
-# RRDlabel testing
-@p = Nagios::Plugin::Performance->parse_perfstring("/home/a-m=0 shared-folder:big=20 12345678901234567890=20");
+# Edge cases
+@p = Nagios::Plugin::Performance->parse_perfstring("/home/a-m=0;0;0 shared-folder:big=20 12345678901234567890=20");
 cmp_ok( $p[0]->rrdlabel, "eq", "home_a_m", "changing / to _");
+    ok( $p[0]->threshold->warning->is_set, "Warning range has been set");
 cmp_ok( $p[1]->rrdlabel, "eq", "shared_folder_big", "replacing bad characters");
 cmp_ok( $p[2]->rrdlabel, "eq", "1234567890123456789", "shortening rrd label");
 
diff --git a/t/Nagios-Plugin-Threshold.t b/t/Nagios-Plugin-Threshold.t
index 764f7b0..97d4fcc 100644
--- a/t/Nagios-Plugin-Threshold.t
+++ b/t/Nagios-Plugin-Threshold.t
@@ -8,14 +8,14 @@ Nagios::Plugin::Base->print_on_die(0);
 
 my $t = Nagios::Plugin::Threshold->set_thresholds(critical => "80");
 ok( defined $t, "Threshold ('', '80') set");
-ok( ! defined $t->warning, "Warning not set");
+ok( ! $t->warning->is_set, "Warning not set");
 cmp_ok( $t->critical->end, '==', 80, "Critical set correctly");
 
 $t = Nagios::Plugin::Threshold->set_thresholds(warning => "5:33", critical => "");
 ok( defined $t, "Threshold ('5:33', '') set");
 cmp_ok( $t->warning->start, '==', 5, "Warning start set");
 cmp_ok( $t->warning->end, '==',   33, "Warning end set");
-ok( ! defined $t->critical, "Critical not set");
+ok( ! $t->critical->is_set, "Critical not set");
 
 $t = Nagios::Plugin::Threshold->set_thresholds(warning => "30", critical => "60");
 ok( defined $t, "Threshold ('30', '60') set");
@@ -27,6 +27,6 @@ cmp_ok( $t->get_status(69), '==', $ERRORS{CRITICAL}, "69 - critical");
 
 $t = Nagios::Plugin::Threshold->set_thresholds(warning => "total", critical => "rubbish");
 ok( defined $t, "Threshold object created although ...");
-ok( ! defined $t->warning, "Warning not set");
-ok( ! defined $t->critical, "Critical not set");
+ok( ! $t->warning->is_set, "Warning not set");
+ok( ! $t->critical->is_set, "Critical not set");