Merge perl 5.24 fixes from davem

[perl/modules/Scope-Upper.git] / t / 31-localize_elem-level.t

diff --git a/t/31-localize_elem-level.t b/t/31-localize_elem-level.t
index b95acd694e9256cad9794f68acc819082ef53698..cd700c7a4cb8a74c5b671a3ef2458944d315eddb 100644 (file)
--- a/t/31-localize_elem-level.t
+++ b/t/31-localize_elem-level.t
@@ -3,17 +3,18 @@
 use strict;
 use warnings;
 
-use Test::More 'no_plan'; 
+use lib 't/lib';
+use Test::Leaner 'no_plan';
 
-use Scope::Upper qw/localize_elem/;
+use Scope::Upper qw<localize_elem UP HERE>;
 
-use lib 't/lib';
 use Scope::Upper::TestGenerator;
 
 our ($x, $testcase);
 
 local $Scope::Upper::TestGenerator::call = sub {
  my ($height, $level, $i) = @_;
+ $level = $level ? 'UP ' x $level : 'HERE';
  return [ "localize_elem '\@main::a', 1 => 3 => $level;\n" ];
 };
 
@@ -28,11 +29,10 @@ our @a;
 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 = undef;
    @a = (1, 2);
-   eval;
+   eval $testcase;
    diag $@ if $@;
   }
  }
@@ -40,8 +40,9 @@ for my $level (0 .. 2) {
 
 local $Scope::Upper::TestGenerator::call = sub {
  my ($height, $level, $i) = @_;
+ $level = $level ? 'UP ' x $level : 'HERE';
  return [ "localize_elem '%main::h', 'a' => 1 => $level;\n" ];
-}; 
+};
 
 local $Scope::Upper::TestGenerator::test = sub {
  my ($height, $level, $i) = @_;
@@ -54,11 +55,10 @@ our %h;
 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 = undef;
    %h = ();
-   eval;
+   eval $testcase;
    diag $@ if $@;
   }
  }