Port module loading in magic tests to VPIT::TestHelpers

diff --git a/t/22-magic.t b/t/22-magic.t
index d0cae1b8e0f773fac1b0b4ecf3982e72c17c417d..cc8e497b30892328dd65509421cf6f0c6c9323b6 100644 (file)
--- a/t/22-magic.t
+++ b/t/22-magic.t
@@ -5,9 +5,11 @@ 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');
 }
 
 {
@@ -29,7 +31,6 @@ BEGIN {
 
 BEGIN {
  plan tests => 2 * 8;
- defined and diag "Using Variable::Magic $_" for $Variable::Magic::VERSION;
 }
 
 use Lexical::Types as => 'Lexical::Types::Test';

diff --git a/t/23-magic-uvar.t b/t/23-magic-uvar.t
index ce80f2ec95ccb0cf2e3ac8827079bb71a41dd05a..e1d764d980bb5d1ace9b0e9efb160f411f151464 100644 (file)
--- a/t/23-magic-uvar.t
+++ b/t/23-magic-uvar.t
@@ -5,9 +5,13 @@ use warnings;
 
 use Test::More;
 
+use lib 't/lib';
+use VPIT::TestHelpers;
+
 BEGIN {
- plan skip_all => 'Variable::Magic 0.35 on 5.10 required to test uvar magic'
-              unless eval "use Variable::Magic 0.35; 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();
 }
 
 {
@@ -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';