From 22509ac75b3ae04f35b22c87bbd85c643bb1db2b Mon Sep 17 00:00:00 2001 From: Nathan Vonnahme Date: Wed, 15 Nov 2006 02:11:10 +0000 Subject: made 'usage' unmandatory in N::P::new(). git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/Nagios-Plugin/trunk@1538 f882894a-f735-0410-b71e-b25c423dba1c --- t/Nagios-Plugin-01.t | 6 +++--- t/Nagios-Plugin-02.t | 4 ++-- t/Nagios-Plugin-03.t | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 't') diff --git a/t/Nagios-Plugin-01.t b/t/Nagios-Plugin-01.t index a73fce4..db12c35 100644 --- a/t/Nagios-Plugin-01.t +++ b/t/Nagios-Plugin-01.t @@ -11,16 +11,16 @@ Nagios::Plugin::Functions::_fake_exit(1); diag "\nusing Nagios::Plugin revision ". $Nagios::Plugin::VERSION . "\n" if $ENV{TEST_VERBOSE}; -my $p = Nagios::Plugin->new (usage => "dummy usage"); +my $p = Nagios::Plugin->new(); isa_ok( $p, "Nagios::Plugin"); $p->shortname("PAGESIZE"); is($p->shortname, "PAGESIZE", "shortname explicitly set correctly"); -$p = Nagios::Plugin->new (usage => "dummy usage"); +$p = Nagios::Plugin->new(); is($p->shortname, "NAGIOS-PLUGIN-01", "shortname should default on new"); -$p = Nagios::Plugin->new( shortname => "SIZE", usage => "dummy usage" ); +$p = Nagios::Plugin->new( shortname => "SIZE", () ); is($p->shortname, "SIZE", "shortname set correctly on new"); diag "warn if < 10, critical if > 25 " if $ENV{TEST_VERBOSE}; diff --git a/t/Nagios-Plugin-02.t b/t/Nagios-Plugin-02.t index 15ae3d6..f64fb6f 100644 --- a/t/Nagios-Plugin-02.t +++ b/t/Nagios-Plugin-02.t @@ -16,7 +16,7 @@ is(UNKNOWN, $ERRORS{UNKNOWN}, "UNKNOWN => $ERRORS{UNKNOWN}"); is(DEPENDENT, $ERRORS{DEPENDENT}, "DEPENDENT => $ERRORS{DEPENDENT}"); my $plugin = 'TEST_PLUGIN'; -my $np = Nagios::Plugin->new( shortname => $plugin, usage => "dummy usage" ); +my $np = Nagios::Plugin->new( shortname => $plugin ); is($np->shortname, $plugin, "shortname() is $plugin"); # Test nagios_exit( CONSTANT, $msg ), nagios_exit( $string, $msg ) @@ -151,7 +151,7 @@ for (@ok) { # shortname testing SKIP: { skip "requires File::Basename", 2 unless eval { require File::Basename }; - $np = Nagios::Plugin->new (usage => "dummy usage", version => "1"); + $np = Nagios::Plugin->new( version => "1"); $plugin = uc File::Basename::basename($0); $plugin =~ s/\..*$//; is($np->shortname, $plugin, "shortname() is '$plugin'"); diff --git a/t/Nagios-Plugin-03.t b/t/Nagios-Plugin-03.t index 0b7b8af..bc4f5e3 100644 --- a/t/Nagios-Plugin-03.t +++ b/t/Nagios-Plugin-03.t @@ -10,7 +10,7 @@ BEGIN { Nagios::Plugin::Functions::_fake_exit(1); my $plugin = 'NP_CHECK_MESSAGES_03'; -my $np = Nagios::Plugin->new( shortname => $plugin, usage => "dummy usage" ); +my $np = Nagios::Plugin->new( shortname => $plugin, () ); is($np->shortname, $plugin, "shortname() is $plugin"); my ($code, $message); @@ -172,33 +172,33 @@ is($message, 'D E F', "join_all '$join_all' (critical, warning) message is $mess # add_messages # Constant codes -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); $np->add_message( CRITICAL, "A B C" ); $np->add_message( WARNING, "D E F" ); ($code, $message) = $np->check_messages(); is($code, CRITICAL, "(CRITICAL, WARNING) code is $STATUS_TEXT{$code}"); is($message, $messages{critical}, "(CRITICAL, WARNING) message is $message"); -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); $np->add_message( CRITICAL, "A B C" ); ($code, $message) = $np->check_messages(); is($code, CRITICAL, "(CRITICAL) code is $STATUS_TEXT{$code}"); is($message, $messages{critical}, "(CRITICAL) message is $message"); -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); $np->add_message( WARNING, "D E F" ); ($code, $message) = $np->check_messages(); is($code, WARNING, "(WARNING) code is $STATUS_TEXT{$code}"); is($message, $messages{warning}, "(WARNING) message is $message"); -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); $np->add_message( WARNING, "D E F" ); $np->add_message( OK, "G H I" ); ($code, $message) = $np->check_messages(); is($code, WARNING, "(WARNING, OK) code is $STATUS_TEXT{$code}"); is($message, $messages{warning}, "(WARNING, OK) message is $message"); -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); $np->add_message( OK, "G H I" ); ($code, $message) = $np->check_messages(); is($code, OK, "(OK) code is $STATUS_TEXT{$code}"); @@ -206,33 +206,33 @@ is($message, $messages{ok}, "(OK) message is $message"); # String codes -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); $np->add_message( critical => "A B C" ); $np->add_message( warning => "D E F" ); ($code, $message) = $np->check_messages(); is($code, CRITICAL, "(critical, warning) code is $STATUS_TEXT{$code}"); is($message, $messages{critical}, "(critical, warning) message is $message"); -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); $np->add_message( critical => "A B C" ); ($code, $message) = $np->check_messages(); is($code, CRITICAL, "(critical) code is $STATUS_TEXT{$code}"); is($message, $messages{critical}, "(critical) message is $message"); -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); $np->add_message( warning => "D E F" ); ($code, $message) = $np->check_messages(); is($code, WARNING, "(warning) code is $STATUS_TEXT{$code}"); is($message, $messages{warning}, "(warning) message is $message"); -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); $np->add_message( warning => "D E F" ); $np->add_message( ok => "G H I" ); ($code, $message) = $np->check_messages(); is($code, WARNING, "(warning, ok) code is $STATUS_TEXT{$code}"); is($message, $messages{warning}, "(warning, ok) message is $message"); -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); $np->add_message( ok => "G H I" ); ($code, $message) = $np->check_messages(); is($code, OK, "(ok) code is $STATUS_TEXT{$code}"); @@ -240,7 +240,7 @@ is($message, $messages{ok}, "(ok) message is $message"); # No add_message -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); ($code, $message) = $np->check_messages(); is($code, OK, "() code is $STATUS_TEXT{$code}"); is($message, '', "() message is ''"); @@ -250,7 +250,7 @@ is($message, '', "() message is ''"); # Error conditions # add_message errors -$np = Nagios::Plugin->new (usage => "dummy usage"); +$np = Nagios::Plugin->new(); ok(! defined eval { $np->add_message( foobar => 'hi mum' ) }, 'add_message dies on invalid code'); ok(! defined eval { $np->add_message( OKAY => 'hi mum' ) }, -- cgit v1.2.3-74-g34f1