X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMooseX-Getopt.git;a=blobdiff_plain;f=t%2F107_no_auto_help.t;h=989e81dfc087c762efdea85ebe5178e262c6e49d;hp=5521bc278a552f65a82648024b47c628ae66c61f;hb=25eb430dc9dc0e223b0a8cddf555e0dc3bbd26aa;hpb=418e36187f015bbe0ea9ba45c82296bb4975b3a5

diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t
index 5521bc2..989e81d 100644
--- a/t/107_no_auto_help.t
+++ b/t/107_no_auto_help.t
@@ -7,20 +7,21 @@
 # Summary: If we disable the "auto_help" option in Getopt::Long, then
 # getoptions() will not call into pod2usage() (causing program termination)
 # when --help is passed (and MooseX::ConfigFromFile is in use).
+
 use strict;
-use warnings;
+use warnings FATAL => 'all';
 
-use Test::More;
+use Test::Requires { 'MooseX::SimpleConfig' => 0.07 };  # skip all if not installed
+use Test::More tests => 2;
+use Test::Warn 0.21;
+use Test::Fatal 0.003;
 
-BEGIN {
-plan skip_all => 'This test needs MooseX::SimpleConfig 0.07'
-    unless eval { require MooseX::SimpleConfig && MooseX::SimpleConfig->VERSION(0.07); };
-}
+use Test::Warnings;
 
 my $fail_on_exit = 1;
 {
     package Class;
-    use strict; use warnings;
+    use strict; use warnings FATAL => 'all';
 
     use Moose;
     with
@@ -42,15 +43,10 @@ my $fail_on_exit = 1;
     1;
 }
 
-use Test::Warn;
-use Test::Exception;
-
 END {
     ok(!$fail_on_exit, 'getoptions() lives');
 
-    done_testing;
-
-    # cancel the non-zero exit status from _getopt_full_usage()
+    # cancel the non-zero exit status from print_usage_text()
     exit 0;
 }
 
@@ -58,7 +54,7 @@ END {
 @ARGV = ('--help');
 
 warning_like {
-    throws_ok { Class->new_with_options }
+    like exception { Class->new_with_options },
            #usage: 107_no_auto_help.t [-?] [long options...]
         qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+\Q-? --usage --help  Prints this usage information.\E.\s+--configfile/ms,
         'usage information looks good';