drop Test::Warn prereq and only use Test::Warnings

Author: haarg

Changes

@@ -1,5 +1,8 @@
 Revision history for WWW::Mechanize
 
+    [TESTS]
+    - Drop Test::Warn prerequisite and only use Test::Warnings
+
 {{$NEXT}}
     [FIXED]
     - Raise minimum Perl to 5.8 to match what we test, what dependencies

META.json

@@ -107,7 +107,6 @@
             "Test::NoWarnings" : "1.04",
             "Test::Output" : "0",
             "Test::Taint" : "1.08",
-            "Test::Warn" : "0",
             "Test::Warnings" : "0",
             "URI" : "0",
             "URI::Escape" : "0",

Makefile.PL

@@ -57,7 +57,6 @@ my %WriteMakefileArgs = (
     "Test::NoWarnings" => "1.04",
     "Test::Output" => 0,
     "Test::Taint" => "1.08",
-    "Test::Warn" => 0,
     "Test::Warnings" => 0,
     "URI" => 0,
     "URI::Escape" => 0,
@@ -101,7 +100,6 @@ my %FallbackPrereqs = (
   "Test::NoWarnings" => "1.04",
   "Test::Output" => 0,
   "Test::Taint" => "1.08",
-  "Test::Warn" => 0,
   "Test::Warnings" => 0,
   "Tie::RefHash" => 0,
   "URI" => 0,

cpanfile

@@ -40,7 +40,6 @@ on 'test' => sub {
   requires "Test::NoWarnings" => "1.04";
   requires "Test::Output" => "0";
   requires "Test::Taint" => "1.08";
-  requires "Test::Warn" => "0";
   requires "Test::Warnings" => "0";
   requires "URI" => "0";
   requires "URI::Escape" => "0";

t/find_link-warnings.t

@@ -2,7 +2,7 @@ use warnings;
 use strict;
 
 use Test::More;
-use Test::Warn qw( warning_like );
+use Test::Warnings qw( :all );
 use URI::file      ();
 use WWW::Mechanize ();
 
@@ -16,38 +16,38 @@ ok( $mech->success, "Fetched $uri" ) or die q{Can't get test page};
 
 REGEX_USAGE: {
     for my $tname (qw( TEXT NAME URL TAG )) {
-        warning_like(
-            sub { $mech->find_link( $tname => 'expect error' ) },
-            qr/Unknown link-finding parameter/, "detected usage error: $tname => 'string'"
-        );
+        like warning {
+            $mech->find_link( $tname => 'expect error' );
+        }, qr/Unknown link-finding parameter/,
+            "detected usage error: $tname => 'string'";
     }
 }
 
 REGEX_STRING: {
     for my $tn (qw( text name url tag )) {
         my $tname = $tn.'_regex';
-        warning_like(
-            sub { $mech->find_link( $tname => 'expect error' ) },
-            qr/passed as $tname is not a regex/, "detected usage error: $tname => 'string'"
-        );
+        like warning {
+            $mech->find_link( $tname => 'expect error' );
+        }, qr/passed as $tname is not a regex/,
+            "detected usage error: $tname => 'string'";
     }
 }
 
 NON_REGEX_STRING: {
     for my $tname (qw( text name url tag )) {
-        warning_like(
-            sub { $mech->find_link( $tname => qr/foo/ ) },
-            qr/passed as '$tname' is a regex/, "detected usage error: $tname => Regex"
-        );
+        like warning {
+            $mech->find_link( $tname => qr/foo/ );
+        }, qr/passed as '$tname' is a regex/,
+            "detected usage error: $tname => Regex";
     }
 }
 
 SPACE_PADDED: {
     for my $tname (qw( text name url tag )) {
-        warning_like(
-            sub { $mech->find_link( $tname => ' a padded astring ' ) },
-            qr/is space-padded and cannot succeed/, "detected usage error: $tname => padded-string"
-        );
+        like warning {
+            $mech->find_link( $tname => ' a padded astring ' );
+        }, qr/is space-padded and cannot succeed/,
+            "detected usage error: $tname => padded-string";
     }
 }
 

t/regex-error.t

@@ -4,18 +4,18 @@ use warnings;
 use strict;
 
 use Test::More;
-use Test::Warn qw( warning_like );
+use Test::Warnings qw(:all);
 use WWW::Mechanize ();
 
 my $m = WWW::Mechanize->new;
 isa_ok( $m, 'WWW::Mechanize' );
 
-warning_like {
+like warning {
     $m->find_link( link_regex => 'foo' );
-} qr[Unknown link-finding parameter "link_regex".+line \d+], 'Passes message, and includes the line number';
+}, qr[Unknown link-finding parameter "link_regex".+line \d+], 'Passes message, and includes the line number';
 
-warning_like {
+like warning {
     $m->find_link( url_regex => 'foo' );
-} qr[foo passed as url_regex is not a regex.+line \d+], 'Passes message, and includes the line number';
+}, qr[foo passed as url_regex is not a regex.+line \d+], 'Passes message, and includes the line number';
 
 done_testing();

t/warn.t

@@ -3,26 +3,26 @@
 use warnings;
 use strict;
 
-use Test::Warn qw( warning_like );
+use Test::Warnings qw( :all );
 use Test::More;
 use WWW::Mechanize ();
 
 my $m = WWW::Mechanize->new;
 isa_ok( $m, 'WWW::Mechanize' );
 
-warning_like {
+like warning {
     $m->warn( 'Something bad' );
-} qr[Something bad.+line \d+], 'Passes the message, and includes the line number';
+}, qr[Something bad.+line \d+], 'Passes the message, and includes the line number';
 
-warning_like {
+is join('', warnings {
     $m->quiet(1);
     $m->warn( 'Something bad' );
-} undef, 'Quiets correctly';
+}), '', 'Quiets correctly';
 
 my $hushed = WWW::Mechanize->new( quiet => 1 );
 isa_ok( $hushed, 'WWW::Mechanize' );
-warning_like {
+is join('', warnings {
     $hushed->warn( 'Something bad' );
-} undef, 'Quiets correctly';
+}), '', 'Quiets correctly';
 
 done_testing();

t/warnings.t

@@ -4,16 +4,16 @@ use warnings;
 use strict;
 
 use Test::More;
-use Test::Warn qw( warning_is );
+use Test::Warnings qw( :all );
 use WWW::Mechanize ();
 
 UNKNOWN_ALIAS: {
     my $m = WWW::Mechanize->new;
     isa_ok( $m, 'WWW::Mechanize' );
 
-    warning_is {
+    like warning {
         $m->agent_alias( 'Blongo' );
-    } 'Unknown agent alias "Blongo"', 'Unknown aliases squawk appropriately';
+    }, qr/\AUnknown agent alias "Blongo"/, 'Unknown aliases squawk appropriately';
 }
 
 done_testing();