strictures 2, disabling fatal warnings on some categories

[p5sagit/strictures.git] / t / strictures.t

diff --git a/t/strictures.t b/t/strictures.t
index d2c6ad6..8312e71 100644 (file)
--- a/t/strictures.t
+++ b/t/strictures.t
@@ -1,38 +1,53 @@
-BEGIN { delete $ENV{PERL_STRICTURES_EXTRA} }
+BEGIN { $ENV{PERL_STRICTURES_EXTRA} = 0 }
 
 use Test::More qw(no_plan);
 
-our (@us, @expect);
+our ($hints, $warning_bits);
 
-sub capture_stuff { [ $^H, ${^WARNING_BITS} ] }
+sub capture_hints {
+  # ignore lexicalized hints
+  $hints = $^H & ~ 0x20000;
+  $warning_bits = defined ${^WARNING_BITS} ? (unpack "H*", ${^WARNING_BITS}) : undef;
+}
+
+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");
+}
 
-sub capture_us { push @us, capture_stuff }
-sub capture_expect { push @expect, capture_stuff }
+{
+  use strict;
+  use warnings FATAL => 'all';
+  BEGIN { capture_hints }
+}
 
 {
-  BEGIN { $ENV{PERL_STRICTURES_EXTRA} = 0 }
   use strictures 1;
-  BEGIN { capture_us }
-  BEGIN { delete $ENV{PERL_STRICTURES_EXTRA} }
+  BEGIN { test_hints "version 1" }
 }
 
 {
   use strict;
-  use warnings FATAL => 'all';
-  BEGIN { capture_expect }
+  BEGIN {
+    warnings->import('all');
+    warnings->import(FATAL => @strictures::WARNING_CATEGORIES);
+    warnings->import(NONFATAL => @strictures::V2_NONFATAL);
+    warnings->unimport(@strictures::V2_DISABLE);
+  }
+  BEGIN { capture_hints }
 }
 
-# I'm assuming here we'll have more cases later. maybe not. eh.
-
-foreach my $idx (0 .. $#us) {
-  # ignore lexicalized hints
-  $us[$idx][0] &= ~ 0x20000;
-  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 strictures 2;
+  BEGIN { test_hints "version 2" }
 }
 
 my $v;
 eval { $v = strictures->VERSION; 1 } or diag $@;
 is $v, $strictures::VERSION, '->VERSION returns version correctly';
 
-ok(!eval q{use strictures 2; 1; }, "Can't use strictures 2 (this is version 1)");
+ok(!eval q{use strictures 3; 1; }, "Can't use strictures 3 (this is version 2)");