X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F30-scalar.t;h=a3eb18a41fdc3eef305503aa4e751b0b2ac647c2;hb=da422089a9a5dfbf84e72ec3ba867063471ff41c;hp=bfc659ab759d1732ffb848096f0fe4b905c38ef0;hpb=505fda7126b01811c0ca990552876a1c6d9dc7c3;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/30-scalar.t b/t/30-scalar.t
index bfc659a..a3eb18a 100644
--- a/t/30-scalar.t
+++ b/t/30-scalar.t
@@ -12,92 +12,92 @@ use Variable::Magic qw/wizard cast dispell MGf_COPY/;
 use lib 't/lib';
 use Variable::Magic::TestWatcher;
 
-my $wiz = init
+my $wiz = init_watcher
         [ qw/get set len clear free copy dup local fetch store exists delete/ ],
         'scalar';
 
 my $n = int rand 1000;
 my $a = $n;
 
-check { cast $a, $wiz } { }, 'cast';
+watch { cast $a, $wiz } { }, 'cast';
 
 my $b;
 # $b has to be set inside the block for the test to pass on 5.8.3 and lower
-check { $b = $a } { get => 1 }, 'assign to';
+watch { $b = $a } { get => 1 }, 'assign to';
 is $b, $n, 'scalar: assign to correctly';
 
-$b = check { "X${a}Y" } { get => 1 }, 'interpolate';
+$b = watch { "X${a}Y" } { get => 1 }, 'interpolate';
 is $b, "X${n}Y", 'scalar: interpolate correctly';
 
-$b = check { \$a } { }, 'reference';
+$b = watch { \$a } { }, 'reference';
 
-check { $a = 123; () } { set => 1 }, 'assign to';
+watch { $a = 123; () } { set => 1 }, 'assign to';
 
-check { ++$a; () } { get => 1, set => 1 }, 'increment';
+watch { ++$a; () } { get => 1, set => 1 }, 'increment';
 
-check { --$a; () } { get => 1, set => 1 }, 'decrement';
+watch { --$a; () } { get => 1, set => 1 }, 'decrement';
 
-check { $a *= 1.5; () } { get => 1, set => 1 }, 'multiply in place';
+watch { $a *= 1.5; () } { get => 1, set => 1 }, 'multiply in place';
 
-check { $a /= 1.5; () } { get => 1, set => 1 }, 'divide in place';
+watch { $a /= 1.5; () } { get => 1, set => 1 }, 'divide in place';
 
-check {
+watch {
  my $b = $n;
- check { cast $b, $wiz } { }, 'cast 2';
+ watch { cast $b, $wiz } { }, 'cast 2';
 } { free => 1 }, 'scope end';
 
-check { undef $a } { set => 1 }, 'undef';
+watch { undef $a } { set => 1 }, 'undef';
 
-check { dispell $a, $wiz } { }, 'dispell';
+watch { dispell $a, $wiz } { }, 'dispell';
 
 # Array element
 
 my @a = (7, 8, 9);
 
-check { cast $a[1], $wiz } { }, 'array element: cast';
+watch { cast $a[1], $wiz } { }, 'array element: cast';
 
-check { $a[1] = 6; () } { set => 1 }, 'array element: set';
+watch { $a[1] = 6; () } { set => 1 }, 'array element: set';
 
-$b = check { $a[1] } { get => 1 }, 'array element: get';
+$b = watch { $a[1] } { get => 1 }, 'array element: get';
 is $b, 6, 'scalar: array element: get correctly';
 
-check { $a[0] = 5 } { }, 'array element: set other';
+watch { $a[0] = 5 } { }, 'array element: set other';
 
-$b = check { $a[2] } { }, 'array element: get other';
+$b = watch { $a[2] } { }, 'array element: get other';
 is $b, 9, 'scalar: array element: get other correctly';
 
-$b = check { exists $a[1] } { }, 'array element: exists';
+$b = watch { exists $a[1] } { }, 'array element: exists';
 is $b, 1, 'scalar: array element: exists correctly';
 
 # $b has to be set inside the block for the test to pass on 5.8.3 and lower
-check { $b = delete $a[1] } { get => 1, free => ($] > 5.008005 ? 1 : 0) }, 'array element: delete';
+watch { $b = delete $a[1] } { get => 1, free => ($] > 5.008005 ? 1 : 0) }, 'array element: delete';
 is $b, 6, 'scalar: array element: delete correctly';
 
-check { $a[1] = 4 } { }, 'array element: set after delete';
+watch { $a[1] = 4 } { }, 'array element: set after delete';
 
 # Hash element
 
 my %h = (a => 7, b => 8);
 
-check { cast $h{b}, $wiz } { }, 'hash element: cast';
+watch { cast $h{b}, $wiz } { }, 'hash element: cast';
 
-check { $h{b} = 6; () } { set => 1 }, 'hash element: set';
+watch { $h{b} = 6; () } { set => 1 }, 'hash element: set';
 
-$b = check { $h{b} } { get => 1 }, 'hash element: get';
+$b = watch { $h{b} } { get => 1 }, 'hash element: get';
 is $b, 6, 'scalar: hash element: get correctly';
 
-check { $h{a} = 5 } { }, 'hash element: set other';
+watch { $h{a} = 5 } { }, 'hash element: set other';
 
-$b = check { $h{a} } { }, 'hash element: get other';
+$b = watch { $h{a} } { }, 'hash element: get other';
 is $b, 5, 'scalar: hash element: get other correctly';
 
-$b = check { exists $h{b} } { }, 'hash element: exists';
+$b = watch { exists $h{b} } { }, 'hash element: exists';
 is $b, 1, 'scalar: hash element: exists correctly';
 
-$b = check { delete $h{b} } { get => 1, free => 1 }, 'hash element: delete';
+$b = watch { delete $h{b} } { get => 1, free => 1 }, 'hash element: delete';
 is $b, 6, 'scalar: hash element: delete correctly';
 
-check { $h{b} = 4 } { }, 'hash element: set after delete';
+watch { $h{b} = 4 } { }, 'hash element: set after delete';
 
 SKIP: {
  my $SKIP;
@@ -122,5 +122,5 @@ SKIP: {
  };
  is $@, '', 'cast copy magic on tied array';
 
- check { delete $a[0] } [ qw/get clear free/ ], 'delete from tied array';
+ watch { delete $a[0] } [ qw/get clear free/ ], 'delete from tied array';
 }