X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstrictures.t;h=920dc7ce91c6dc9638d1a67e4af80c5ba81ffa4f;hb=9404cddf34f6fa514938df735aaeb3eee524e0cb;hp=8312e718585a7659b9131352fd7537700a71810f;hpb=23c0b85d1580eb07a49da0096e4913debc21e8fa;p=p5sagit%2Fstrictures.git

diff --git a/t/strictures.t b/t/strictures.t
index 8312e71..920dc7c 100644
--- a/t/strictures.t
+++ b/t/strictures.t
@@ -1,53 +1,78 @@
 BEGIN { $ENV{PERL_STRICTURES_EXTRA} = 0 }
 
-use Test::More qw(no_plan);
+sub _eval { eval $_[0] }
 
-our ($hints, $warning_bits);
+use strict;
+use warnings;
+use Test::More qw(no_plan);
 
 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 = $^H & ~ 0x20000;
-  $warning_bits = defined ${^WARNING_BITS} ? (unpack "H*", ${^WARNING_BITS}) : undef;
+  $hints &= ~ 0x20000;
+  $warning_bits = unpack "H*", $warning_bits
+    if defined $warning_bits;
+  return ($hints, $warning_bits);
 }
 
-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 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_hints }
-}
-
-{
+},
+q{
   use strictures 1;
-  BEGIN { test_hints "version 1" }
-}
+},
+  'version 1';
 
-{
+compare_hints q{
   use strict;
-  BEGIN {
-    warnings->import('all');
-    warnings->import(FATAL => @strictures::WARNING_CATEGORIES);
-    warnings->import(NONFATAL => @strictures::V2_NONFATAL);
-    warnings->unimport(@strictures::V2_DISABLE);
-  }
-  BEGIN { capture_hints }
-}
-
-{
+  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;
-  BEGIN { test_hints "version 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 3; 1; }, "Can't use strictures 3 (this is version 2)");
+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)";
+
+eval qq{ use strictures {version => $next}; };
+
+like $@, qr/Major version specified as $next - not supported/,
+  "Can't use strictures version option $next (this is version $v)";
+
+eval qq{ use strictures {version => undef}; };
+
+like $@, qr/Major version specified as undef - not supported/,
+  "Can't use strictures version option undef";
+
+eval qq{ use strictures $strictures::VERSION; };
+
+is $@, '',
+  "Can use current strictures version";