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

[perl/modules/Scope-Upper.git] / t / 20-localize-target.t

diff --git a/t/20-localize-target.t b/t/20-localize-target.t
index 40d8f65b160c171afe5cf0d0bcd32e66f32af482..c68a1a3428e2857b47b5f72b523de154d77aa5a7 100644 (file)
--- a/t/20-localize-target.t
+++ b/t/20-localize-target.t
@@ -3,9 +3,9 @@
 use strict;
 use warnings;
 
-use Test::More tests => 61 + 4;
+use Test::More tests => 70 + 4;
 
-use Scope::Upper qw/localize UP HERE/;
+use Scope::Upper qw<localize UP HERE>;
 
 # Scalars
 
@@ -66,7 +66,8 @@ undef *x;
 
 SKIP:
 {
- skip 'Can\'t localize through a reference before 5.8.1' => 2 if $] < 5.008001;
+ skip 'Can\'t localize through a reference before 5.8.1' => 2
+                                                            if "$]" < 5.008_001;
  eval q{
   no strict 'refs';
   local ${''} = 9;
@@ -80,7 +81,8 @@ SKIP:
 
 SKIP:
 {
- skip 'Can\'t localize through a reference before 5.8.1' => 2 if $] < 5.008001;
+ skip 'Can\'t localize through a reference before 5.8.1' => 2
+                                                            if "$]" < 5.008_001;
  eval q{
   no strict 'refs';
   local ${''} = 10;
@@ -294,6 +296,43 @@ my $xh = { a => 5, c => 7 };
  is foo(), 'x', 'localize *foo, sub { "y" } => UP [end]';
 }
 
+sub X::foo { 'X::foo' }
+
+{
+ {
+  {
+   localize 'X::foo', sub { 'X::foo 2' } => UP;
+   is(X->foo, 'X::foo', 'localize "X::foo", sub { "X::foo 2" } => UP [not yet]')
+  }
+  is(X->foo, 'X::foo 2', 'localize "X::foo", sub { "X::foo 2" } => UP [ok]');
+ }
+ is(X->foo, 'X::foo', 'localize "X::foo", sub { "X::foo 2" } => UP [end]');
+}
+
+@Y::ISA = 'X';
+
+{
+ {
+  {
+   localize 'X::foo', sub { 'X::foo 3' } => UP;
+   is(Y->foo, 'X::foo', 'localize "X::foo", sub { "X::foo 3" } => UP [not yet]')
+  }
+  is(Y->foo, 'X::foo 3', 'localize "X::foo", sub { "X::foo 3" } => UP [ok]');
+ }
+ is(Y->foo, 'X::foo', 'localize "X::foo", sub { "X::foo 2" } => UP [end]');
+}
+
+{
+ {
+  {
+   localize 'Y::foo', sub { 'Y::foo' } => UP;
+   is(Y->foo, 'X::foo', 'localize "Y::foo", sub { "Y::foo" } => UP [not yet]');
+  }
+  is(Y->foo, 'Y::foo', 'localize "Y::foo", sub { "Y::foo" } => UP [ok]');
+ }
+ is(Y->foo, 'X::foo', 'localize "Y::foo", sub { "Y::foo" } => UP [end]');
+}
+
 # Invalid
 
 sub invalid_ref { qr/^Invalid \Q$_[0]\E reference as the localization target/ }