X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F030_roles%2F022_role_composition_req_methods.t;h=2e6727e282e7a507abe947fb131def4f486cf151;hb=d03bd989b97597428b460d7f9a021e2931893fa0;hp=0d04cbc9f99edfab9cfeb0da0b4676c29b085ddd;hpb=4734114bfde92591888a7bd3699a3c963e009269;p=gitmo%2FMoose.git

diff --git a/t/030_roles/022_role_composition_req_methods.t b/t/030_roles/022_role_composition_req_methods.t
index 0d04cbc..2e6727e 100644
--- a/t/030_roles/022_role_composition_req_methods.t
+++ b/t/030_roles/022_role_composition_req_methods.t
@@ -3,31 +3,28 @@
 use strict;
 use warnings;
 
-use Test::More tests => 19;
+use Test::More tests => 16;
 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;    
+    use Moose::Role;
     requires 'foo';
-    
+
     package Role::Bar;
     use Moose::Role;
     requires 'bar';
-    
+
     package Role::ProvidesFoo;
-    use Moose::Role;    
+    use Moose::Role;
     sub foo { 'Role::ProvidesFoo::foo' }
-    
+
     package Role::ProvidesBar;
-    use Moose::Role;    
-    sub bar { 'Role::ProvidesBar::bar' }     
+    use Moose::Role;
+    sub bar { 'Role::ProvidesBar::bar' }
 }
 
 # test simple requirement
@@ -36,16 +33,16 @@ BEGIN {
         roles => [
             Role::Foo->meta,
             Role::Bar->meta,
-        ]        
+        ]
     );
     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 succeeds as expected';    
-    
+    } '... this succeeds as expected';
+
     is_deeply(
         [ sort $c->get_required_method_list ],
         [ 'bar', 'foo' ],
@@ -63,12 +60,12 @@ BEGIN {
     );
     isa_ok($c, 'Moose::Meta::Role::Composite');
 
-    is($c->name, 'Role::Foo|Role::ProvidesFoo', '... got the composite role name');    
-    
-    lives_ok { 
+    is($c->name, 'Role::Foo|Role::ProvidesFoo', '... got the composite role name');
+
+    lives_ok {
         Moose::Meta::Role::Application::RoleSummation->new->apply($c);
-    } '... this succeeds as expected';    
-    
+    } '... this succeeds as expected';
+
     is_deeply(
         [ sort $c->get_required_method_list ],
         [],
@@ -82,17 +79,17 @@ BEGIN {
         roles => [
             Role::Foo->meta,
             Role::ProvidesFoo->meta,
-            Role::Bar->meta,            
+            Role::Bar->meta,
         ]
     );
     isa_ok($c, 'Moose::Meta::Role::Composite');
 
-    is($c->name, 'Role::Foo|Role::ProvidesFoo|Role::Bar', '... got the composite role name');    
-    
+    is($c->name, 'Role::Foo|Role::ProvidesFoo|Role::Bar', '... got the composite role name');
+
     lives_ok {
         Moose::Meta::Role::Application::RoleSummation->new->apply($c);
-    } '... this succeeds as expected';    
-    
+    } '... this succeeds as expected';
+
     is_deeply(
         [ sort $c->get_required_method_list ],
         [ 'bar' ],
@@ -106,18 +103,18 @@ BEGIN {
         roles => [
             Role::Foo->meta,
             Role::ProvidesFoo->meta,
-            Role::ProvidesBar->meta,            
-            Role::Bar->meta,            
+            Role::ProvidesBar->meta,
+            Role::Bar->meta,
         ]
     );
     isa_ok($c, 'Moose::Meta::Role::Composite');
 
-    is($c->name, 'Role::Foo|Role::ProvidesFoo|Role::ProvidesBar|Role::Bar', '... got the composite role name');    
-    
+    is($c->name, 'Role::Foo|Role::ProvidesFoo|Role::ProvidesBar|Role::Bar', '... got the composite role name');
+
     lives_ok {
         Moose::Meta::Role::Application::RoleSummation->new->apply($c);
-    } '... this succeeds as expected';    
-    
+    } '... this succeeds as expected';
+
     is_deeply(
         [ sort $c->get_required_method_list ],
         [ ],