X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F107_no_auto_help.t;h=638f1a52b7d2226b097f45f636132d5bfb9f30d3;hb=44f514c7b7f403894b44d3b8ce7da3254cd40928;hp=9eab610de99bc44dce66d5ea84eae6660d5fa9ae;hpb=81b19ed83c9e345f960ccefbcd639dd0e3c2de06;p=gitmo%2FMooseX-Getopt.git

diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t
index 9eab610..638f1a5 100644
--- a/t/107_no_auto_help.t
+++ b/t/107_no_auto_help.t
@@ -8,6 +8,15 @@
 # getoptions() will not call into pod2usage() (causing program termination)
 # when --help is passed (and MooseX::ConfigFromFile is in use).
 
+use strict;
+use warnings;
+
+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;
+
+use Test::NoWarnings 1.04 ':early';
 
 my $fail_on_exit = 1;
 {
@@ -34,14 +43,10 @@ my $fail_on_exit = 1;
     1;
 }
 
-use Test::More tests => 3;
-use Test::Warn;
-use Test::Exception;
-
 END {
     ok(!$fail_on_exit, 'getoptions() lives');
 
-    # cancel the non-zero exit status from _getopt_full_usage()
+    # cancel the non-zero exit status from print_usage_text()
     exit 0;
 }
 
@@ -49,9 +54,9 @@ 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.\t--configfile\s*.\t\Q-? --usage --help  Prints this usage information.\E/ms,
+        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';
     }
     qr/^Specified configfile \'this_value_unimportant\' does not exist, is empty, or is not readable$/,