Fix segfaults when using get or uvar magic simultaneously with clear magic

[perl/modules/Variable-Magic.git] / t / 32-hash.t

diff --git a/t/32-hash.t b/t/32-hash.t
index 8803e35ac39c63d179bc95ff2df18892f92dbaf7..bf01b3dccfd522dda858c59b9a818677525257dd 100644 (file)
--- a/t/32-hash.t
+++ b/t/32-hash.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 2 * 20 + 6 + 1;
+use Test::More tests => 2 * 21 + 7 + 1;
 
 use Variable::Magic qw/cast dispell MGf_COPY VMG_UVAR/;
 
@@ -11,7 +11,7 @@ use lib 't/lib';
 use Variable::Magic::TestWatcher;
 
 my $wiz = init
-        [ qw/get set len free copy dup local fetch store exists delete/ ], # clear
+        [ qw/get set len clear free copy dup local fetch store exists delete/ ],
         'hash';
 
 my %n = map { $_ => int rand 1000 } qw/foo bar baz qux/;
@@ -20,12 +20,13 @@ my %h = %n;
 check { cast %h, $wiz } { }, 'cast';
 
 my $s = check { $h{foo} } +{ (fetch => 1) x VMG_UVAR },
-                       # (copy => 1) x MGf_COPY # if clear magic
                        'assign element to';
 is $s, $n{foo}, 'hash: assign element to correctly';
 
-$s = check { exists $h{foo} } +{ (exists => 1) x VMG_UVAR }, 'exists';
-ok $s, 'hash: exists correctly';
+for (1 .. 2) {
+ $s = check { exists $h{foo} } +{ (exists => 1) x VMG_UVAR }, "exists ($_)";
+ ok $s, "hash: exists correctly ($_)";
+}
 
 my %b;
 check { %b = %h } { }, 'assign to';
@@ -35,17 +36,16 @@ $s = check { \%h } { }, 'reference';
 
 my @b = check { @h{qw/bar qux/} }
                   +{ (fetch => 2) x VMG_UVAR }, 'slice';
-                  # (copy => 2) x MGf_COPY # if clear magic
 is_deeply \@b, [ @n{qw/bar qux/} ], 'hash: slice correctly';
 
-check { %h = () } { }, 'empty in list context'; # clear => 1
+check { %h = () } { clear => 1 }, 'empty in list context';
 
 check { %h = (a => 1, d => 3); () }
-               +{ (store => 2, copy => 2) x VMG_UVAR }, # clear => 1
+               +{ (store => 2, copy => 2) x VMG_UVAR, clear => 1 },
                'assign from list in void context';
 
 check { %h = map { $_ => 1 } qw/a b d/; }
-               +{ (exists => 3, store => 3, copy => 3) x VMG_UVAR }, # clear =>1
+               +{ (exists => 3, store => 3, copy => 3) x VMG_UVAR, clear => 1 },
                'assign from map in list context';
 
 check { $h{d} = 2; () } +{ (store => 1) x VMG_UVAR },
@@ -69,6 +69,6 @@ check {
  check { cast %b, $wiz } { }, 'cast 2';
 } { free => 1 }, 'scope end';
 
-check { undef %h } { }, 'undef'; # clear => 1
+check { undef %h } { clear => 1 }, 'undef';
 
 check { dispell %h, $wiz } { }, 'dispell';