Update VPIT::TestHelpers to e8344578

[perl/modules/Variable-Magic.git] / t / 16-huf.t

diff --git a/t/16-huf.t b/t/16-huf.t
index 0934219579ca9613d9955ceda412f0967ace69c0..024a39c9bb32ad90c71d2e6d571213b3cb8c01e0 100644 (file)
--- a/t/16-huf.t
+++ b/t/16-huf.t
@@ -5,25 +5,21 @@ use warnings;
 
 use Test::More;
 
-use Variable::Magic qw/wizard cast dispell VMG_UVAR/;
+use lib 't/lib';
+use VPIT::TestHelpers;
 
-if (!VMG_UVAR) {
- plan skip_all => 'No nice uvar magic for this perl';
-}
+use Variable::Magic qw<wizard cast dispell VMG_UVAR>;
 
-eval "use Hash::Util::FieldHash";
-if ($@) {
- plan skip_all => 'Hash::Util::FieldHash required for testing uvar interaction';
-} else {
+if (VMG_UVAR) {
+ load_or_skip_all('Hash::Util::FieldHash', undef, [ ]);
  plan tests => 2 * 5 + 7 + 1;
- defined and diag "Using Hash::Util::FieldHash $_"
-                                            for $Hash::Util::FieldHash::VERSION;
+} else {
+ skip_all 'No nice uvar magic for this perl';
 }
 
-use lib 't/lib';
 use Variable::Magic::TestWatcher;
 
-my $wiz = init_watcher [ qw/fetch store/ ], 'huf';
+my $wiz = init_watcher [ qw<fetch store> ], 'huf';
 ok defined($wiz),       'huf: wizard with uvar is defined';
 is ref($wiz), 'SCALAR', 'huf: wizard with uvar is a scalar ref';