Port module loading in magic tests to VPIT::TestHelpers

[perl/modules/Lexical-Types.git] / t / 22-magic.t

diff --git a/t/22-magic.t b/t/22-magic.t
index f1ec1f969e2f14285ca44d024cce1b9282169f22..cc8e497b30892328dd65509421cf6f0c6c9323b6 100644 (file)
--- a/t/22-magic.t
+++ b/t/22-magic.t
@@ -5,15 +5,17 @@ use warnings;
 
 use Test::More;
 
+use lib 't/lib';
+use VPIT::TestHelpers;
+
 BEGIN {
- plan skip_all => 'Variable::Magic required to test magic'
-                                      unless eval "use Variable::Magic; 1";
+ load_or_skip('Variable::Magic', undef, [ ], 'required to test magic');
 }
 
 {
  package Lexical::Types::Test::Str;
 
- use Variable::Magic qw/wizard cast/;
+ use Variable::Magic qw<wizard cast>;
 
  our $wiz;
  BEGIN {
@@ -39,7 +41,8 @@ sub check (&$$;$) {
  my $want = wantarray;
  my @ret;
  {
-  local @{$got}{qw/get set/}; delete @{$got}{qw/get set/};
+  local @{$got}{qw<get set>};
+  delete @{$got}{qw<get set>};
   if ($want) {
    @ret = eval { $test->() };
   } elsif (defined $want) {
@@ -47,6 +50,7 @@ sub check (&$$;$) {
   } else {
    eval { $test->() };
   }
+  local $Test::Builder::Level = $Test::Builder::Level + 1;
   is_deeply $got, $exp, $desc;
  }
  return $want ? @ret : $ret[0];