X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FVariable-Magic.git;a=blobdiff_plain;f=t%2F30-scalar.t;h=59ab5e576a645685e596c8310b0581fc5fd0c22a;hp=ccfba3aa7390aff48cb24342ffdb68f5ab059041;hb=93df7812b9a0da8cdfa57a107eb2f8f4b4744b49;hpb=14f66d40970bef63105be046a109c1a32859a8a0

diff --git a/t/30-scalar.t b/t/30-scalar.t
index ccfba3a..59ab5e5 100644
--- a/t/30-scalar.t
+++ b/t/30-scalar.t
@@ -3,73 +3,123 @@
 use strict;
 use warnings;
 
-use Test::More tests => 13;
+use Config qw<%Config>;
 
-use Variable::Magic qw/wizard cast dispell/;
+use Test::More tests => (2 * 14 + 2) + 2 * (2 * 8 + 4) + 5 + 1;
 
-my @c = (0) x 5;
-my @x = (0) x 5;
+use lib 't/lib';
+use VPIT::TestHelpers;
 
-sub check {
- for (0 .. 4) { return 0 unless $c[$_] == $x[$_]; }
- return 1;
-}
+use Variable::Magic qw<wizard cast dispell>;
+
+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 $is_5130_release = ("$]" == 5.013 && !$Config{git_describe}) ? 1 : 0;
+
+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;
 
-cast $a, $wiz;
-ok(check(), 'scalar : cast');
+watch { 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
+watch { $b = $a } { get => 1 }, 'assign to';
+is $b, $n, 'scalar: assign to correctly';
 
-$b = "X${a}Y";
-++$x[0];
-ok(check(), 'scalar : interpolate');
+$b = watch { "X${a}Y" } { get => 1 }, 'interpolate';
+is $b, "X${n}Y", 'scalar: interpolate correctly';
 
-$b = \$a;
-ok(check(), 'scalar : reference');
+$b = watch { \$a } { }, 'reference';
 
-$a = 123;
-++$x[1];
-ok(check(), 'scalar : assign');
+watch { $a = 123 } { set => 1 }, 'assign to';
 
-++$a;
-++$x[0]; ++$x[1];
-ok(check(), 'scalar : increment');
+watch { ++$a } { get => 1, set => 1 }, 'increment';
 
---$a;
-++$x[0]; ++$x[1];
-ok(check(), 'scalar : decrement');
+watch { --$a } { get => 1, set => 1 }, 'decrement';
 
-$a *= 1.5;
-++$x[0]; ++$x[1];
-ok(check(), 'scalar : multiply');
+watch { $a *= 1.5 } { get => 1, set => 1 }, 'multiply in place';
 
-$a /= 1.5;
-++$x[0]; ++$x[1];
-ok(check(), 'scalar : divide');
+watch { $a /= 1.5 } { get => 1, set => 1 }, 'divide in place';
 
-{
+watch {
  my $b = $n;
- cast $b, $wiz;
-}
-++$x[4];
-ok(check(), 'scalar : scope end');
+ watch { cast $b, $wiz } { }, 'cast 2';
+} { free => 1 }, 'scope end';
+
+watch { undef $a } { set => 1 }, 'undef';
+
+watch { dispell $a, $wiz } { }, 'dispell';
+
+# Array element
+
+my @a = (7, 8, 9);
+
+watch { cast $a[1], $wiz } { }, 'array element: cast';
+
+watch { $a[1] = 6 } { set => 1 }, 'array element: set';
+
+$b = watch { $a[1] } { get => ($is_5130_release ? 2 : 1) },'array element: get';
+is $b, 6, 'scalar: array element: get correctly';
+
+watch { $a[0] = 5 } { }, 'array element: set other';
+
+$b = watch { $a[2] } { }, 'array element: get other';
+is $b, 9, 'scalar: array element: get other correctly';
+
+$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
+watch { $b = delete $a[1] } { get => 1, free => ("$]" > 5.008_005 ? 1 : 0) },
+                            'array element: delete';
+is $b, 6, 'scalar: array element: delete correctly';
 
-undef $a;
-++$x[1];
-ok(check(), 'scalar : undef');
+watch { $a[1] = 4 } { }, 'array element: set after delete';
 
-dispell $a, $wiz;
-ok(check(), 'scalar : dispell');
+# Hash element
+
+my %h = (a => 7, b => 8);
+
+watch { cast $h{b}, $wiz } { }, 'hash element: cast';
+
+watch { $h{b} = 6 } { set => 1 }, 'hash element: set';
+
+$b = watch { $h{b} } { get => ($is_5130_release ? 2 : 1) }, 'hash element: get';
+is $b, 6, 'scalar: hash element: get correctly';
+
+watch { $h{a} = 5 } { }, 'hash element: set other';
+
+$b = watch { $h{a} } { }, 'hash element: get other';
+is $b, 5, 'scalar: hash element: get other correctly';
+
+$b = watch { exists $h{b} } { }, 'hash element: exists';
+is $b, 1, 'scalar: hash element: exists correctly';
+
+$b = watch { delete $h{b} } { get => 1, free => 1 }, 'hash element: delete';
+is $b, 6, 'scalar: hash element: delete correctly';
+
+watch { $h{b} = 4 } { }, 'hash element: set after delete';
+
+SKIP: {
+ load_or_skip('Tie::Array', undef, undef, 5);
+
+ tie my @a, 'Tie::StdArray';
+ $a[0] = $$;
+ $a[1] = -$$;
+
+ eval {
+  cast @a, wizard copy => sub { cast $_[3], $wiz; () };
+ };
+ is $@, '', 'cast copy magic on tied array';
+
+ watch { delete $a[0] } [ qw<clear free> ],
+                        'delete from tied array in void context';
+
+ $b = watch { delete $a[1] } [ qw<get clear free> ],
+                             'delete from tied array in scalar context';
+}