test for warnings everywhere

[gitmo/MooseX-Getopt.git] / t / 104_override_usage.t

diff --git a/t/104_override_usage.t b/t/104_override_usage.t
index 173c632..3f0da19 100644 (file)
--- a/t/104_override_usage.t
+++ b/t/104_override_usage.t
@@ -1,7 +1,9 @@
 use strict;
 use warnings;
-use Test::More 0.88;
-use Test::Exception;
+
+use Test::More tests => 9;
+use Test::Trap;
+use Test::NoWarnings 1.04 ':early';
 
 {
     package MyScript;
@@ -10,7 +12,6 @@ use Test::Exception;
     with 'MooseX::Getopt';
 
     has foo => ( isa => 'Int', is => 'ro', documentation => 'A foo' );
-    has help => ( isa => 'Bool', is => 'ro', default => 0, documentation => 'Help');
 
     our $usage = 0;
     before _getopt_full_usage => sub { $usage++; };
@@ -30,28 +31,29 @@ use Test::Exception;
 {
     local $MyScript::usage; local @MyScript::warnings; local @MyScript::exception;
     local @ARGV = ('--help');
-    throws_ok { MyScript->new_with_options } qr/A foo/;
+    trap { MyScript->new_with_options };
+    like($trap->stdout, qr/A foo/);
     is $MyScript::usage, 1;
 }
 {
     local $MyScript::usage; local @MyScript::warnings; local @MyScript::exception;
     local @ARGV = ('-q'); # Does not exist
-    throws_ok { MyScript->new_with_options } qr/A foo/;
+    trap { MyScript->new_with_options };
+    like($trap->die, qr/A foo/);
     is_deeply \@MyScript::warnings, [
           'Unknown option: q
 '
     ];
+    # FIXME - it looks like we have a spacing issue in Getopt::Long?
     my $exp = [
          'Unknown option: q
 ',
-         qq{usage: 104_override_usage.t [long options...]
-\t--help     Help
-\t--foo      A foo
+         qq{usage: 104_override_usage.t [-?h] [long options...]
+\t-h -? --usage --help  Prints this usage information.
+\t--foo                A foo
 }
      ];
 
      is_deeply \@MyScript::exception, $exp;
 }
 
-done_testing;
-