Better exception tests

diff --git a/t/11-wrap.t b/t/11-wrap.t
index 7e013235733bd79b42ad8110beee09d77f3f2a3f..50884709b596eff523d9506bece8c01f27be2775 100644 (file)
--- a/t/11-wrap.t
+++ b/t/11-wrap.t
@@ -8,20 +8,28 @@ use Test::More tests => 7 + 6 + 3 + 1 + 6 + 1 + (($^V ge v5.10.0) ? 2 : 0) + 1;
 use Scalar::Util qw/set_prototype/;
 use Sub::Prototype::Util qw/wrap/;
 
+sub exception {
+ my ($msg) = @_;
+ $msg =~ s/\s+/\\s+/g;
+ return qr/^$msg.*?at\s+\Q$0\E\s+line\s+\d+/;
+}
+
 eval { wrap undef };
-like($@, qr/^No\s+subroutine/, 'recall undef croaks');
+like $@, exception('No subroutine'), 'recall undef croaks';
 eval { wrap '' };
-like($@, qr/^No\s+subroutine/, 'recall "" croaks');
+like $@, exception('No subroutine'), 'recall "" croaks';
 eval { wrap \1 };
-like($@, qr/^Unhandled\s+SCALAR/, 'recall scalarref croaks');
+like $@, exception('Unhandled SCALAR'), 'recall scalarref croaks';
 eval { wrap [ ] };
-like($@, qr/^Unhandled\s+ARRAY/, 'recall arrayref croaks');
+like $@, exception('Unhandled ARRAY'), 'recall arrayref croaks';
 eval { wrap sub { } };
-like($@, qr/^Unhandled\s+CODE/, 'recall coderef croaks');
+like $@, exception('Unhandled CODE'), 'recall coderef croaks';
 eval { wrap { 'foo' => undef, 'bar' => undef } };
-like($@, qr!exactly\s+one\s+key/value\s+pair!, 'recall hashref with 2 pairs croaks');
+like $@, qr!exactly\s+one\s+key/value\s+pair!,
+                                           'recall hashref with 2 pairs croaks';
 eval { wrap 'hlagh', qw/a b c/ };
-like($@, qr/^Optional\s+arguments/, 'recall takes options in a key => value list');
+like $@, exception('Optional arguments'),
+                                  'recall takes options in a key => value list';
 
 my $push_exp = '{ CORE::push(@{$_[0]}, @_[1..$#_]) }';
 my $push = wrap 'CORE::push', compile => 0;
@@ -132,4 +140,6 @@ if ($^V ge v5.10.0) {
 }
 
 eval { wrap { 'main::dummy' => '\[@%]' }, ref => 'shift' };
-like($@, qr/to\s+shift\s+must\s+be\s+array +\([\w ]+\) +at\s+\Q$0\E/, 'invalid eval code croaks');
+like $@,
+       qr/to\s+shift\s+must\s+be\s+array +\([\w ]+\) +at\s+\Q$0\E\s+line\s+\d+/,
+                                                     'invalid eval code croaks';

diff --git a/t/12-recall.t b/t/12-recall.t
index 8420cebd93f2be5289d4bceb7d7be901b9abe502..269cd1df49be40ca8a0047f7bc7905e62664bd8b 100644 (file)
--- a/t/12-recall.t
+++ b/t/12-recall.t
@@ -8,22 +8,29 @@ use Test::More tests => 8 + 20 + (($^V ge v5.10.0) ? 4 : 0);
 use Scalar::Util qw/set_prototype/;
 use Sub::Prototype::Util qw/recall/;
 
+sub exception {
+ my ($msg) = @_;
+ $msg =~ s/\s+/\\s+/g;
+ return qr/^$msg.*?at\s+\Q$0\E\s+line\s+\d+/;
+}
+
 eval { recall undef };
-like($@, qr/^No\s+subroutine/, 'recall undef croaks');
+like $@, exception('No subroutine'), 'recall undef croaks';
 eval { recall '' };
-like($@, qr/^No\s+subroutine/, 'recall "" croaks');
+like $@, exception('No subroutine'), 'recall "" croaks';
 eval { recall \1 };
-like($@, qr/^Unhandled\s+SCALAR/, 'recall scalarref croaks');
+like $@, exception('Unhandled SCALAR'), 'recall scalarref croaks';
 eval { recall [ ] };
-like($@, qr/^Unhandled\s+ARRAY/, 'recall arrayref croaks');
+like $@, exception('Unhandled ARRAY'), 'recall arrayref croaks';
 eval { recall sub { } };
-like($@, qr/^Unhandled\s+CODE/, 'recall coderef croaks');
+like $@, exception('Unhandled CODE'), 'recall coderef croaks';
 eval { recall { 'foo' => undef, 'bar' => undef } };
-like($@, qr!exactly\s+one\s+key/value\s+pair!, 'recall hashref with 2 pairs croaks');
+like $@, qr!exactly\s+one\s+key/value\s+pair!,
+                                           'recall hashref with 2 pairs croaks';
 eval { recall 'hlagh' };
-like($@, qr/^Undefined\s+subroutine/, 'recall <unknown> croaks');
+like $@, qr/^Undefined\s+subroutine/, 'recall <unknown> croaks';
 eval { recall 'for' };
-like($@, qr/^syntax\s+error\s+at\s+\Q$0\E/, 'invalid eval code croaks');
+like $@, exception('syntax error'), 'invalid eval code croaks';
 
 sub noproto { $_[1], $_[0] }
 sub mytrunc ($;$) { $_[1], $_[0] }