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

diff --git a/t/34-glob.t b/t/34-glob.t
index 76e0224..af77a4f 100644
--- a/t/34-glob.t
+++ b/t/34-glob.t
@@ -5,51 +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 => 7;
+use lib 't/lib';
+use VPIT::TestHelpers;
+
+BEGIN {
+ load_or_skip_all('Symbol', undef, [ 'gensym' ]);
+ plan tests => 2 * 17 + 1;
 }
 
-use Variable::Magic qw/wizard cast dispell/;
+use Variable::Magic qw<cast dispell VMG_COMPAT_GLOB_GET>;
 
-my @c = (0) x 5;
-my @x = (0) x 5;
+my %get = VMG_COMPAT_GLOB_GET ? (get => 1) : ();
 
-sub check {
- for (0 .. 4) { return 0 unless $c[$_] == $x[$_]; }
- return 1;
-}
+use lib 't/lib';
+use Variable::Magic::TestWatcher;
 
-my $i = -1;
-my $wiz = wizard get   => sub { ++$c[0] },
-                 set   => sub { ++$c[1] },
-                 len   => sub { ++$c[2] },
-                 clear => sub { ++$c[3] },
-                 free  => sub { ++$c[4] };
-ok(check(), 'glob : create wizard');
+my $wiz = init_watcher
+        [ qw<get set len clear free copy dup local fetch store exists delete> ],
+        'glob';
 
 local *a = gensym();
 
-cast *a, $wiz;
-ok(check(), 'glob : cast');
+watch { cast *a, $wiz } +{ }, 'cast';
+
+watch { local *b = *a } +{ %get }, 'assign to';
 
-local *b = *a;
-ok(check(), 'glob : 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;
 
-*a = gensym();
-++$x[1];
-ok(check(), 'glob : assign');
+ my $cxt = 'void contex';
+ my $exp = { set => 1 };
+
+ 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";
+}
 
 {
- local *b = gensym();
- cast *b, $wiz;
+ my $cxt = 'scalar context';
+ my $exp = { %get, set => 1 };
+ my $v;
+
+ $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";
 }
-ok(check(), 'glob : scope end');
 
-undef *a;
-ok(check(), 'glob : undef');
+watch {
+ local *b = gensym();
+ watch { cast *b, $wiz } +{ }, 'cast 2';
+} +{ }, 'scope end';
+
+%get = () if "$]" >= 5.013_007;
+
+watch { undef *a } +{ %get }, 'undef';
 
-dispell *a, $wiz;
-ok(check(), 'glob : dispell');
+watch { dispell *a, $wiz } +{ %get }, 'dispell';