From dd8679e1ea465f886d295dda32474d046138b5e4 Mon Sep 17 00:00:00 2001 From: Elizabeth Mattijsen Date: Fri, 15 Aug 2014 15:22:39 +0200 Subject: [PATCH] No longer allow strings with dies_ok/lives_ok --- lib/Test.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Test.pm b/lib/Test.pm index 8727c4b8cdd..41962fe8e3b 100644 --- a/lib/Test.pm +++ b/lib/Test.pm @@ -206,11 +206,11 @@ multi sub isa_ok(Mu $var, Mu $type, $msg = ("The object is-a '" ~ $type.perl ~ " return $ok; } -multi sub dies_ok($code, $reason = '') is export { +multi sub dies_ok(Callable $code, $reason = '') is export { $time_after = nqp::p6box_n(nqp::time_n); my $death = 1; try { - $code ~~ Callable ?? $code() !! EVAL $code; + $code(); $death = 0; } my $ok = proclaim( $death, $reason ); @@ -218,10 +218,10 @@ multi sub dies_ok($code, $reason = '') is export { return $ok; } -multi sub lives_ok($code, $reason = '') is export { +multi sub lives_ok(Callable $code, $reason = '') is export { $time_after = nqp::p6box_n(nqp::time_n); try { - $code ~~ Callable ?? $code() !! EVAL $code; + $code(); } my $ok = proclaim((not defined $!), $reason) or diag($!); $time_before = nqp::p6box_n(nqp::time_n);