X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F34-glob.t;h=de5c64cdf16ed408e3be995775656dfbf860f9e8;hb=bdc2a15aa5ca3f57b45d2c6e560f110c91b2ae87;hp=a1ece33acdd86b7dd69727ef5acd30f6baa9132a;hpb=ad7c749baf8ebc2ff3e49d44b414f67f13f4ebf2;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/34-glob.t b/t/34-glob.t
index a1ece33..de5c64c 100644
--- a/t/34-glob.t
+++ b/t/34-glob.t
@@ -1,52 +1,42 @@
 #!perl -T
 
+use strict;
+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;
+ plan tests => 2 * 8 + 1;
+ diag "Using Symbol $Symbol::VERSION" if defined $Symbol::VERSION;
 }
 
-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';
 
-local *b = *a;
-ok(check(), 'glob : assign to');
+watch { local *b = *a } +{ %get }, 'assign to';
 
-*a = gensym();
-++$x[1];
-ok(check(), 'glob : assign');
+watch { *a = gensym() } +{ %get, set => 1 }, 'assign';
 
-{
+watch {
  local *b = gensym();
- cast *b, $wiz;
-}
-ok(check(), 'glob : scope end');
+ watch { cast *b, $wiz } +{ }, 'cast 2';
+} +{ }, 'scope end';
 
-undef *a;
-ok(check(), 'glob : undef');
+watch { undef *a } +{ %get }, 'undef';
 
-dispell *a, $wiz;
-ok(check(), 'glob : dispell');
+watch { dispell *a, $wiz } +{ %get }, 'dispell';