6 files changed, 186 insertions, 19 deletions

diff --git a/t/Nagios-Plugin-Base.t b/t/Nagios-Plugin-Functions-01.t
index 68a02fe..7401945 100644
--- a/t/Nagios-Plugin-Base.t
+++ b/t/Nagios-Plugin-Functions-01.t
@@ -2,17 +2,17 @@
 use strict;
 use Test::More tests => 111;
 
-BEGIN { use_ok("Nagios::Plugin::Base", ":all"); }
-Nagios::Plugin::Base::_fake_exit(1);
+BEGIN { use_ok("Nagios::Plugin::Functions", ":all"); }
+Nagios::Plugin::Functions::_fake_exit(1);
 
-my $this_version=$Nagios::Plugin::Base::VERSION;
+my $this_version=$Nagios::Plugin::Functions::VERSION;
 foreach my $m ("", qw(::Threshold ::Getopt ::Performance ::Range)) {
         my $mod = "Nagios::Plugin$m";
         use_ok($mod);
         # Lots of hackery below. Easier to say $mod->VERSION, but this is probably a recent perl thing
         my $v = "$mod"."::VERSION";
         my $a = eval "\$$v";
-        is($a, $this_version, "Version number for $mod the same as Base: $this_version");
+        is($a, $this_version, "Version number for $mod the same as Functions: $this_version");
 }
 
 # Hardcoded checks of constants
diff --git a/t/Nagios-Plugin-Functions-02.t b/t/Nagios-Plugin-Functions-02.t
new file mode 100644
index 0000000..981e2eb
--- /dev/null
+++ b/t/Nagios-Plugin-Functions-02.t
@@ -0,0 +1,162 @@
+# check_messages tests
+
+use strict;
+use Test::More tests => 33;
+
+BEGIN { use_ok("Nagios::Plugin::Functions", ":all") }
+
+my ($code, $message);
+
+# -------------------------------------------------------------------------
+# Check codes
+my @codes = (
+    [ [ qw(Critical) ],   [ qw(Warning) ],        CRITICAL ],
+    [ [],                 [ qw(Warning) ],        WARNING  ],
+    [ [],                 [],                     OK       ],
+);
+my $i = 0;
+for (@codes) {
+    $i++;
+    $code = check_messages( critical => $_->[0], warning  => $_->[1] );
+    is($code, $_->[2], "Code test $i returned $STATUS_TEXT{$_->[2]}");
+}
+
+# -------------------------------------------------------------------------
+# Check messages
+my %arrays = (
+    critical    => [ qw(A B C) ],
+    warning     => [ qw(D E F) ],
+    ok          => [ qw(G H I) ],
+);
+my %messages = map { $_ => join(' ', @{$arrays{$_}}) } keys %arrays;
+
+# critical, warning
+($code, $message) = check_messages(
+    critical => $arrays{critical}, warning => $arrays{warning},
+);
+is($code, CRITICAL, "(critical, warning) code is $STATUS_TEXT{$code}");
+is($message, $messages{critical}, "(critical, warning) message is $message");
+
+# critical, warning, ok
+($code, $message) = check_messages(
+    critical => $arrays{critical}, warning => $arrays{warning},
+    ok => $arrays{ok},
+);
+is($code, CRITICAL, "(critical, warning, ok) code is $STATUS_TEXT{$code}");
+is($message, $messages{critical}, "(critical, warning, ok) message is $message");
+
+# critical, warning, $ok
+($code, $message) = check_messages(
+    critical => $arrays{critical}, warning => $arrays{warning},
+    ok => 'G H I',
+);
+is($code, CRITICAL, "(critical, warning, \$ok) code is $STATUS_TEXT{$code}");
+is($message, $messages{critical}, "(critical, warning, \$ok) message is $message");
+
+# warning
+($code, $message) = check_messages(
+    critical => [],     warning => $arrays{warning},
+);
+is($code, WARNING, "(warning) code is $STATUS_TEXT{$code}");
+is($message, $messages{warning}, "(warning) message is $message");
+
+# warning, ok
+($code, $message) = check_messages(
+    critical => [],     warning => $arrays{warning}, ok => $arrays{ok},
+);
+is($code, WARNING, "(warning, ok) code is $STATUS_TEXT{$code}");
+is($message, $messages{warning}, "(warning, ok) message is $message");
+
+# ok
+($code, $message) = check_messages(
+    critical => [],     warning => [],  ok => $arrays{ok},
+);
+is($code, OK, "(ok) code is $STATUS_TEXT{$code}");
+is($message, $messages{ok}, "(ok) message is $message");
+
+# $ok
+($code, $message) = check_messages(
+    critical => [],     warning => [],  ok => 'G H I',
+);
+is($code, OK, "(\$ok) code is $STATUS_TEXT{$code}");
+is($message, $messages{ok}, "(\$ok) message is $message");
+
+# -------------------------------------------------------------------------
+# explicit join
+my $join = '+';
+($code, $message) = check_messages(
+    critical => $arrays{critical}, warning => $arrays{warning},
+    join => $join,
+);
+is($message, join($join, @{$arrays{critical}}), "joined '$join' (critical, warning) message is $message");
+$join = '';
+($code, $message) = check_messages(
+    critical => [],     warning => $arrays{warning},
+    join => $join,
+);
+is($message, join($join, @{$arrays{warning}}), "joined '$join' (warning) message is $message");
+$join = undef;
+($code, $message) = check_messages(
+    critical => [],     warning => [],          ok => $arrays{ok},
+    join => $join,
+);
+is($message, join(' ', @{$arrays{ok}}), "joined undef (ok) message is $message");
+
+# -------------------------------------------------------------------------
+# join_all messages
+my $join_all = ' :: ';
+my $msg_all_cwo = join($join_all, map { join(' ', @{$arrays{$_}}) } 
+    qw(critical warning ok));
+my $msg_all_cw = join($join_all, map { join(' ', @{$arrays{$_}}) } 
+    qw(critical warning));
+my $msg_all_wo = join($join_all, map { join(' ', @{$arrays{$_}}) } 
+    qw(warning ok));
+
+# critical, warning, ok
+($code, $message) = check_messages(
+    critical => $arrays{critical}, warning => $arrays{warning}, ok => $arrays{ok},
+    join_all => $join_all,
+);
+is($code, CRITICAL, "(critical, warning, ok) code is $STATUS_TEXT{$code}");
+is($message, $msg_all_cwo, "join_all '$join_all' (critical, warning, ok) message is $message");
+
+# critical, warning, $ok
+($code, $message) = check_messages(
+    critical => $arrays{critical}, warning => $arrays{warning}, ok => 'G H I',
+    join_all => $join_all,
+);
+is($code, CRITICAL, "(critical, warning, \$ok) code is $STATUS_TEXT{$code}");
+is($message, $msg_all_cwo, "join_all '$join_all' (critical, warning, \$ok) message is $message");
+
+# critical, warning
+($code, $message) = check_messages(
+    critical => $arrays{critical}, warning => $arrays{warning},
+    join_all => $join_all,
+);
+is($code, CRITICAL, "(critical, warning) code is $STATUS_TEXT{$code}");
+is($message, $msg_all_cw, "join_all '$join_all' (critical, warning) message is $message");
+
+# warning, ok
+($code, $message) = check_messages(
+    critical => [],     warning => $arrays{warning}, ok => $arrays{ok},
+    join_all => $join_all,
+);
+is($code, WARNING, "(warning, ok) code is $STATUS_TEXT{$code}");
+is($message, $msg_all_wo, "join_all '$join_all' (critical, warning, ok) message is $message");
+
+# warning, $ok
+($code, $message) = check_messages(
+    critical => [],     warning => $arrays{warning}, ok => 'G H I',
+    join_all => $join_all,
+);
+is($code, WARNING, "(warning, \$ok) code is $STATUS_TEXT{$code}");
+is($message, $msg_all_wo, "join_all '$join_all' (critical, warning, \$ok) message is $message");
+
+# warning
+($code, $message) = check_messages(
+    critical => [],     warning => $arrays{warning},
+    join_all => $join_all,
+);
+is($code, WARNING, "(warning) code is $STATUS_TEXT{$code}");
+is($message, 'D E F', "join_all '$join_all' (critical, warning) message is $message");
+
diff --git a/t/Nagios-Plugin-Performance.t b/t/Nagios-Plugin-Performance.t
index 1da3191..e0eb2f6 100644
--- a/t/Nagios-Plugin-Performance.t
+++ b/t/Nagios-Plugin-Performance.t
@@ -3,10 +3,10 @@ use strict;
 use Test::More tests => 49;
 BEGIN { use_ok('Nagios::Plugin::Performance') };
 
-diag "\nusing Nagios::Plugin::Performance revision ". $Nagios::Plugin::Performance::VERSION . "\n";
+diag "\nusing Nagios::Plugin::Performance revision ". $Nagios::Plugin::Performance::VERSION . "\n" if $ENV{TEST_VERBOSE};
 
-use Nagios::Plugin::Base;
-Nagios::Plugin::Base::_fake_exit(1);
+use Nagios::Plugin::Functions;
+Nagios::Plugin::Functions::_fake_exit(1);
 
 my @p = Nagios::Plugin::Performance->parse_perfstring("/=382MB;15264;15269;; /var=218MB;9443;9448");
 cmp_ok( $p[0]->label, 'eq', "/", "label okay");
diff --git a/t/Nagios-Plugin-Range.t b/t/Nagios-Plugin-Range.t
index f01518d..df5dbd5 100644
--- a/t/Nagios-Plugin-Range.t
+++ b/t/Nagios-Plugin-Range.t
@@ -2,13 +2,17 @@
 use strict;
 use Test::More qw(no_plan); #tests => 123;
 
-BEGIN { use_ok('Nagios::Plugin::Range') };
+BEGIN { 
+  use_ok('Nagios::Plugin::Range');
+  # Silence warnings unless TEST_VERBOSE is set
+  $SIG{__WARN__} = sub { warn $_[0] if $ENV{TEST_VERBOSE} };
+};
 
-diag "\nusing Nagios::Plugin::Range revision ". $Nagios::Plugin::Range::VERSION . "\n";
+diag "\nusing Nagios::Plugin::Range revision ". $Nagios::Plugin::Range::VERSION . "\n" if $ENV{TEST_VERBOSE};
 
 my $r;
 
-diag "'garbage in' checks -- you should see 7 invalid range definition warnings here:";
+diag "'garbage in' checks -- you should see 7 invalid range definition warnings here:" if $ENV{TEST_VERBOSE};
 
 foreach (qw(
             :
diff --git a/t/Nagios-Plugin-Threshold.t b/t/Nagios-Plugin-Threshold.t
index 677c054..cdb8d77 100644
--- a/t/Nagios-Plugin-Threshold.t
+++ b/t/Nagios-Plugin-Threshold.t
@@ -4,7 +4,7 @@ use Test::More tests => 71;
 #use Test::Exception;  # broken for now so we don't need this.
 BEGIN { 
   use_ok('Nagios::Plugin::Threshold'); 
-  use_ok('Nagios::Plugin::Base', ':all' );
+  use_ok('Nagios::Plugin::Functions', ':all' );
   # Silence warnings unless TEST_VERBOSE is set
   $SIG{__WARN__} = sub { warn $_[0] if $ENV{TEST_VERBOSE} };
 }
@@ -12,7 +12,7 @@ BEGIN {
 diag "\nusing Nagios::Plugin::Threshold revision ". $Nagios::Plugin::Threshold::VERSION . "\n"
   if $ENV{TEST_VERBOSE};
 
-Nagios::Plugin::Base::_fake_exit(1);
+Nagios::Plugin::Functions::_fake_exit(1);
 
 diag "threshold: critical if > 80" if $ENV{TEST_VERBOSE};
 my $t = Nagios::Plugin::Threshold->set_thresholds(critical => "80");
@@ -96,8 +96,8 @@ test_expected_statuses( $t, $expected );
 goto SKIP_DEATH;
 diag "threshold: test pure crap for arguments - default to OK." if $ENV{TEST_VERBOSE};
 diag "you should see one invalid range definition warning and an UNKNOWN line here:\n";
-Nagios::Plugin::Base->print_on_die(1);
-Nagios::Plugin::Base->exit_on_die(1);
+Nagios::Plugin::Functions->print_on_die(1);
+Nagios::Plugin::Functions->exit_on_die(1);
 
 dies_ok( sub {
         $t = Nagios::Plugin::Threshold->set_thresholds(
@@ -106,8 +106,8 @@ dies_ok( sub {
                                                                                                    )
         }, "bad thresholds cause death" 
 );
-Nagios::Plugin::Base->print_on_die(0);
-Nagios::Plugin::Base->exit_on_die(0);
+Nagios::Plugin::Functions->print_on_die(0);
+Nagios::Plugin::Functions->exit_on_die(0);
 SKIP_DEATH:
 
 
diff --git a/t/Nagios-Plugin.t b/t/Nagios-Plugin.t
index 213e514..0ae2113 100644
--- a/t/Nagios-Plugin.t
+++ b/t/Nagios-Plugin.t
@@ -4,10 +4,11 @@ use Test::More tests => 12;
 
 BEGIN { use_ok('Nagios::Plugin') };
 
-use Nagios::Plugin::Base;
-Nagios::Plugin::Base::_fake_exit(1);
+use Nagios::Plugin::Functions;
+Nagios::Plugin::Functions::_fake_exit(1);
 
-diag "\nusing Nagios::Plugin revision ". $Nagios::Plugin::VERSION . "\n";
+diag "\nusing Nagios::Plugin revision ". $Nagios::Plugin::VERSION . "\n"
+  if $ENV{TEST_VERBOSE};
 
 my $p = Nagios::Plugin->new;
 isa_ok( $p, "Nagios::Plugin");