X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F05_default_sub.t;h=bdcb49569edbd054ab52b9ecceeeb1dfae893507;hb=0f01d3ff6b0a1edc7ff0d119827286597bef4d5c;hp=0160167100c232495ff613ff48bd14ca943a0070;hpb=28d693631e3b72ea26dc51fb9c4d84ce718dbde1;p=gitmo%2FMooseX-ConfigFromFile.git

diff --git a/t/05_default_sub.t b/t/05_default_sub.t
index 0160167..bdcb495 100644
--- a/t/05_default_sub.t
+++ b/t/05_default_sub.t
@@ -1,11 +1,10 @@
 use strict;
 use warnings FATAL => 'all';
 
-use Test::Requires 'MooseX::SimpleConfig';      # skip all if not reuqired
-use Test::More tests => 33;
+use Test::More;
 use Test::Fatal;
 use Test::Deep '!blessed';
-use Test::NoWarnings 1.04 ':early';
+use if $ENV{AUTHOR_TESTING}, 'Test::Warnings';
 use Scalar::Util 'blessed';
 
 my %loaded_file;
@@ -17,7 +16,7 @@ my %constructor_args;
 {
     package Generic;
     use Moose;
-    with 'MooseX::SimpleConfig';
+    with 'MooseX::ConfigFromFile';
     sub get_config_from_file
     {
         my ($class, $file) = @_;
@@ -52,6 +51,50 @@ is(
     'no exceptions',
 );
 
+{
+    package Base;
+    use Moose;
+}
+{
+    package GenericRole;
+    use Moose::Role;
+    with 'MooseX::ConfigFromFile';
+    sub get_config_from_file
+    {
+        my ($class, $file) = @_;
+        $loaded_file{$file}++;
+        +{}
+    }
+    around BUILDARGS => sub {
+        my ($orig, $class) = (shift, shift);
+        my $args = $class->$orig(@_);
+        $constructor_args{$class} = $args;
+    };
+    sub __my_configfile
+    {
+        my $class = blessed($_[0]) || $_[0];
+        $configfile_sub{$class}++;
+        $class . ' file'
+    }
+}
+
+is(
+    exception {
+        my $obj = Moose::Meta::Class->create_anon_class(
+            superclasses => ['Base'],
+            roles => ['GenericRole'],
+        )->name->new_with_config;
+        is($obj->configfile, undef, 'no configfile set');
+        cmp_deeply(\%loaded_file, {}, 'no files loaded');
+        cmp_deeply(
+            $constructor_args{blessed($obj)},
+            { },
+            'correct constructor args passed',
+        );
+    },
+    undef,
+    'no exceptions',
+);
 
 # this is a classic legacy usecase from old documentation that we must
 # continue to support
@@ -141,6 +184,28 @@ is(
     'no exceptions',
 );
 
+{
+    package OverriddenMethodAsRole;
+    use Moose::Role;
+    with 'GenericRole';
+    around configfile => sub { my $orig = shift; shift->__my_configfile };
+}
+
+is(
+    exception {
+        my $obj = Moose::Meta::Class->create_anon_class(
+            superclasses => ['Base'],
+            roles => ['OverriddenMethodAsRole'],
+        )->name->new_with_config;
+        is($obj->configfile, blessed($obj) . ' file', 'configfile set via overridden sub');
+        # this is not fixable - the reader method has been shadowed
+        # is($configfile_sub{blessed($obj)}, 1, 'configfile was calculated just once');
+        is($loaded_file{blessed($obj) . ' file'}, 1, 'correct file was loaded from');
+    },
+    undef,
+    'no exceptions',
+);
+
 
 # overridable method for configfile default, and configfile init_arg is changed
 {
@@ -170,9 +235,54 @@ is(
     'no exceptions',
 );
 
+{
+    package OverriddenMethodAndChangedNameAsRole;
+    use Moose::Role;
+    with 'GenericRole';
+    use MooseX::Types::Path::Tiny 'Path';
+    use MooseX::Types::Moose 'Undef';
+    use Try::Tiny;
+    has configfile => (
+        is => 'ro',
+        isa => Path|Undef,
+        coerce => 1,
+        predicate => 'has_configfile',
+        do { try { require MooseX::Getopt; (traits => ['Getopt']) } },
+        lazy => 1,
+        # it sucks that we have to do this rather than using a builder, but some old code
+        # simply swaps in a new default sub into the attr definition
+        default => sub { shift->_get_default_configfile },
+
+        # this is the overridden bit
+        init_arg => 'my_configfile',
+    );
+    around configfile => sub { my $orig = shift; shift->__my_configfile };
+}
+
+is(
+    exception {
+        my $obj = Moose::Meta::Class->create_anon_class(
+            superclasses => ['Base'],
+            roles => ['OverriddenMethodAndChangedNameAsRole'],
+        )->name->new_with_config;
+        is($obj->configfile, blessed($obj) . ' file', 'configfile set via overridden sub');
+        cmp_deeply(
+            $constructor_args{blessed($obj)},
+            { my_configfile => blessed($obj) . ' file' },
+            'correct constructor args passed',
+        );
+        # this is not fixable - the reader method has been shadowed
+        # is($configfile_sub{blessed($obj)}, 1, 'configfile was calculated just once');
+        is($loaded_file{blessed($obj) . ' file'}, 1, 'correct file was loaded from');
+    },
+    undef,
+    'no exceptions',
+);
+
+
 # newly-supported overridable method for configfile default
 {
-    package WrapperSub;
+    package NewSub;
     use Moose;
     extends 'Generic';
     sub _get_default_configfile { shift->__my_configfile }
@@ -180,7 +290,7 @@ is(
 
 is(
     exception {
-        my $obj = WrapperSub->new_with_config;
+        my $obj = NewSub->new_with_config;
         is($obj->configfile, blessed($obj) . ' file', 'configfile set via new sub');
         cmp_deeply(
             $constructor_args{blessed($obj)},
@@ -194,10 +304,37 @@ is(
     'no exceptions',
 );
 
+{
+    package NewSubAsRole;
+    use Moose::Role;
+    with 'GenericRole';
+    sub _get_default_configfile { shift->__my_configfile }
+}
+
+is(
+    exception {
+        my $obj = Moose::Meta::Class->create_anon_class(
+            superclasses => ['Base'],
+            roles => ['NewSubAsRole'],
+        )->name->new_with_config;
+        is($obj->configfile, blessed($obj) . ' file', 'configfile set via new sub');
+        cmp_deeply(
+            $constructor_args{blessed($obj)},
+            {  configfile => blessed($obj) . ' file' },
+            'correct constructor args passed',
+        );
+        is($configfile_sub{blessed($obj)}, 1, 'configfile was calculated just once');
+        is($loaded_file{blessed($obj) . ' file'}, 1, 'correct file was loaded from');
+    },
+    undef,
+    'no exceptions',
+);
+
+
 # newly-supported overridable method for configfile default, and configfile
 # init_arg has been changed
 {
-    package WrapperSubAndChangedName;
+    package NewSubAndChangedName;
     use Moose;
     extends 'Generic';
     has '+configfile' => (
@@ -208,7 +345,7 @@ is(
 
 is(
     exception {
-        my $obj = WrapperSubAndChangedName->new_with_config;
+        my $obj = NewSubAndChangedName->new_with_config;
         is($obj->configfile, blessed($obj) . ' file', 'configfile set via overridden sub');
         cmp_deeply(
             $constructor_args{blessed($obj)},
@@ -222,3 +359,4 @@ is(
     'no exceptions',
 );
 
+done_testing;