X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstrictures.t;h=ad8ec108b5e5a2e73702d571b74a252dc9d63ab5;hb=3d4f7774b1c23f9e06a612d06e2b9683a884cc4c;hp=d2c6ad644ab5800c68e58a644f7f14787087ec81;hpb=92cde693e78b4540411ac18d8b0fc759a4249a2a;p=p5sagit%2Fstrictures.git

diff --git a/t/strictures.t b/t/strictures.t
index d2c6ad6..ad8ec10 100644
--- a/t/strictures.t
+++ b/t/strictures.t
@@ -1,38 +1,63 @@
-BEGIN { delete $ENV{PERL_STRICTURES_EXTRA} }
+BEGIN { $ENV{PERL_STRICTURES_EXTRA} = 0 }
 
-use Test::More qw(no_plan);
-
-our (@us, @expect);
+sub _eval { eval $_[0] }
 
-sub capture_stuff { [ $^H, ${^WARNING_BITS} ] }
+use strict;
+use warnings;
+use Test::More qw(no_plan);
 
-sub capture_us { push @us, capture_stuff }
-sub capture_expect { push @expect, capture_stuff }
+sub capture_hints {
+  my $code = shift;
+  $code .= q{
+    ;
+    my @h;
+    BEGIN { @h = ( $^H, ${^WARNING_BITS} ) }
+    @h;
+  };
+  my ($hints, $warning_bits) = _eval $code or die $@;
+  # ignore lexicalized hints
+  $hints &= ~ 0x20000;
+  $warning_bits = unpack "H*", $warning_bits
+    if defined $warning_bits;
+  return ($hints, $warning_bits);
+}
 
-{
-  BEGIN { $ENV{PERL_STRICTURES_EXTRA} = 0 }
-  use strictures 1;
-  BEGIN { capture_us }
-  BEGIN { delete $ENV{PERL_STRICTURES_EXTRA} }
+sub compare_hints {
+  my ($code_want, $code_got, $name) = @_;
+  my ($want_hints, $want_warnings) = capture_hints $code_want;
+  my ($hints, $warnings) = capture_hints $code_got;
+  is($hints,    $want_hints, "Hints correct for $name");
+  is($warnings, $want_warnings,  "Warnings correct for $name");
 }
 
-{
+compare_hints q{
   use strict;
   use warnings FATAL => 'all';
-  BEGIN { capture_expect }
-}
-
-# I'm assuming here we'll have more cases later. maybe not. eh.
+},
+q{
+  use strictures 1;
+},
+  'version 1';
 
-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));
-}
+compare_hints q{
+  use strict;
+  use warnings 'all';
+  use warnings FATAL => @strictures::WARNING_CATEGORIES;
+  no warnings FATAL => @strictures::V2_NONFATAL;
+  use warnings @strictures::V2_NONFATAL;
+  no warnings @strictures::V2_DISABLE;
+},
+q{
+  use strictures 2;
+},
+  '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)");
+my $next = int $strictures::VERSION + 1;
+eval qq{ use strictures $next; };
+
+like $@, qr/strictures version $next required/,
+  "Can't use strictures $next (this is version $v)";