Using Test::More

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

diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t
index ad423595fd2c34f5a9ccf17ce0c151653f4e043f..b29c5c6adeb77b44b85cc1986f3a9a211c715b85 100644 (file)
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -6,28 +6,27 @@
 #
 
 use strict;
-use Test;
+use Test::More;
 use NPTest;
 
 use vars qw($tests);
 
-BEGIN {$tests = 2; plan tests => $tests}
+plan skip_all => "check_mysql not compiled" unless (-x "check_mysql");
 
-my $t;
+plan tests => 3;
 
-my $failureOutput = '/Access denied for user: /';
+my $failureOutput = '/Access denied for user /';
+my $mysqlserver = getTestParameter( "mysql_server", "NP_MYSQL_SERVER", undef,
+               "A MySQL Server");
+my $mysql_login_details = getTestParameter( "mysql_login_details", "MYSQL_LOGIN_DETAILS", undef, 
+               "Command line parameters to specify login access");
 
-if ( -x "./check_mysql" )
-{
-  my $mysqlserver = getTestParameter( "mysql_server", "NP_MYSQL_SERVER", undef,
-                                     "A MySQL Server");
+my $result;
 
-  $t += checkCmd( "./check_mysql -H $mysqlserver -P 3306", 2, $failureOutput );
-}
-else
-{
-  $t += skipMissingCmd( "./check_mysql", $tests );
-}
+$result = NPTest->testCmd("./check_mysql -H $mysqlserver $mysql_login_details");
+cmp_ok( $result->return_code, '==', 0, "Login okay");
+
+$result = NPTest->testCmd("./check_mysql -H $mysqlserver -u dummy");
+cmp_ok( $result->return_code, '==', 2, "Login expected failure");
+like( $result->output, $failureOutput, "Error string as expected");
 
-exit(0) if defined($Test::Harness::VERSION);
-exit($tests - $t);