[monitoring-plugins] added tests for check_hpjd port options

[Jan Wagner]

    Module: monitoring-plugins
    Branch: master
    Commit: 479509ad59cdb05894ab39206157e6dd3f4e7faf
    Author: abrist <abrist at nagios.com>
 Committer: Jan Wagner <waja at cyconet.org>
      Date: Mon Jan 27 19:06:46 2014 -0500
       URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=479509a

added tests for check_hpjd port options
---
Closes #1160 and #973

---

 plugins/t/check_hpjd.t | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/plugins/t/check_hpjd.t b/plugins/t/check_hpjd.t
index 10ded54..4d64852 100644
--- a/plugins/t/check_hpjd.t
+++ b/plugins/t/check_hpjd.t
@@ -10,7 +10,6 @@ use NPTest;
 
 plan skip_all => "check_hpjd not compiled" unless (-x "check_hpjd");
 
-plan tests => 5;
 
 my $successOutput = '/^Printer ok - /';
 my $failureOutput = '/Timeout: No [Rr]esponse from /';
@@ -20,31 +19,53 @@ my $host_tcp_hpjd = getTestParameter(
 			"A host (usually a printer) providing the HP-JetDirect Services"
 			);
 
+my $host_hpjd_port_invalid = getTestParameter( 
+			"NP_HOST_HPJD_PORT_INVALID",
+			"A port that HP-JetDirect Services is not listening on",
+			"162"
+			);
+
+my $host_hpjd_port_valid = getTestParameter( 
+			"NP_HOST_HPJD_PORT_VALID",
+			"The port that HP-JetDirect Services is currently listening on",
+			"161"
+			);
+
 my $host_nonresponsive = getTestParameter( 
 			"NP_HOST_NONRESPONSIVE",
 			"The hostname of system not responsive to network requests",
-			"10.0.0.1",
+			"10.0.0.1"
 			);
 
 my $hostname_invalid = getTestParameter( 
 			"NP_HOSTNAME_INVALID",
 			"An invalid (not known to DNS) hostname",
-			"nosuchhost",
+			"nosuchhost"
 			);
 
+my $tests = $host_tcp_hpjd ? 9 : 5;
+plan tests => $tests;
 my $res;
 
 SKIP: {
 	skip "No HP JetDirect defined", 2 unless $host_tcp_hpjd;
-	$res = NPTest->testCmd("./check_hpjd $host_tcp_hpjd");
-	cmp_ok( $res->return_code, '==', 0, "Jetdirect responding" );
+	$res = NPTest->testCmd("./check_hpjd -H $host_tcp_hpjd");
+	cmp_ok( $res->return_code, 'eq', 0, "Jetdirect responding" );
 	like  ( $res->output, $successOutput, "Output correct" );
+
+	$res = NPTest->testCmd("./check_hpjd -H $host_tcp_hpjd -p $host_hpjd_port_valid");
+	cmp_ok( $res->return_code, 'eq', 0, "Jetdirect responding on port $host_hpjd_port_valid" );
+	like  ( $res->output, $successOutput, "Output correct" );
+
+	$res = NPTest->testCmd("./check_hpjd -H $host_tcp_hpjd -p $host_hpjd_port_invalid");
+	cmp_ok( $res->return_code, 'eq', 2, "Jetdirect not responding on port $host_hpjd_port_invalid" );
+	like  ( $res->output, $failureOutput, "Output correct" );
 }
 
-$res = NPTest->testCmd("./check_hpjd $host_nonresponsive");
+$res = NPTest->testCmd("./check_hpjd -H $host_nonresponsive");
 cmp_ok( $res->return_code, 'eq', 2, "Host not responding");
 like  ( $res->output, $failureOutput, "Output OK" );
 
-$res = NPTest->testCmd("./check_hpjd $hostname_invalid");
+$res = NPTest->testCmd("./check_hpjd -H $hostname_invalid");
 cmp_ok( $res->return_code, 'eq', 3, "Hostname invalid");