Harden t/09-load-tests.t against stray exits

[perl/modules/Scope-Upper.git] / t / 21-localize-level.t

diff --git a/t/21-localize-level.t b/t/21-localize-level.t
index 35a660072fbb7fbad20c3f840cc794cf37b0ca73..b091eeecc077b95d748d0bbbb2bddc84572d1484 100644 (file)
--- a/t/21-localize-level.t
+++ b/t/21-localize-level.t
@@ -6,7 +6,7 @@ use warnings;
 use lib 't/lib';
 use Test::Leaner 'no_plan';
 
-use Scope::Upper qw/localize UP HERE/;
+use Scope::Upper qw<localize UP HERE>;
 
 use Scope::Upper::TestGenerator;
 
@@ -14,40 +14,22 @@ local $Scope::Upper::TestGenerator::call = sub {
  my ($height, $level, $i) = @_;
  $level = $level ? 'UP ' x $level : 'HERE';
  return [ "localize '\$main::y' => 1 => $level;\n" ];
-}; 
+};
 
 local $Scope::Upper::TestGenerator::test = sub {
  my ($height, $level, $i) = @_;
  my $j = ($i == $height - $level) ? 1 : 'undef';
- return "is(\$main::y, $j, 'y h=$height, l=$level, i=$i');\n";
+ return "verbose_is(\$main::y, $j, 'y h=$height, l=$level, i=$i');\n";
 };
 
 our ($x, $y, $testcase);
 
-{
- no warnings 'redefine';
- *is = sub ($$;$) {
-  my ($a, $b, $desc) = @_;
-  if (defined $testcase
-      and (defined $b) ? (not defined $a or $a != $b) : defined $a) {
-   diag <<DIAG;
-=== This testcase failed ===
-$testcase
-==== vvvvv Errors vvvvvv ===
-DIAG
-   undef $testcase;
-  }
-  Test::Leaner::is($a, $b, $desc);
- }
-}
-
 for my $level (0 .. 2) {
  for my $height ($level + 1 .. $level + 2) {
   my $tests = Scope::Upper::TestGenerator::gen($height, $level);
-  for (@$tests) {
-   $testcase = $_;
+  for $testcase (@$tests) {
    $x = $y = undef;
-   eval;
+   eval $testcase;
    diag $@ if $@;
   }
  }