X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FVariable-Magic.git;a=blobdiff_plain;f=t%2F34-glob.t;h=af77a4fb795470a6c06fde61654315ebd6a8cd92;hp=47e68926b4e04256c0b13741c77bc4ea3f07674b;hb=93df7812b9a0da8cdfa57a107eb2f8f4b4744b49;hpb=edb40826793e6ae2d30fe2f1c61bfff7b1df3afe

diff --git a/t/34-glob.t b/t/34-glob.t
index 47e6892..af77a4f 100644
--- a/t/34-glob.t
+++ b/t/34-glob.t
@@ -5,36 +5,64 @@ use warnings;
 
 use Test::More;
 
-eval "use Symbol qw/gensym/";
-if ($@) {
- plan skip_all => "Symbol::gensym required for testing magic for globs";
-} else {
- plan tests => 2 * 8 + 1;
- diag "Using Symbol $Symbol::VERSION" if defined $Symbol::VERSION;
+use lib 't/lib';
+use VPIT::TestHelpers;
+
+BEGIN {
+ load_or_skip_all('Symbol', undef, [ 'gensym' ]);
+ plan tests => 2 * 17 + 1;
 }
 
-use Variable::Magic qw/cast dispell/;
+use Variable::Magic qw<cast dispell VMG_COMPAT_GLOB_GET>;
+
+my %get = VMG_COMPAT_GLOB_GET ? (get => 1) : ();
 
 use lib 't/lib';
 use Variable::Magic::TestWatcher;
 
-my $wiz = init
-        [ qw/get set len clear free copy dup local fetch store exists delete/ ],
+my $wiz = init_watcher
+        [ qw<get set len clear free copy dup local fetch store exists delete> ],
         'glob';
 
 local *a = gensym();
 
-check { cast *a, $wiz } { }, 'cast';
+watch { cast *a, $wiz } +{ }, 'cast';
+
+watch { local *b = *a } +{ %get }, 'assign to';
+
+SKIP: {
+ skip 'This failed temporarily between perls 5.13.1 and 5.13.8 (included)'
+                            => 5 * 2 if "$]" >= 5.013_001 and "$]" <= 5.013_008;
 
-check { local *b = *a } { }, 'assign to';
+ my $cxt = 'void contex';
+ my $exp = { set => 1 };
 
-check { *a = gensym() } { set => 1 }, 'assign';
+ watch { *a = \1 }          $exp, "assign scalar slot in $cxt";
+ watch { *a = [ qw<x y> ] } $exp, "assign array slot in $cxt";
+ watch { *a = { u => 1 } }  $exp, "assign hash slot in $cxt";
+ watch { *a = sub { } }     $exp, "assign code slot in $cxt";
+ watch { *a = gensym() }    $exp, "assign glob in $cxt";
+}
+
+{
+ my $cxt = 'scalar context';
+ my $exp = { %get, set => 1 };
+ my $v;
 
-check {
+ $v = watch { *a = \1 }          $exp, "assign scalar slot in $cxt";
+ $v = watch { *a = [ qw<x y> ] } $exp, "assign array slot in $cxt";
+ $v = watch { *a = { u => 1 } }  $exp, "assign hash slot in $cxt";
+ $v = watch { *a = sub { } }     $exp, "assign code slot in $cxt";
+ $v = watch { *a = gensym() }    $exp, "assign glob in $cxt";
+}
+
+watch {
  local *b = gensym();
- check { cast *b, $wiz } { }, 'cast 2';
-} { }, 'scope end';
+ watch { cast *b, $wiz } +{ }, 'cast 2';
+} +{ }, 'scope end';
+
+%get = () if "$]" >= 5.013_007;
 
-check { undef *a } { }, 'undef';
+watch { undef *a } +{ %get }, 'undef';
 
-check { dispell *a, $wiz } { }, 'dispell';
+watch { dispell *a, $wiz } +{ %get }, 'dispell';