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

diff --git a/t/30-scalar.t b/t/30-scalar.t
index c92b186..59ab5e5 100644
--- a/t/30-scalar.t
+++ b/t/30-scalar.t
@@ -5,9 +5,12 @@ use warnings;
 
 use Config qw<%Config>;
 
-use Test::More tests => (2 * 14 + 2) + 2 * (2 * 8 + 4) + 3 + 1;
+use Test::More tests => (2 * 14 + 2) + 2 * (2 * 8 + 4) + 5 + 1;
 
-use Variable::Magic qw<wizard cast dispell MGf_COPY>;
+use lib 't/lib';
+use VPIT::TestHelpers;
+
+use Variable::Magic qw<wizard cast dispell>;
 
 use lib 't/lib';
 use Variable::Magic::TestWatcher;
@@ -33,15 +36,15 @@ is $b, "X${n}Y", 'scalar: interpolate correctly';
 
 $b = watch { \$a } { }, 'reference';
 
-watch { $a = 123; () } { set => 1 }, 'assign to';
+watch { $a = 123 } { set => 1 }, 'assign to';
 
-watch { ++$a; () } { get => 1, set => 1 }, 'increment';
+watch { ++$a } { get => 1, set => 1 }, 'increment';
 
-watch { --$a; () } { get => 1, set => 1 }, 'decrement';
+watch { --$a } { get => 1, set => 1 }, 'decrement';
 
-watch { $a *= 1.5; () } { get => 1, set => 1 }, 'multiply in place';
+watch { $a *= 1.5 } { get => 1, set => 1 }, 'multiply in place';
 
-watch { $a /= 1.5; () } { get => 1, set => 1 }, 'divide in place';
+watch { $a /= 1.5 } { get => 1, set => 1 }, 'divide in place';
 
 watch {
  my $b = $n;
@@ -58,7 +61,7 @@ my @a = (7, 8, 9);
 
 watch { cast $a[1], $wiz } { }, 'array element: cast';
 
-watch { $a[1] = 6; () } { set => 1 }, 'array element: set';
+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';
@@ -72,7 +75,7 @@ $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.008005 ? 1 : 0) },
+watch { $b = delete $a[1] } { get => 1, free => ("$]" > 5.008_005 ? 1 : 0) },
                             'array element: delete';
 is $b, 6, 'scalar: array element: delete correctly';
 
@@ -84,7 +87,7 @@ my %h = (a => 7, b => 8);
 
 watch { cast $h{b}, $wiz } { }, 'hash element: cast';
 
-watch { $h{b} = 6; () } { set => 1 }, 'hash element: set';
+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';
@@ -103,27 +106,20 @@ is $b, 6, 'scalar: hash element: delete correctly';
 watch { $h{b} = 4 } { }, 'hash element: set after delete';
 
 SKIP: {
- my $SKIP;
-
- if (!MGf_COPY) {
-  $SKIP = 'No copy magic for this perl';
- } else {
-  local $@;
-  unless (eval { require Tie::Array; 1 }) {
-   $SKIP = 'Tie::Array required to test clear magic on tied array values';
-  }
- }
-
- skip $SKIP => 3 if $SKIP;
- defined and diag "Using Tie::Array $_" for $Tie::Array::VERSION;
+ 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<get clear free> ], 'delete from 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';
 }