X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F030_roles%2F020_role_composite.t;h=2ce6a4b85b2dfb9703452438cb6d02c3506ee6b7;hb=757d0de5eaf1c172e6c17a7f257c34424f05d629;hp=506968e6ca2ee054aac33f0a558618f1f551939e;hpb=e606ae5f848070d889472329819c95f5ba763ca3;p=gitmo%2FMoose.git

diff --git a/t/030_roles/020_role_composite.t b/t/030_roles/020_role_composite.t
index 506968e..2ce6a4b 100644
--- a/t/030_roles/020_role_composite.t
+++ b/t/030_roles/020_role_composite.t
@@ -3,8 +3,8 @@
 use strict;
 use warnings;
 
-use Test::More tests => 14;
-use Test::Exception;
+use Test::More;
+use Test::Fatal;
 
 use Moose::Meta::Role::Application::RoleSummation;
 use Moose::Meta::Role::Composite;
@@ -12,15 +12,15 @@ use Moose::Meta::Role::Composite;
 {
     package Role::Foo;
     use Moose::Role;
-    
+
     package Role::Bar;
     use Moose::Role;
 
     package Role::Baz;
-    use Moose::Role;      
-    
+    use Moose::Role;
+
     package Role::Gorch;
-    use Moose::Role;       
+    use Moose::Role;
 }
 
 {
@@ -28,7 +28,7 @@ use Moose::Meta::Role::Composite;
         roles => [
             Role::Foo->meta,
             Role::Bar->meta,
-            Role::Baz->meta,            
+            Role::Baz->meta,
         ]
     );
     isa_ok($c, 'Moose::Meta::Role::Composite');
@@ -38,22 +38,22 @@ use Moose::Meta::Role::Composite;
     is_deeply($c->get_roles, [
         Role::Foo->meta,
         Role::Bar->meta,
-        Role::Baz->meta,        
+        Role::Baz->meta,
     ], '... got the right roles');
-    
+
     ok($c->does_role($_), '... our composite does the role ' . $_)
         for qw(
             Role::Foo
             Role::Bar
-            Role::Baz            
+            Role::Baz
         );
-    
-    lives_ok {
+
+    is( exception {
         Moose::Meta::Role::Application::RoleSummation->new->apply($c);
-    } '... this composed okay';   
-    
+    }, undef, '... this composed okay' );
+
     ##... now nest 'em
-    { 
+    {
         my $c2 = Moose::Meta::Role::Composite->new(
             roles => [
                 $c,
@@ -66,15 +66,17 @@ use Moose::Meta::Role::Composite;
 
         is_deeply($c2->get_roles, [
             $c,
-            Role::Gorch->meta,  
+            Role::Gorch->meta,
         ], '... got the right roles');
 
         ok($c2->does_role($_), '... our composite does the role ' . $_)
             for qw(
                 Role::Foo
                 Role::Bar
-                Role::Baz     
-                Role::Gorch                        
-            );     
+                Role::Baz
+                Role::Gorch
+            );
     }
 }
+
+done_testing;