New upstream release

[deb_pkgs/libhtml-calendarmonth-perl.git] / t / 06_cal.t

diff --git a/t/06_cal.t b/t/06_cal.t
index 58457b2d993e0f8fc823f9e06023401f5edb6448..b2807a9f5af93fee38cdf5e44c1b3525cb8b5c1c 100755 (executable)
--- a/t/06_cal.t
+++ b/t/06_cal.t
@@ -1,21 +1,26 @@
 #!/usr/bin/perl
 
 use strict;
+use FindBin;
+use lib $FindBin::RealBin;
+
+use testload;
 
 my($test_count, $method);
-BEGIN { $test_count = 17 ; $method = 'cal' }
+BEGIN {
+  $method = 'cal';
+  $test_count = bulk_count() + odd_count() + 3;
+}
 
 use Test::More tests => $test_count;
 
-use FindBin;
-use lib $FindBin::RealBin;
+use constant DTC => 'HTML::CalendarMonth::DateTool';
 
-use testload;
+use_ok(DTC);
 
 SKIP: {
-  my $CAL;
-  chomp($CAL = `which cal`);
-  skip("$method not installed", $test_count) unless -x $CAL;
+  skip("$method not installed", $test_count - 1) unless DTC->_cal_cmd;
   check_datetool($method);
-  check_basic_with_datetool($method);
+  check_bulk_with_datetool($method);
+  check_odd_with_datetool($method);
 }