X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F030_roles%2F025_role_composition_override.t;h=4c428f2d202997146d9247efd08a75124784c21a;hb=a28e50e44945358d15eb19e4688573741a319fe0;hp=33b61cd719f047237d33934188d3c03fe20b090c;hpb=e606ae5f848070d889472329819c95f5ba763ca3;p=gitmo%2FMoose.git diff --git a/t/030_roles/025_role_composition_override.t b/t/030_roles/025_role_composition_override.t index 33b61cd..4c428f2 100644 --- a/t/030_roles/025_role_composition_override.t +++ b/t/030_roles/025_role_composition_override.t @@ -3,7 +3,7 @@ use strict; use warnings; -use Test::More tests => 8; +use Test::More; use Test::Exception; use Moose::Meta::Role::Application::RoleSummation; @@ -12,27 +12,27 @@ use Moose::Meta::Role::Composite; { package Role::Foo; use Moose::Role; - + override foo => sub { 'Role::Foo::foo' }; - + package Role::Bar; use Moose::Role; override bar => sub { 'Role::Bar::bar' }; - + package Role::FooConflict; - use Moose::Role; - + use Moose::Role; + override foo => sub { 'Role::FooConflict::foo' }; - + package Role::FooMethodConflict; - use Moose::Role; - - sub foo { 'Role::FooConflict::foo' } - + use Moose::Role; + + sub foo { 'Role::FooConflict::foo' } + package Role::BarMethodConflict; use Moose::Role; - + sub bar { 'Role::BarConflict::bar' } } @@ -46,12 +46,12 @@ use Moose::Meta::Role::Composite; ); isa_ok($c, 'Moose::Meta::Role::Composite'); - is($c->name, 'Role::Foo|Role::Bar', '... got the composite role name'); - + is($c->name, 'Role::Foo|Role::Bar', '... got the composite role name'); + lives_ok { Moose::Meta::Role::Application::RoleSummation->new->apply($c); - } '... this lives ok'; - + } '... this lives ok'; + is_deeply( [ sort $c->get_method_modifier_list('override') ], [ 'bar', 'foo' ], @@ -74,7 +74,7 @@ dies_ok { # test simple overrides w/ conflicts dies_ok { Moose::Meta::Role::Application::RoleSummation->new->apply( - Moose::Meta::Role::Composite->new( + Moose::Meta::Role::Composite->new( roles => [ Role::Foo->meta, Role::FooMethodConflict->meta, @@ -90,8 +90,8 @@ dies_ok { Moose::Meta::Role::Composite->new( roles => [ Role::Foo->meta, - Role::Bar->meta, - Role::FooConflict->meta, + Role::Bar->meta, + Role::FooConflict->meta, ] ) ); @@ -101,12 +101,14 @@ dies_ok { # test simple overrides w/ conflicts dies_ok { Moose::Meta::Role::Application::RoleSummation->new->apply( - Moose::Meta::Role::Composite->new( + Moose::Meta::Role::Composite->new( roles => [ Role::Foo->meta, - Role::Bar->meta, - Role::FooMethodConflict->meta, + Role::Bar->meta, + Role::FooMethodConflict->meta, ] ) ); } '... this fails as expected'; + +done_testing;