X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=t%2F31-array.t;h=bc942c7d55e99204bcd61ee457e1be0622c0915b;hb=32bb19d839bff941751b0134ce2f99adefe550e0;hp=2fee830a2f29395f38c58c6548754d9650e6970c;hpb=fee1a480bc5d827590dc7394e0a77741bad86dc3;p=perl%2Fmodules%2FVariable-Magic.git

diff --git a/t/31-array.t b/t/31-array.t
index 2fee830..bc942c7 100644
--- a/t/31-array.t
+++ b/t/31-array.t
@@ -3,16 +3,17 @@
 use strict;
 use warnings;
 
-use Test::More tests => 21;
+use Test::More tests => 24;
 
-use Variable::Magic qw/wizard cast dispell VMG_COMPAT_ARRAY_PUSH_NOLEN VMG_COMPAT_ARRAY_UNDEF_CLEAR/;
+use Variable::Magic qw/wizard cast dispell VMG_COMPAT_ARRAY_PUSH_NOLEN VMG_COMPAT_ARRAY_UNSHIFT_NOLEN_VOID VMG_COMPAT_ARRAY_UNDEF_CLEAR/;
 
 my @c = (0) x 12;
 my @x = (0) x 12;
 
 sub check {
- for (0 .. 11) { return 0 unless $c[$_] == $x[$_]; }
- return 1;
+ is join(':', map { (defined) ? $_ : 'u' } @c[0 .. 11]),
+    join(':', map { (defined) ? $_ : 'u' } @x[0 .. 11]),
+    $_[0];
 }
 
 my $wiz = wizard get   => sub { ++$c[0] },
@@ -27,84 +28,96 @@ my $wiz = wizard get   => sub { ++$c[0] },
                  store => sub { ++$c[9] },
                  'exists' => sub { ++$c[10] },
                  'delete' => sub { ++$c[11] };
-ok(check(), 'array : create wizard');
+check('array : create wizard');
 
 my @n = map { int rand 1000 } 1 .. 5;
 my @a = @n;
 
 cast @a, $wiz;
-ok(check(), 'array : cast');
+check('array : cast');
 
 my $b = $a[2];
-ok(check(), 'array : assign element to');
+check('array : assign element to');
 
 my @b = @a;
 ++$x[2];
-ok(check(), 'array : assign to');
+check('array : assign to');
 
 $b = "X@{a}Y";
 ++$x[2];
-ok(check(), 'array : interpolate');
+check('array : interpolate');
 
 $b = \@a;
-ok(check(), 'array : reference');
+check('array : reference');
 
 @b = @a[2 .. 4];
-ok(check(), 'array : slice');
+check('array : slice');
 
 @a = qw/a b d/;
 $x[1] += 3; ++$x[3];
-ok(check(), 'array : assign');
+check('array : assign');
 
 $a[2] = 'c';
-ok(check(), 'array : assign old element');
+check('array : assign old element');
 
 $a[3] = 'd';
 ++$x[1];
-ok(check(), 'array : assign new element');
+check('array : assign new element');
 
 push @a, 'x';
 ++$x[1]; ++$x[2] unless VMG_COMPAT_ARRAY_PUSH_NOLEN;
-ok(check(), 'array : push');
+check('array : push (void)');
+
+$b = push @a, 'x';
+++$x[1]; ++$x[2] unless VMG_COMPAT_ARRAY_PUSH_NOLEN;
+check('array : push (scalar)');
 
 pop @a;
 ++$x[1]; ++$x[2];
-ok(check(), 'array : pop');
+check('array : pop');
 
 unshift @a, 'x';
+++$x[1]; ++$x[2] unless VMG_COMPAT_ARRAY_UNSHIFT_NOLEN_VOID;
+check('array : unshift (void)');
+
+$b = unshift @a, 'x';
 ++$x[1]; ++$x[2];
-ok(check(), 'array : unshift');
+check('array : unshift (scalar)');
 
 shift @a;
 ++$x[1]; ++$x[2];
-ok(check(), 'array : shift');
+check('array : shift');
 
 $b = @a;
 ++$x[2];
-ok(check(), 'array : length');
+check('array : length @');
+
+$b = $#a;
+++$x[2];
+check('array : length $#');
 
 @a = map ord, @a; 
-$x[1] += 4; ++$x[2]; ++$x[3];
-ok(check(), 'array : map');
+$x[1] += 6; ++$x[2]; ++$x[3];
+check('array : map');
 
 @b = grep { defined && $_ >= ord('b') } @a;
 ++$x[2];
-ok(check(), 'array : grep');
+check('array : grep');
 
 for (@a) { }
-$x[2] += 5;
-ok(check(), 'array : for');
+$x[2] += 7;
+check('array : for');
 
 {
  my @b = @n;
  cast @b, $wiz;
 }
 ++$x[4];
-ok(check(), 'array : scope end');
+check('array : scope end');
 
 undef @a;
 ++$x[3] if VMG_COMPAT_ARRAY_UNDEF_CLEAR;
-ok(check(), 'array : undef');
+check('array : undef');
 
 dispell @a, $wiz;
-ok(check(), 'array : dispel');
+check('array : dispel');