Port module loading in magic tests to VPIT::TestHelpers

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

diff --git a/t/23-magic-uvar.t b/t/23-magic-uvar.t
index 1e24d25d2ab48660a0325e4c80473855b36de0d0..e1d764d980bb5d1ace9b0e9efb160f411f151464 100644 (file)
--- a/t/23-magic-uvar.t
+++ b/t/23-magic-uvar.t
@@ -5,15 +5,19 @@ use warnings;
 
 use Test::More;
 
+use lib 't/lib';
+use VPIT::TestHelpers;
+
 BEGIN {
- plan skip_all => 'Variable::Magic 0.08 on 5.10 required to test uvar magic'
-              unless eval "use Variable::Magic 0.08; Variable::Magic::VMG_UVAR";
+ load_or_skip('Variable::Magic', '0.35', [ ], 'required to test uvar magic');
+ plan skip_all => 'perl 5.10 required to test uvar magic'
+                                             unless Variable::Magic::VMG_UVAR();
 }
 
 {
  package Lexical::Types::Test::Ref;
 
- use Variable::Magic qw/wizard cast/;
+ use Variable::Magic qw<wizard cast>;
 
  our $wiz;
  BEGIN {
@@ -34,7 +38,6 @@ BEGIN {
 
 BEGIN {
  plan tests => 2 * 11;
- defined and diag "Using Variable::Magic $_" for $Variable::Magic::VERSION;
 }
 
 use Lexical::Types as => 'Lexical::Types::Test';
@@ -45,7 +48,8 @@ sub check (&$$;$) {
  my $want = wantarray;
  my @ret;
  {
-  local @{$got}{qw/fetch store/}; delete @{$got}{qw/fetch store/};
+  local @{$got}{qw<fetch store>};
+  delete @{$got}{qw<fetch store>};
   if ($want) {
    @ret = eval { $test->() };
   } elsif (defined $want) {
@@ -53,6 +57,7 @@ sub check (&$$;$) {
   } else {
    eval { $test->() };
   }
+  local $Test::Builder::Level = $Test::Builder::Level + 1;
   is_deeply $got, $exp, $desc;
  }
  return $want ? @ret : $ret[0];