X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F008_configfromfile.t;h=ee359a91aa660413a998818606752c6baa39924f;hb=02f7240001316f154a703fa8e28a50f432f1c90d;hp=affcd7e8ff4fb602eff4f9a6056a5c38d21bd071;hpb=78a71ae567752d6035566011e4900deb5af2cd75;p=gitmo%2FMooseX-Getopt.git

diff --git a/t/008_configfromfile.t b/t/008_configfromfile.t
index affcd7e..ee359a9 100644
--- a/t/008_configfromfile.t
+++ b/t/008_configfromfile.t
@@ -3,17 +3,13 @@
 use strict;
 use warnings;
 
-use Test::Exception;
-use Test::More;
+use Test::More tests => 37;
+use Test::Fatal;
+use File::Spec;
 
-if ( !eval { require MooseX::ConfigFromFile } )
-{
-    plan skip_all => 'Test requires MooseX::ConfigFromFile';
-}
-else
-{
-    plan tests => 24;
-}
+use Test::Requires {
+    'MooseX::ConfigFromFile' => 0.01, # skip all if not installed
+};
 
 {
     package App;
@@ -55,7 +51,8 @@ else
             optional_from_config => 'from_config_2',
         );
 
-        if ( $file ne '/notused/default' ) {
+        my $cpath = File::Spec->canonpath('/notused/default');
+        if ( $file ne $cpath ) {
             $config{config_from_override} = 1;
         }
 
@@ -70,7 +67,18 @@ else
     extends 'App';
 
     has '+configfile' => (
-        default => '/notused/default',
+        default => File::Spec->canonpath('/notused/default'),
+    );
+}
+
+{
+    package App::DefaultConfigFileCodeRef;
+
+    use Moose;
+    extends 'App';
+
+    has '+configfile' => (
+        default => sub { return File::Spec->canonpath('/notused/default') },
     );
 }
 
@@ -78,7 +86,12 @@ else
 {
     local @ARGV = qw( --required_from_argv 1 );
 
-    throws_ok { App->new_with_options } qr/Required option missing: required_from_config/;
+    if ($Getopt::Long::Descriptive::VERSION >= 0.091) {
+        like exception { App->new_with_options }, qr/Mandatory parameter 'required_from_config' missing/;
+    }
+    else {
+        like exception { App->new_with_options }, qr/Required option missing: required_from_config/;
+    }
 
     {
         my $app = App::DefaultConfigFile->new_with_options;
@@ -88,7 +101,24 @@ else
         ok(  !$app->config_from_override,
             '... config_from_override false as expected' );
 
-        is( $app->configfile, '/notused/default',
+        is( $app->configfile, File::Spec->canonpath('/notused/default'),
+            '... configfile is /notused/default as expected' );
+    }
+}
+
+# No config specified
+{
+    local @ARGV = qw( --required_from_argv 1 );
+
+    {
+        my $app = App::DefaultConfigFileCodeRef->new_with_options;
+        isa_ok( $app, 'App::DefaultConfigFileCodeRef' );
+        app_ok( $app );
+
+        ok(  !$app->config_from_override,
+            '... config_from_override false as expected' );
+
+        is( $app->configfile, File::Spec->canonpath('/notused/default'),
             '... configfile is /notused/default as expected' );
     }
 }
@@ -111,7 +141,18 @@ else
         ok( $app->config_from_override,
              '... config_from_override true as expected' );
 
-        is( $app->configfile, '/notused',
+        is( $app->configfile, File::Spec->canonpath('/notused'),
+            '... configfile is /notused as expected' );
+    }
+    {
+        my $app = App::DefaultConfigFileCodeRef->new_with_options;
+        isa_ok( $app, 'App::DefaultConfigFileCodeRef' );
+        app_ok( $app );
+
+        ok( $app->config_from_override,
+             '... config_from_override true as expected' );
+
+        is( $app->configfile, File::Spec->canonpath('/notused'),
             '... configfile is /notused as expected' );
     }
 }
@@ -119,7 +160,12 @@ else
 # Required arg not supplied from cmdline
 {
     local @ARGV = qw( --configfile /notused );
-    throws_ok { App->new_with_options } qr/Required option missing: required_from_argv/;
+    if ($Getopt::Long::Descriptive::VERSION >= 0.091) {
+        like exception { App->new_with_options }, qr/Mandatory parameter 'required_from_argv' missing/;
+    }
+    else {
+        like exception { App->new_with_options }, qr/Required option missing: required_from_argv/;
+    }
 }
 
 # Config file value overriden from cmdline
@@ -150,6 +196,27 @@ else
         '... optional_from_config is undef as expected' );
 }
 
+{
+    package BaseApp::WithConfig;
+    use Moose;
+    with 'MooseX::ConfigFromFile';
+
+    sub get_config_from_file { return {}; }
+}
+
+{
+    package DerivedApp::Getopt;
+    use Moose;
+    extends 'BaseApp::WithConfig';
+    with 'MooseX::Getopt';
+}
+
+# With DerivedApp, the Getopt role was applied at a different level
+# than the ConfigFromFile role
+{
+    ok ! exception { DerivedApp::Getopt->new_with_options }, 'Can create DerivedApp';
+}
+
 sub app_ok {
     my $app = shift;