X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F30-scalar.t;h=d6895d214a3378e635c5a60911c56b614b672fc1;hb=e8a50f8f820a7aa610721b06af9251468a635e6b;hp=bdad8ed19463b17f6673edb2f1aad53bf3e11db3;hpb=763ba8093427f3668368fa885741618ac6289d41;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/30-scalar.t b/t/30-scalar.t
index bdad8ed..d6895d2 100644
--- a/t/30-scalar.t
+++ b/t/30-scalar.t
@@ -3,80 +3,97 @@
 use strict;
 use warnings;
 
-use Test::More tests => 13;
-
-use Variable::Magic qw/wizard cast dispell/;
-
-my @c = (0) x 12;
-my @x = (0) x 12;
-
-sub check {
- for (0 .. 11) { return 0 unless $c[$_] == $x[$_]; }
- return 1;
-}
-
-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] },
-                 copy  => sub { ++$c[5] },
-                 dup   => sub { ++$c[6] },
-                 local => sub { ++$c[7] },
-                 fetch => sub { ++$c[8] },
-                 store => sub { ++$c[9] },
-                 'exists' => sub { ++$c[10] },
-                 'delete' => sub { ++$c[11] };
-ok(check(), 'scalar : create wizard');
+use Test::More tests => (2 * 14 + 2) + 2 * (2 * 8 + 4) + 1;
+
+use Variable::Magic qw/cast dispell/;
+
+use lib 't/lib';
+use Variable::Magic::TestWatcher;
+
+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;
+# $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';
+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';
+
+check { undef $a } { set => 1 }, 'undef';
+
+check { dispell $a, $wiz } { }, 'dispell';
+
+# Array element
+
+my @a = (7, 8, 9);
+
+check { cast $a[1], $wiz } { }, 'array element: cast';
+
+check { $a[1] = 6; () } { set => 1 }, 'array element: set';
+
+$b = check { $a[1] } { get => 1 }, 'array element: get';
+is $b, 6, 'scalar: array element: get correctly';
+
+check { $a[0] = 5 } { }, 'array element: set other';
+
+$b = check { $a[2] } { }, 'array element: get other';
+is $b, 9, 'scalar: array element: get other correctly';
+
+$b = check { 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';
+is $b, 6, 'scalar: array element: delete correctly';
+
+check { $a[1] = 4 } { }, 'array element: set after delete';
+
+# Hash element
+
+my %h = (a => 7, b => 8);
+
+check { cast $h{b}, $wiz } { }, 'hash element: cast';
+
+check { $h{b} = 6; () } { set => 1 }, 'hash element: set';
+
+$b = check { $h{b} } { get => 1 }, 'hash element: get';
+is $b, 6, 'scalar: hash element: get correctly';
+
+check { $h{a} = 5 } { }, 'hash element: set other';
+
+$b = check { $h{a} } { }, 'hash element: get other';
+is $b, 5, 'scalar: hash element: get other correctly';
+
+$b = check { 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';
+is $b, 6, 'scalar: hash element: delete correctly';
 
-undef $a;
-++$x[1];
-ok(check(), 'scalar : undef');
+check { $h{b} = 4 } { }, 'hash element: set after delete';
 
-dispell $a, $wiz;
-ok(check(), 'scalar : dispell');