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=d0aaa478af93a00ebb39b0503f1d09eab8df1bc5;hpb=fb1e11d526a7d3608132ba484525980e9fafcc4f;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 d0aaa47..4c428f2 100644
--- a/t/030_roles/025_role_composition_override.t
+++ b/t/030_roles/025_role_composition_override.t
@@ -3,39 +3,36 @@
 use strict;
 use warnings;
 
-use Test::More no_plan => 1;
+use Test::More;
 use Test::Exception;
 
-BEGIN {
-    use_ok('Moose');
-    use_ok('Moose::Meta::Role::Application::RoleSummation');    
-    use_ok('Moose::Meta::Role::Composite');
-}
+use Moose::Meta::Role::Application::RoleSummation;
+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' }
 }
 
@@ -49,12 +46,12 @@ BEGIN {
     );
     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' ],
@@ -77,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,
@@ -93,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,
             ]
         )
     );
@@ -104,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;