Don't assign results in check blocks

[perl/modules/Variable-Magic.git] / t / 30-scalar.t

diff --git a/t/30-scalar.t b/t/30-scalar.t
index 3733ab72ba7e7db7d5d8093904ff3f3e46cc607c..4620e42bd9ce0073f9c32186a05830c3d1dd72ee 100644 (file)
--- a/t/30-scalar.t
+++ b/t/30-scalar.t
@@ -1,72 +1,47 @@
 #!perl -T
 
-use Test::More tests => 13;
+use strict;
+use warnings;
 
-use Variable::Magic qw/wizard cast dispell/;
+use Test::More tests => 2 * 14 + 2 + 1;
 
-my @c = (0) x 5;
-my @x = (0) x 5;
+use Variable::Magic qw/cast dispell/;
 
-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(), 'scalar : create wizard');
+my $wiz = init
+        [ qw/get set len clear free copy dup local fetch store exists delete/ ],
+        'scalar';
 
 my $n = int rand 1000;
 my $a = $n;
 
-cast $a, $wiz;
-ok(check(), 'scalar : cast');
+check { cast $a, $wiz } { }, 'cast';
 
-my $b = $a;
-++$x[0];
-ok(check(), 'scalar : assign to');
+my $b = check { $a } { get => 1 }, 'assign to';
+is $b, $n, 'scalar: assign to correctly';
 
-$b = "X${a}Y";
-++$x[0];
-ok(check(), 'scalar : interpolate');
+$b = check { "X${a}Y" } { get => 1 }, 'interpolate';
+is $b, "X${n}Y", 'scalar: interpolate correctly';
 
-$b = \$a;
-ok(check(), 'scalar : reference');
+$b = check { \$a } { }, 'reference';
 
-$a = 123;
-++$x[1];
-ok(check(), 'scalar : assign');
+check { $a = 123; () } { set => 1 }, 'assign to';
 
-++$a;
-++$x[0]; ++$x[1];
-ok(check(), 'scalar : increment');
+check { ++$a; () } { get => 1, set => 1 }, 'increment';
 
---$a;
-++$x[0]; ++$x[1];
-ok(check(), 'scalar : decrement');
+check { --$a; () } { get => 1, set => 1 }, 'decrement';
 
-$a *= 1.5;
-++$x[0]; ++$x[1];
-ok(check(), 'scalar : multiply');
+check { $a *= 1.5; () } { get => 1, set => 1 }, 'multiply in place';
 
-$a /= 1.5;
-++$x[0]; ++$x[1];
-ok(check(), 'scalar : divide');
+check { $a /= 1.5; () } { get => 1, set => 1 }, 'divide in place';
 
-{
+check {
  my $b = $n;
- cast $b, $wiz;
-}
-++$x[4];
-ok(check(), 'scalar : scope end');
+ check { cast $b, $wiz } { }, 'cast 2';
+} { free => 1 }, 'scope end';
 
-undef $a;
-++$x[1];
-ok(check(), 'scalar : undef');
+check { undef $a } { set => 1 }, 'undef';
 
-dispell $a, $wiz;
-ok(check(), 'scalar : dispell');
+check { dispell $a, $wiz } { }, 'dispell';