X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F23-localize-ctl.t;h=b72be227f4a8ca94783e56af611df612761852e0;hb=e7846e7f6fded4c4a3139054c5206c1480711867;hp=9acf7be3c372b7ceb51315b343bf86f30e06ee1f;hpb=c8997e4a75e935854f13e100fdcbc222978c1211;p=perl%2Fmodules%2FScope-Upper.git

diff --git a/t/23-localize-ctl.t b/t/23-localize-ctl.t
index 9acf7be..b72be22 100644
--- a/t/23-localize-ctl.t
+++ b/t/23-localize-ctl.t
@@ -5,7 +5,7 @@ use warnings;
 
 use Test::More tests => 44 + 30;
 
-use Scope::Upper qw/localize UP HERE/;
+use Scope::Upper qw<localize UP HERE>;
 
 our ($x, $y);
 
@@ -131,19 +131,19 @@ $y = undef;
     {
      local $x = 3;
      localize '$y' => 1 => UP UP UP UP;
-     is $x, 3,     'die - reap outside eval [not yet 1 - x]';
-     is $y, undef, 'die - reap outside eval [not yet 1 - y]';
+     is $x, 3,     'die - localize outside eval [not yet 1 - x]';
+     is $y, undef, 'die - localize outside eval [not yet 1 - y]';
     }
-    is $x, 2,     'die - reap outside eval [not yet 2 - x]';
-    is $y, undef, 'die - reap outside eval [not yet 2 - y]';
+    is $x, 2,     'die - localize outside eval [not yet 2 - x]';
+    is $y, undef, 'die - localize outside eval [not yet 2 - y]';
     die;
    }
   };
-  is $x, 1,     'die - reap outside eval [not yet 3 - x]';
-  is $y, undef, 'die - reap outside eval [not yet 3 - y]';
+  is $x, 1,     'die - localize outside eval [not yet 3 - x]';
+  is $y, undef, 'die - localize outside eval [not yet 3 - y]';
  } # should trigger here
- is $x, 1, 'die - reap outside eval [ok - x]';
- is $y, 1, 'die - reap outside eval [ok - y]';
+ is $x, 1, 'die - localize outside eval [ok - x]';
+ is $y, 1, 'die - localize outside eval [ok - y]';
 }
 
 $y = undef;
@@ -155,16 +155,16 @@ $y = undef;
    {
     local $x = 3;
     localize '$y' => 1 => UP UP UP;
-    is $x, 3,     'die - reap at eval [not yet 1 - x]';
-    is $y, undef, 'die - reap at eval [not yet 1 - y]';
+    is $x, 3,     'die - localize at eval [not yet 1 - x]';
+    is $y, undef, 'die - localize at eval [not yet 1 - y]';
    }
-   is $x, 2,     'die - reap at eval [not yet 2 - x]';
-   is $y, undef, 'die - reap at eval [not yet 2 - y]';
+   is $x, 2,     'die - localize at eval [not yet 2 - x]';
+   is $y, undef, 'die - localize at eval [not yet 2 - y]';
    die;
   }
  }; # should trigger here
- is $x, 1, 'die - reap at eval [ok - x]';
- is $y, 1, 'die - reap at eval [ok - y]';
+ is $x, 1, 'die - localize at eval [ok - x]';
+ is $y, 1, 'die - localize at eval [ok - y]';
 }
 
 $y = undef;
@@ -176,23 +176,29 @@ $y = undef;
    {
     local $x = 3;
     localize '$y' => 1 => UP UP;
-    is $x, 3,     'die - reap inside eval [not yet 1 - x]';
-    is $y, undef, 'die - reap inside eval [not yet 1 - y]';
+    is $x, 3,     'die - localize inside eval [not yet 1 - x]';
+    is $y, undef, 'die - localize inside eval [not yet 1 - y]';
    }
-   is $x, 2,     'die - reap inside eval [not yet 2 - x]';
-   is $y, undef, 'die - reap inside eval [not yet 2 - y]';
+   is $x, 2,     'die - localize inside eval [not yet 2 - x]';
+   is $y, undef, 'die - localize inside eval [not yet 2 - y]';
    die;
   } # should trigger here
  };
- is $x, 1,     'die - reap inside eval [ok - x]';
- is $y, undef, 'die - reap inside eval [ok - y]';
+ is $x, 1,     'die - localize inside eval [ok - x]';
+ is $y, undef, 'die - localize inside eval [ok - y]';
 }
 
 SKIP:
 {
- skip 'Perl 5.10 required to test given/when' => 30 if $] < 5.010;
+ skip 'Perl 5.10 required to test given/when' => 30 if "$]" < 5.010;
 
  eval <<' GIVEN_TEST_1';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -214,6 +220,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_2';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -237,6 +249,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_3';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -258,6 +276,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_4';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {
@@ -281,6 +305,12 @@ SKIP:
  fail $@ if $@;
 
  eval <<' GIVEN_TEST_5';
+  BEGIN {
+   if ("$]" >= 5.017_011) {
+    require warnings;
+    warnings->unimport('experimental::smartmatch');
+   }
+  }
   use feature 'switch';
   local $y;
   {