X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fhints.t;h=5ce67d80e7a91f46d857c2357c41763cffb1da7b;hb=persist-package;hp=1e101b50f541ef412526b4327f13e195491cac9a;hpb=9661a07cde22f93b638636322a668c07b597c665;p=p5sagit%2FEval-WithLexicals.git

diff --git a/t/hints.t b/t/hints.t
index 1e101b5..5ce67d8 100644
--- a/t/hints.t
+++ b/t/hints.t
@@ -1,17 +1,11 @@
 use strictures ();
-my $strictures_hints;
-BEGIN {
-  local $ENV{PERL_STRICTURES_EXTRA} = 0;
-  strictures->VERSION(1); strictures->import();
-  # Find the hint value that 'use strictures 1' sets on this perl.
-  $strictures_hints = $^H;
-}
-use strictures 1;
-
 use Test::More;
 use Eval::WithLexicals;
 use lib 't/lib';
 
+use strictures 1;
+use get_strictures_hints qw($strictures_hints $strictures_warn);
+
 my $eval = Eval::WithLexicals->with_plugins("HintPersistence")->new(prelude => '');
 
 is_deeply(
@@ -30,15 +24,22 @@ $eval->eval('use strictures 1');
 {
   local $SIG{__WARN__} = sub { };
 
-  ok !eval { $eval->eval('$x') }, 'Unable to use undeclared variable';
-  like $@, qr/requires explicit package/, 'Correct message in $@';
+  ok !eval { $eval->eval('${"x"}') }, 'Unable to use undeclared variable';
+  like $@, qr/Can't use string .* as a SCALAR ref/,
+  'Correct message in $@';
 }
 
-is_deeply(
-  $eval->hints->{q{$^H}}, \$strictures_hints,
+is(
+  ${$eval->hints->{q{$^H}}}, $strictures_hints,
  'Hints are set per strictures'
 );
 
+is(
+  (unpack "H*", ${$eval->hints->{q{${^WARNING_BITS}}}}),
+  (unpack "H*", $strictures_warn),
+  'Warning bits are set per strictures'
+);
+
 is_deeply(
   $eval->lexicals, { },
   'Lexical not stored'