switch from Test to Test::More

[term-progressbar.git] / t / v1-message.t

diff --git a/t/v1-message.t b/t/v1-message.t
index a34917dab3125e79447c4b53ce656f6ba0814510..0b43108094d8f0fca03969025bcf91beb65525ec 100644 (file)
--- a/t/v1-message.t
+++ b/t/v1-message.t
@@ -10,20 +10,13 @@ This package tests the basic functionality of Term::ProgressBar.
 
 use Data::Dumper qw( Dumper );
 use FindBin      qw( $Bin );
-use Test         qw( ok plan );
+use Test::More tests => 8;
 
 use lib $Bin;
-use test qw( DATA_DIR
-             evcheck restore_output save_output );
+use test qw( evcheck );
 
 use constant MESSAGE1 => 'Walking on the Milky Way';
 
-BEGIN {
-  # 1 for compilation test,
-  plan tests  => 8,
-       todo   => [],
-}
-
 =head2 Test 1: compilation
 
 This test confirms that the test script and the modules it calls compiled
@@ -31,9 +24,8 @@ successfully.
 
 =cut
 
-use Term::ProgressBar;
+use_ok 'Term::ProgressBar';
 
-ok 1, 1, 'compilation';
 
 Term::ProgressBar->__force_term (50);
 
@@ -53,20 +45,21 @@ Update it it from 1 to 10.
 (6) Check bar number is 100%
 
 =cut
+use Capture::Tiny qw(capture);
 
-{
+my ($out, $err) = capture {
   my $p;
-  save_output('stderr', *STDERR{IO});
   ok (evcheck(sub { $p = Term::ProgressBar->new('bob', 10); },
               'Count 1-10 (1)' ),
-      1, 'Count 1-10 (1)');
+      'Count 1-10 (1)');
   ok (evcheck(sub { $p->update($_) for 1..5  }, 'Count 1-10 (2)' ),
-      1, 'Count 1-10 (2)');
+      'Count 1-10 (2)');
   ok (evcheck(sub { $p->message(MESSAGE1)    }, 'Count 1-10 (3)' ),
-      1, 'Count 1-10 (3)');
+      'Count 1-10 (3)');
   ok (evcheck(sub { $p->update($_) for 6..10 }, 'Count 1-10 (4)' ),
-      1, 'Count 1-10 (4)');
-  my $err = restore_output('stderr');
+      'Count 1-10 (4)');
+};
+print $out;
 
   $err =~ s!^.*\r!!gm;
   print STDERR "ERR:\n$err\nlength: ", length($err), "\n"
@@ -74,7 +67,6 @@ Update it it from 1 to 10.
 
   my @lines = split /\n/, $err;
 
-  ok $lines[0], MESSAGE1;
-  ok $lines[-1], qr/bob:\s+\d+% \#+/,            'Count 1-10 (6)';
-  ok $lines[-1], qr/^bob:\s+100%/,               'Count 1-10 (7)';
-}
+  is $lines[0], MESSAGE1;
+  like $lines[-1], qr/bob:\s+\d+% \#+/,            'Count 1-10 (6)';
+  like $lines[-1], qr/^bob:\s+100%/,               'Count 1-10 (7)';