switch to useint Test::Exception instead of the home made code, remote test.pm

[term-progressbar.git] / t / name.t

diff --git a/t/name.t b/t/name.t
index 09ea43237849cb6b1b2d90953f74061b728f0699..ff4dfbfe31c6223bc4988cd2b75c1a788e4812fb 100644 (file)
--- a/t/name.t
+++ b/t/name.t
@@ -9,21 +9,13 @@ This package tests the name functionality of Term::ProgressBar.
 =cut
 
 use Data::Dumper  qw( Dumper );
-use FindBin       qw( $Bin );
-use Test          qw( ok plan );
-
-use lib $Bin;
-use test qw( evcheck );
+use Test::More tests => 18;
+use Test::Exception;
 
 use constant MESSAGE1 => 'The Gospel of St. Jude';
 use constant NAME1    => 'Algenon';
 use constant NAME2    => 'Smegma';
 
-BEGIN {
-  # 1 for compilation test,
-  plan tests  => 18,
-       todo   => [],
-}
 
 =head2 Test 1: compilation
 
@@ -32,9 +24,7 @@ successfully.
 
 =cut
 
-use Term::ProgressBar;
-
-ok 1, 1, 'compilation';
+use_ok 'Term::ProgressBar';
 
 Term::ProgressBar->__force_term (50);
 
@@ -62,12 +52,10 @@ use Capture::Tiny qw(capture);
 {
   my $p;
 my ($out, $err) = capture {
-  ok (evcheck(sub {
+  lives_ok {
                 $p = Term::ProgressBar->new({count => 10, name => NAME1});
-              },                                            'Count 1-10 ( 1)'),
-      1,                                                    'Count 1-10 ( 1)');
-  ok (evcheck(sub { $p->update($_) for 1..3  },             'Count 1-10 ( 2)'),
-      1,                                                    'Count 1-10 ( 2)');
+              } 'Count 1-10 ( 1)';
+  lives_ok { $p->update($_) for 1..3  } 'Count 1-10 ( 2)';
 };
 print $out;
 
@@ -76,7 +64,7 @@ print $out;
     if $ENV{TEST_DEBUG};
   my @lines = split /\n/, $err;
 
-  ok $lines[-1], qr/^@{[NAME1()]}: \s*\b30%/,                'Count 1-10 ( 3)';
+  like $lines[-1], qr/^@{[NAME1()]}: \s*\b30%/,                'Count 1-10 ( 3)';
   my ($bar, $space) = $lines[-1] =~ /\[(=*)(\s*)\]/;
   my $length = length($bar) + length($space);
   print STDERR
@@ -88,10 +76,8 @@ print $out;
 
 ($out, $err) = capture {
 
-  ok (evcheck(sub { $p->message(MESSAGE1)    },             'Count 1-10 ( 5)'),
-      1,                                                    'Count 1-10 ( 5)');
-  ok (evcheck(sub { $p->update($_) for 6..10 },             'Count 1-10 ( 6)'),
-      1,                                                    'Count 1-10 ( 6)');
+  lives_ok { $p->message(MESSAGE1)    } 'Count 1-10 ( 5)';
+  lives_ok { $p->update($_) for 6..10 } 'Count 1-10 ( 6)';
 };
 print $out;
 
@@ -101,9 +87,9 @@ print $out;
 
   @lines = split /\n/, $err;
 
-  ok $lines[0], MESSAGE1,                                    'Count 1-10 ( 7)';
-  ok $lines[-1], qr/\[=+\]/,                                 'Count 1-10 ( 8)';
-  ok $lines[-1], qr/^@{[NAME1()]}: \s*100%/,                 'Count 1-10 ( 9)';
+  is $lines[0], MESSAGE1,                                    'Count 1-10 ( 7)';
+  like $lines[-1], qr/\[=+\]/,                                 'Count 1-10 ( 8)';
+  like $lines[-1], qr/^@{[NAME1()]}: \s*100%/,                 'Count 1-10 ( 9)';
 }
 
 # -------------------------------------
@@ -129,11 +115,8 @@ Use v1 mode
 {
   my $p;
 my ($out, $err) = capture {
-  ok (evcheck(sub { $p = Term::ProgressBar->new(NAME2, 10); }, 
-                                                            'Count 1-10 ( 1)'),
-      1,                                                    'Count 1-10 ( 1)');
-  ok (evcheck(sub { $p->update($_) for 1..3  },             'Count 1-10 ( 2)'),
-      1,                                                    'Count 1-10 ( 2)');
+  lives_ok { $p = Term::ProgressBar->new(NAME2, 10); } 'Count 1-10 ( 1)';
+  lives_ok { $p->update($_) for 1..3  }                'Count 1-10 ( 2)';
 };
 print $out;
 
@@ -142,7 +125,7 @@ print $out;
     if $ENV{TEST_DEBUG};
   my @lines = split /\n/, $err;
 
-  ok $lines[-1], qr/^@{[NAME2()]}: \s*\b30%/,                'Count 1-10 ( 3)';
+  like $lines[-1], qr/^@{[NAME2()]}: \s*\b30%/,                'Count 1-10 ( 3)';
   my ($bar, $space) = $lines[-1] =~ /(\#*)(\s*)/;
   my $length = length($bar) + length($space);
   print STDERR
@@ -153,10 +136,8 @@ print $out;
   ok $ok;
   
 ($out, $err) = capture {
-  ok (evcheck(sub { $p->message(MESSAGE1)    },             'Count 1-10 ( 5)'),
-      1,                                                    'Count 1-10 ( 5)');
-  ok (evcheck(sub { $p->update($_) for 6..10 },             'Count 1-10 ( 6)'),
-      1,                                                    'Count 1-10 ( 6)');
+  lives_ok { $p->message(MESSAGE1)    }  'Count 1-10 ( 5)';
+  lives_ok { $p->update($_) for 6..10 }  'Count 1-10 ( 6)';
 };
 print $out;
   $err =~ s!^.*\r!!gm;
@@ -165,8 +146,8 @@ print $out;
 
   @lines = split /\n/, $err;
 
-  ok $lines[-1], qr/^@{[NAME2()]}: \s*\d+% \#*$/,            'Count 1-10 ( 8)';
-  ok $lines[-1], qr/^@{[NAME2()]}: \s*100%/,                 'Count 1-10 ( 9)';
+  like $lines[-1], qr/^@{[NAME2()]}: \s*\d+% \#*$/,            'Count 1-10 ( 8)';
+  like $lines[-1], qr/^@{[NAME2()]}: \s*100%/,                 'Count 1-10 ( 9)';
 }
 
 # -------------------------------------