Lock shared variables

[perl/modules/Variable-Magic.git] / t / 31-array.t

diff --git a/t/31-array.t b/t/31-array.t
index 3397ceb639f1de5e6b0cfcb0972b7c9d74b0c829..432fc5d887ad161c01373e1f117854b4027038fc 100644 (file)
--- a/t/31-array.t
+++ b/t/31-array.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 2 * 25 + 9 + 1;
+use Test::More tests => 2 * 27 + 13 + 1;
 
 use Variable::Magic qw/cast dispell VMG_COMPAT_ARRAY_PUSH_NOLEN VMG_COMPAT_ARRAY_UNSHIFT_NOLEN_VOID VMG_COMPAT_ARRAY_UNDEF_CLEAR/;
 
@@ -19,57 +19,65 @@ my @a = @n;
 
 check { cast @a, $wiz } { }, 'cast';
 
-my $b;
-check { $b = $a[2] } { }, 'assign element to';
+my $b = check { $a[2] } { }, 'assign element to';
 is $b, $n[2], 'array: assign element to correctly';
 
-my @b;
-check { @b = @a } { len => 1 }, 'assign to';
+my @b = check { @a } { len => 1 }, 'assign to';
 is_deeply \@b, \@n, 'array: assign to correctly';
 
-check { $b = "X@{a}Y" } { len => 1 }, 'interpolate';
+$b = check { "X@{a}Y" } { len => 1 }, 'interpolate';
 is $b, "X@{n}Y", 'array: interpolate correctly';
 
-check { $b = \@a } { }, 'reference';
+$b = check { \@a } { }, 'reference';
 
-check { @b = @a[2 .. 4] } { }, 'slice';
+@b = check { @a[2 .. 4] } { }, 'slice';
 is_deeply \@b, [ @n[2 .. 4] ], 'array: slice correctly';
 
 check { @a = qw/a b d/ } { set => 3, clear => 1 }, 'assign';
 
 check { $a[2] = 'c' } { }, 'assign old element';
 
-check { $a[3] = 'd' } { set => 1 }, 'assign new element';
+check { $a[4] = 'd' } { set => 1 }, 'assign new element';
+
+$b = check { exists $a[4] } { }, 'exists';
+is $b, 1, 'array: exists correctly';
+
+$b = check { delete $a[4] } { set => 1 }, 'delete';
+is $b, 'd', 'array: delete correctly';
+
+$b = check { @a } { len => 1 }, 'length @';
+is $b, 3, 'array: length @ correctly';
+
+# $b has to be set inside the block for the test to pass on 5.8.3 and lower
+check { $b = $#a } { len => 1 }, 'length $#';
+is $b, 2, 'array: length $# correctly';
 
 check { push @a, 'x'; () }
           { set => 1, (len => 1) x !VMG_COMPAT_ARRAY_PUSH_NOLEN },'push (void)';
-check { $b = push @a, 'y' }
+
+$b = check { push @a, 'y' }
        { set => 1, (len => 1) x !VMG_COMPAT_ARRAY_PUSH_NOLEN }, 'push (scalar)';
+is $b, 5, 'array: push (scalar) correctly';
 
-check { $b = pop @a } { set => 1, len => 1 }, 'pop';
+$b = check { pop @a } { set => 1, len => 1 }, 'pop';
 is $b, 'y', 'array: pop correctly';
 
 check { unshift @a, 'z'; () }
                 { set => 1, (len => 1) x !VMG_COMPAT_ARRAY_UNSHIFT_NOLEN_VOID },
                 'unshift (void)';
 
-check { $b = unshift @a, 't' } { set => 1, len => 1 }, 'unshift (scalar)';
+$b = check { unshift @a, 't' } { set => 1, len => 1 }, 'unshift (scalar)';
+is $b, 6, 'unshift (scalar) correctly';
 
-check { $b = shift @a } { set => 1, len => 1 }, 'shift';
+$b = check { shift @a } { set => 1, len => 1 }, 'shift';
 is $b, 't', 'array: shift correctly';
 
-check { $b = @a } { len => 1 }, 'length @';
-is $b, 6, 'array: length @ correctly';
-
-check { $b = $#a } { len => 1 }, 'length $#';
-is $b, 5, 'array: length $# correctly';
-
-check { my $i; @a = map ++$i, @a; () } { set => 6, len => 1, clear => 1}, 'map';
+check { my $i; @a = map ++$i, @a; () } { set => 5, len => 1, clear => 1}, 'map';
 
-check { @b = grep { $_ >= 4 } @a } { len => 1 }, 'grep';
-is_deeply \@b, [ 4 .. 6 ], 'array: grep correctly';
+@b = check { grep { $_ >= 4 } @a } { len => 1 }, 'grep';
+is_deeply \@b, [ 4 .. 5 ], 'array: grep correctly';
 
-check { 1 for @a } { len => 6 + 1 }, 'for';
+check { 1 for @a } { len => 5 + 1 }, 'for';
 
 check {
  my @b = @n;