X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstrictures.t;h=b721a66cd89129b8ba55791fb82471fbd079fcb3;hb=24590d987b3ff66dc1fe70c0d86f6ba4e5e5de21;hp=65b2893917a9964e484727af5cd3c1b263ed56e8;hpb=98b2be98719ebc06b6d3918a21309ff1100c1769;p=p5sagit%2Fstrictures.git

diff --git a/t/strictures.t b/t/strictures.t
index 65b2893..b721a66 100644
--- a/t/strictures.t
+++ b/t/strictures.t
@@ -1,41 +1,54 @@
-use Test::More qw(no_plan);
+BEGIN { $ENV{PERL_STRICTURES_EXTRA} = 0 }
 
-our (@us, @expect);
+use Test::More qw(no_plan);
 
-sub capture_stuff { [ $^H, ${^WARNING_BITS} ] }
+our ($hints, $warning_bits);
 
-sub capture_us { push @us, capture_stuff }
-sub capture_expect { push @expect, capture_stuff }
+sub capture_hints {
+  # ignore lexicalized hints
+  $hints = $^H & ~ 0x20000;
+  $warning_bits = defined ${^WARNING_BITS} ? (unpack "H*", ${^WARNING_BITS}) : undef;
+}
 
-{
-  use strictures 1;
-  BEGIN { capture_us }
+sub test_hints {
+  my $name = shift;
+  my $want_hints = $hints;
+  my $want_bits = $warning_bits;
+  capture_hints;
+  is($hints,        $want_hints, "Hints ok for $name");
+  is($warning_bits, $want_bits,  "Warnings ok for $name");
 }
 
 {
   use strict;
   use warnings FATAL => 'all';
-  BEGIN { capture_expect }
+  BEGIN { capture_hints }
 }
 
-# I'm assuming here we'll have more cases later. maybe not. eh.
+{
+  use strictures 1;
+  BEGIN { test_hints "version 1" }
+}
 
-foreach my $idx (0 .. $#us) {
-  is($us[$idx][0], $expect[$idx][0], 'Hints ok for case '.($idx+1));
-  is($us[$idx][1], $expect[$idx][1], 'Warnings ok for case '.($idx+1));
+{
+  use strict;
+  BEGIN {
+    warnings->import('all');
+    warnings->import(FATAL => @strictures::WARNING_CATEGORIES);
+    warnings->unimport(FATAL => @strictures::V2_NONFATAL);
+    warnings->import(@strictures::V2_NONFATAL);
+    warnings->unimport(@strictures::V2_DISABLE);
+  }
+  BEGIN { capture_hints }
 }
 
 {
-  local $0 = 't/00load.t';
-  sub Foo::new { 1 }
-  chdir("t/smells-of-vcs");
-  my $r = eval q{
-    use strictures 1;
-    new Foo 1, 2, 3;
-  };
-  # I don't test $@ here since if indirect isn't installed we hit one
-  # error and if it is we hit another; it's enough the code path's hit.
-  ok(!$r, 'strictures blows up for t/00load.t');
+  use strictures 2;
+  BEGIN { test_hints "version 2" }
 }
 
-ok(!eval q{use strictures 2; 1; }, "Can't use strictures 2 (this is version 1)");
+my $v;
+eval { $v = strictures->VERSION; 1 } or diag $@;
+is $v, $strictures::VERSION, '->VERSION returns version correctly';
+
+ok(!eval q{use strictures 3; 1; }, "Can't use strictures 3 (this is version 2)");