switch to Test::More, done_testing

mschilli · Jun 1, 2022 · 4c69f91 · 4c69f91
1 parent 2563c97
commit 4c69f91
Show file tree

Hide file tree

Showing 75 changed files with 298 additions and 454 deletions.
diff --git a/Makefile.PL b/Makefile.PL
@@ -1,19 +1,18 @@
+use strict;
+use warnings;
 use ExtUtils::MakeMaker;
 
-# Check for Time::HiRes;
-eval { require Time::HiRes; };
-if($@) {
-    print "Warning: Time::HiRes not installed, but that's ok, " .
-          "%r will use full seconds\n";
-}
-
 my $meta_merge = {
     META_MERGE => {
         "meta-spec" => { version => 2 },
         resources => {
-            repository  => 'https://github.com/mschilli/log4perl',
+            repository => {
+              type => 'git',
+              url => '[email protected]:github.com/mschilli/log4perl.git',
+              web => 'https://github.com/github.com/mschilli/log4perl',
+            },
             MailingList => 'mailto:[email protected]',
-            bugtracker  => {
+            bugtracker => {
                 web => 'https://github.com/mschilli/log4perl/issues',
             },
         },
@@ -28,6 +27,15 @@ my $meta_merge = {
                     'Log::Dispatch::FileRotate' => '1.10',
                     'XML::DOM' => '1.29',
                 },
+                requires => {
+                    'File::Spec'    => '0.82',
+                    'File::Path'    => '2.07',
+                },
+            },
+            test => {
+                requires => {
+                    'Test::More'    => '0.88', # done_testing
+                },
             },
         },
     }
@@ -36,10 +44,6 @@ my $meta_merge = {
 WriteMakefile(
     'NAME'		=> 'Log::Log4perl',
     'VERSION_FROM'	=> 'lib/Log/Log4perl.pm', # finds $VERSION
-    'PREREQ_PM'		=> { Test::More    => 0.45,
-                             File::Spec    => 0.82,
-                             File::Path    => 2.07,
-                           }, # e.g., Module::Name => 1.1
     ABSTRACT_FROM => 'lib/Log/Log4perl.pm', # retrieve abstract from module
     AUTHOR     => 'Mike Schilli <[email protected]>',
     MIN_PERL_VERSION => '5.006',

diff --git a/t/001Level.t b/t/001Level.t
@@ -3,11 +3,8 @@
 # Mike Schilli, 2002 ([email protected])
 ###########################################
 
-#########################
-# change 'tests => 1' to 'tests => last_test_to_print';
-#########################
-use Test;
 use strict;
+use Test::More;
 
 BEGIN { 
     if($ENV{INTERNAL_DEBUG}) {
@@ -16,7 +13,6 @@ BEGIN {
     }
 }
 
-BEGIN { plan tests => 34 };
 use Log::Log4perl::Level;
 BEGIN {
     Log::Log4perl::Level->import("Level");
@@ -59,3 +55,5 @@ ok(Log::Log4perl::Level::isGreaterOrEqual($My::Level::DEBUG, $My::Level::INFO));
 ok(Log::Log4perl::Level::isGreaterOrEqual($My::Level::INFO, $My::Level::WARN));
 ok(Log::Log4perl::Level::isGreaterOrEqual($My::Level::WARN, $My::Level::ERROR));
 ok(Log::Log4perl::Level::isGreaterOrEqual($My::Level::ERROR, $My::Level::FATAL));
+
+done_testing;
diff --git a/t/002Logger.t b/t/002Logger.t
@@ -12,13 +12,9 @@ BEGIN {
     }
 }
 
-use warnings;
 use strict;
-
-#########################
-# used Test::Simple to help debug the test script
-use Test::More tests => 74;
-
+use warnings;
+use Test::More;
 use Log::Log4perl;
 use Log::Log4perl::Level;
 use Log::Log4perl::Util;
@@ -401,3 +397,4 @@ is($@, "", "Adding file appender");
 eval { $log10->add_appender($app_screen); };
 is($@, "", "Adding screen appender");
 
+done_testing;
diff --git a/t/003Layout-Rr.t b/t/003Layout-Rr.t
@@ -10,7 +10,7 @@ BEGIN {
 use strict;
 use warnings;
 
-use Test::More tests => 2;
+use Test::More;
 use File::Spec;
 
 use Log::Log4perl;
@@ -86,6 +86,7 @@ is_deeply(
     ]
 );
 
+done_testing;
 
 #
 # Returns the elapsed times logged so far.
@@ -151,4 +152,3 @@ sub create_logger {
 
     return $logger;
 }
-
diff --git a/t/003Layout.t b/t/003Layout.t
@@ -10,15 +10,10 @@ BEGIN {
     }
 }
 
-use warnings;
 use strict;
+use warnings;
 
-#########################
-# change 'tests => 1' to 'tests => last_test_to_print';
-#########################
 use Test::More;
-BEGIN { plan tests => 24 };
-
 use Log::Log4perl;
 use Log::Log4perl::Layout;
 
@@ -283,3 +278,4 @@ eval {
 };
 is($app->buffer(), "main::: Thats the\nmain::: multiline\nmain::: message\n"); 
 
+done_testing;
diff --git a/t/004Config.t b/t/004Config.t
@@ -10,11 +10,7 @@ BEGIN {
     }
 }
 
-#########################
-# change 'tests => 1' to 'tests => last_test_to_print';
-#########################
 use Test::More;
-BEGIN { plan tests => 28 };
 
 use Log::Log4perl;
 use Log::Log4perl::Appender::TestBuffer;
@@ -404,3 +400,4 @@ END_CONF
 eval { Log::Log4perl->init( \$conf ); };
 is $@, "", "support exclamation comment character [github.com #24]";
 
+done_testing;
diff --git a/t/005Config-Perl.t b/t/005Config-Perl.t
@@ -10,12 +10,7 @@ BEGIN {
     }
 }
 
-#########################
-# change 'tests => 1' to 'tests => last_test_to_print';
-#########################
 use Test::More;
-BEGIN { plan tests => 3 };
-
 use Log::Log4perl;
 use Log::Log4perl::Appender::TestBuffer;
 use File::Spec;
@@ -56,3 +51,5 @@ $logger->debug("Gurgel");
 $data = <LOG>;
 
 is($data, "005Config-Perl.t $line DEBUG N/A  - Gurgel\n");
+
+done_testing;
diff --git a/t/006Config-Java.t b/t/006Config-Java.t
@@ -10,9 +10,6 @@ BEGIN {
     }
 }
 
-#########################
-# change 'tests => 1' to 'tests => last_test_to_print';
-#########################
 use Test::More;
 
 our $LOG_DISPATCH_PRESENT = 0;
@@ -72,3 +69,5 @@ $data =~ s#\\#/#g;
 
 unlink $LOGFILE;
 is($data, "$exp");
+
+done_testing;
diff --git a/t/007LogPrio.t b/t/007LogPrio.t
@@ -10,13 +10,7 @@ BEGIN {
     }
 }
 
-#########################
-# change 'tests => 1' to 'tests => last_test_to_print';
-#########################
-use Test;
-BEGIN { plan tests => 2 };
-
-
+use Test::More;
 use Log::Log4perl;
 use Log::Log4perl::Appender::TestBuffer;
 use File::Spec;
@@ -64,4 +58,6 @@ $file $lines[4] FATAL N/A  - Gurgel
 EOT
 
 unlink $LOGFILE;
-ok($data, "$exp");
+is($data, $exp);
+
+done_testing;
diff --git a/t/008ConfCat.t b/t/008ConfCat.t
@@ -10,12 +10,7 @@ BEGIN {
     }
 }
 
-#########################
-# change 'tests => 1' to 'tests => last_test_to_print';
-#########################
-use Test;
-BEGIN { plan tests => 3 };
-
+use Test::More;
 use Log::Log4perl;
 use Log::Log4perl::Appender::TestBuffer;
 
@@ -37,8 +32,8 @@ Log::Log4perl->init("$EG_DIR/log4j-manual-2.conf");
 my $logger = Log::Log4perl->get_logger("foo.bar.baz");
 $logger->debug("Gurgel");
 
-ok(Log::Log4perl::Appender::TestBuffer->by_name("A1")->buffer(),
-   "m#$date_regex \\[N/A\\] DEBUG foo.bar.baz - Gurgel#");
+like(Log::Log4perl::Appender::TestBuffer->by_name("A1")->buffer(),
+   qr#$date_regex \[N/A\] DEBUG foo.bar.baz - Gurgel#);
 
 ######################################################################
 # Test the root logger via inheritance (discovered by Kevin Goess)
@@ -52,5 +47,7 @@ Log::Log4perl->init("$EG_DIR/log4j-manual-2.conf");
 $logger = Log::Log4perl->get_logger("foo");
 $logger->debug("Gurgel");
 
-ok(Log::Log4perl::Appender::TestBuffer->by_name("A1")->buffer(),
-   "m#$date_regex \\[N/A\\] DEBUG foo - Gurgel#");
+like(Log::Log4perl::Appender::TestBuffer->by_name("A1")->buffer(),
+   qr#$date_regex \[N/A\] DEBUG foo - Gurgel#);
+
+done_testing;
diff --git a/t/009Deuce.t b/t/009Deuce.t
@@ -11,12 +11,7 @@ BEGIN {
     }
 }
 
-#########################
-# change 'tests => 1' to 'tests => last_test_to_print';
-#########################
-use Test;
-BEGIN { plan tests => 5 };
-
+use Test::More;
 use Log::Log4perl;
 use Log::Log4perl::Appender::TestBuffer;
 
@@ -53,3 +48,5 @@ ok(Log::Log4perl::Appender::TestBuffer->by_name("stdout")->buffer(),
    'm#^\S+\s+\[N/A\] \(\S+?:\d+\) - Gurgel$#'); 
 ok(Log::Log4perl::Appender::TestBuffer->by_name("R")->buffer(), 
     'm#^\S+\s+N/A \'foo\' - Gurgel$#'); 
+
+done_testing;
diff --git a/t/010JConsole.t b/t/010JConsole.t
@@ -74,3 +74,5 @@ my $rc = is ($result, $expected);
 if( !$rc ) {
     warn "Failed with Log::Dispatch $Log::Dispatch::VERSION";
 }
+
+done_testing;
diff --git a/t/011JFile.t b/t/011JFile.t
@@ -61,6 +61,7 @@ EOL
 is ($result, $expected);
 
 reset_logger();
+done_testing;
 
 sub reset_logger {
   local $Log::Log4perl::Config::CONFIG_INTEGRITY_CHECK = 0; # to close handles and allow temp files to go

diff --git a/t/012Deeper.t b/t/012Deeper.t
@@ -193,6 +193,7 @@ foreach my $l ($xla, $xlab, $xlabc, $xlabcd, $xlabcde){
 is($result, $expected);
 
 reset_logger();
+done_testing;
 
 sub reset_logger {
   local $Log::Log4perl::Config::CONFIG_INTEGRITY_CHECK = 0; # to close handles and allow temp files to go

diff --git a/t/013Bench.t b/t/013Bench.t
@@ -5,16 +5,14 @@ BEGIN {
     }
 }
 
-use Test;
+use Test::More;
 use Benchmark qw/timeit timestr/;
 use Log::Log4perl;
 
 $count = 100_000;
 
 unless ($ENV{LOG4PERL_BENCH}) {
-    print "set \$ENV{LOG4PERL_BENCH} to a true value to run benchmarks, skipping...\n";
-    ok(1);
-    exit;
+    plan skip_all => "set \$ENV{LOG4PERL_BENCH} to a true value to run benchmarks, skipping...\n";
 }
 
 $conf = <<EOL;
@@ -131,14 +129,6 @@ print "same appenders, two levels of inheritance: \n";
 $t = timeit $count, sub {$multi3->info('info message')};
 print timestr($t),"\n\n";
 
-
-
-
-
-
-print
-
-
 ok(1);
 
-BEGIN { plan tests => 1, }
+done_testing;
diff --git a/t/014ConfErrs.t b/t/014ConfErrs.t
@@ -246,4 +246,4 @@ eval {
 };
 like($@, qr/log4perl.logger.Foo.Bar redefined/);
 
-BEGIN { plan tests => 14, }
+done_testing;
diff --git a/t/015fltmsg.t b/t/015fltmsg.t
@@ -11,10 +11,7 @@ BEGIN {
     }
 }
 
-#########################
-# change 'tests => 1' to 'tests => last_test_to_print';
-#########################
-use Test::More tests => 5;
+use Test::More;
 
 use Log::Log4perl;
 use Log::Log4perl::Appender::TestBuffer;
@@ -118,3 +115,5 @@ $logger->debug("Chunk1", "Chunk2", "Chunk3");
 
 is($app->buffer(), "[1,Chunk1,Chunk2,Chunk3]", 
    "warp_message = function (by name)");
+
+done_testing;