X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstrictures.t;h=20ca87bdd0e5f3271b99f4c50ed7f00542643007;hb=09dcd779e42c0818abe4220b900b730fc67e1e7e;hp=aecf3326a80af9eedca28152c852806b6e4d778c;hpb=12b8f19b42aca2e4872678b720287e45e0ee2083;p=p5sagit%2Fstrictures.git

diff --git a/t/strictures.t b/t/strictures.t
index aecf332..20ca87b 100644
--- a/t/strictures.t
+++ b/t/strictures.t
@@ -1,57 +1,82 @@
-BEGIN { delete $ENV{PERL_STRICTURES_EXTRA} }
+BEGIN { $ENV{PERL_STRICTURES_EXTRA} = 0 }
 
-# -e is sufficient here.
--e 't/smells-of-vcs/.git'
-  or mkdir('t/smells-of-vcs/.git')
-  or die "Couldn't create fake .git: $!";
+sub _eval { eval $_[0] }
 
-use Test::More qw(no_plan);
+use Test::More 0.88;
 
-our (@us, @expect);
+use strict;
+use warnings;
+use Test::More;
 
-sub capture_stuff { [ $^H, ${^WARNING_BITS} ] }
-
-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 }
-}
+},
+q{
+  use strictures 1;
+},
+  'version 1';
 
-# I'm assuming here we'll have more cases later. maybe not. eh.
+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';
 
-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));
-}
+my $v;
+eval { $v = strictures->VERSION; 1 } or diag $@;
+is $v, $strictures::VERSION, '->VERSION returns version correctly';
 
-SKIP: {
-  skip 'Extra tests disabled on perls <= 5.008003', 1
-    if $] < 5.008004;
-  skip 'Not got all the modules to do this', 1
-    unless eval {
-      require indirect;
-      require multidimensional;
-      require bareword::filehandles;
-      1;
-    };
-  sub Foo::new { 1 }
-  chdir("t/smells-of-vcs");
-  local $strictures::Smells_Like_VCS = 1;
-  foreach my $file (qw(lib/one.pm t/one.t)) {
-    ok(!eval { require $file; 1 }, "Failed to load ${file}");
-    like($@, qr{Indirect call of method}, "Failed due to indirect.pm, ok");
-  }
-  ok(eval { require "other/one.pl"; 1 }, "Loaded other/one.pl ok");
-}
+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";
 
-ok(!eval q{use strictures 2; 1; }, "Can't use strictures 2 (this is version 1)");
+done_testing;