Convert t/28-uvar.t to the new testing framework

diff --git a/t/28-uvar.t b/t/28-uvar.t
index 4800c44bbc0c1c8baf5161eb88cc213bc455ba79..ad8dd59e35debcb2e0d1a2d430f62e31501b8b1b 100644 (file)
--- a/t/28-uvar.t
+++ b/t/28-uvar.t
@@ -8,64 +8,42 @@ use Test::More;
 use Variable::Magic qw/wizard cast dispell VMG_UVAR/;
 
 if (VMG_UVAR) {
- plan tests => 20;
+ plan tests => 2 * 9 + 7 + 4 + 1;
 } else {
  plan skip_all => 'No nice uvar magic for this perl';
 }
 
-my @c = (0) x 4;
-my @x = (0) x 4;
+use lib 't/lib';
+use Variable::Magic::TestWatcher;
 
-sub check {
- is join(':', map { (defined) ? $_ : 'u' } @c[0 .. 3]),
-    join(':', map { (defined) ? $_ : 'u' } @x[0 .. 3]),
-    $_[0];
-}
-
-my $wiz = wizard 'fetch'  => sub { ++$c[0] },
-                 'store'  => sub { ++$c[1] },
-                 'exists' => sub { ++$c[2] },
-                 'delete' => sub { ++$c[3] };
-check('uvar : create wizard');
+my $wiz = init [ qw/fetch store exists delete/ ], 'uvar';
 
 my %h = (a => 1, b => 2, c => 3);
-my $res = cast %h, $wiz;
-ok($res, 'uvar : cast succeeded');
-check(   'uvar : cast didn\'t triggered the callback');
-
-my $x = $h{a};
-++$x[0];
-check( 'uvar : fetch directly');
-ok($x, 'uvar : fetch directly correctly');
-
-$x = "$h{b}";
-++$x[0];
-check(    'uvar : fetch by interpolation');
-is($x, 2, 'uvar : fetch by interpolation correctly');
-
-$h{c} = 4;
-++$x[1];
-check('uvar : store directly');
-
-$x = $h{c} = 5;
-++$x[1];
-check(    'uvar : fetch and store');
-is($x, 5, 'uvar : fetch and store correctly');
-
-$x = exists $h{c};
-++$x[2];
-check( 'uvar : exists');
-ok($x, 'uvar : exists correctly');
-
-$x = delete $h{c};
-++$x[3];
-check(    'uvar : delete existing key');
-is($x, 5, 'uvar : delete existing key correctly');
-
-$x = delete $h{z};
-++$x[3];
-check(          'uvar : delete non-existing key');
-ok(!defined $x, 'uvar : delete non-existing key correctly');
+
+my $res = check { cast %h, $wiz } { }, 'cast';
+ok $res, 'uvar: cast succeeded';
+
+my $x;
+
+check { $x = $h{a} } { fetch => 1 }, 'fetch directly';
+is $x, 1, 'uvar: fetch directly correctly';
+
+check { $x = "$h{b}" } { fetch => 1 }, 'fetch by interpolation';
+is $x, 2, 'uvar: fetch by interpolation correctly';
+
+check { $h{c} = 4 } { store => 1 }, 'store directly';
+
+check { $x = $h{c} = 5 } { store => 1 }, 'fetch and store';
+is $x, 5, 'uvar: fetch and store correctly';
+
+check { $x = exists $h{c} } { exists => 1 }, 'exists';
+ok $x, 'uvar: exists correctly';
+
+check { $x = delete $h{c} } { delete => 1 }, 'delete existing key';
+is $x, 5, 'uvar: delete existing key correctly';
+
+check { $x = delete $h{z} } { delete => 1 }, 'delete non-existing key';
+ok !defined $x, 'uvar: delete non-existing key correctly';
 
 my $wiz2 = wizard 'fetch'  => sub { 0 };
 my %h2 = (a => 37, b => 2, c => 3);
@@ -75,12 +53,12 @@ eval {
  local $SIG{__WARN__} = sub { die };
  $x = $h2{a};
 };
-is($@, '', 'uvar : fetch with incomplete magic');
-is($x, 37, 'uvar : fetch with incomplete magic correctly');
+is $@, '', 'uvar: fetch with incomplete magic';
+is $x, 37, 'uvar: fetch with incomplete magic correctly';
 
 eval {
  local $SIG{__WARN__} = sub { die };
  $h2{a} = 73;
 };
-is($@, '',     'uvar : store with incomplete magic');
-is($h2{a}, 73, 'uvar : store with incomplete magic correctly');
+is $@, '',     'uvar: store with incomplete magic';
+is $h2{a}, 73, 'uvar: store with incomplete magic correctly';