Redid conversion to Test::Fatal

[gitmo/Moose.git] / t / 030_roles / 021_role_composite_exclusion.t

diff --git a/t/030_roles/021_role_composite_exclusion.t b/t/030_roles/021_role_composite_exclusion.t
index 4a1cad6..8b9ae2e 100644 (file)
--- a/t/030_roles/021_role_composite_exclusion.t
+++ b/t/030_roles/021_role_composite_exclusion.t
@@ -3,40 +3,37 @@
 use strict;
 use warnings;
 
-use Test::More tests => 15;
-use Test::Exception;
+use Test::More;
+use Test::Fatal;
 
-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;
-    
+
     package Role::Bar;
     use Moose::Role;
-    
+
     package Role::ExcludesFoo;
     use Moose::Role;
     excludes 'Role::Foo';
-    
+
     package Role::DoesExcludesFoo;
     use Moose::Role;
-    with 'Role::ExcludesFoo';  
-    
+    with 'Role::ExcludesFoo';
+
     package Role::DoesFoo;
     use Moose::Role;
-    with 'Role::Foo';    
+    with 'Role::Foo';
 }
 
 ok(Role::ExcludesFoo->meta->excludes_role('Role::Foo'), '... got the right exclusions');
 ok(Role::DoesExcludesFoo->meta->excludes_role('Role::Foo'), '... got the right exclusions');
 
 # test simple exclusion
-dies_ok {
+isnt( exception {
     Moose::Meta::Role::Application::RoleSummation->new->apply(
         Moose::Meta::Role::Composite->new(
             roles => [
@@ -45,7 +42,7 @@ dies_ok {
             ]
         )
     );
-} '... this fails as expected';
+}, undef, '... this fails as expected' );
 
 # test no conflicts
 {
@@ -58,10 +55,10 @@ dies_ok {
     isa_ok($c, 'Moose::Meta::Role::Composite');
 
     is($c->name, 'Role::Foo|Role::Bar', '... got the composite role name');
-    
-    lives_ok {
+
+    is( exception {
         Moose::Meta::Role::Application::RoleSummation->new->apply($c);
-    } '... this lives as expected';    
+    }, undef, '... this lives as expected' );
 }
 
 # test no conflicts w/exclusion
@@ -69,23 +66,23 @@ dies_ok {
     my $c = Moose::Meta::Role::Composite->new(
         roles => [
             Role::Bar->meta,
-            Role::ExcludesFoo->meta,            
+            Role::ExcludesFoo->meta,
         ]
     );
     isa_ok($c, 'Moose::Meta::Role::Composite');
 
     is($c->name, 'Role::Bar|Role::ExcludesFoo', '... got the composite role name');
-    
-    lives_ok {
+
+    is( exception {
         Moose::Meta::Role::Application::RoleSummation->new->apply($c);
-    } '... this lives as expected';    
-    
-    is_deeply([$c->get_excluded_roles_list], ['Role::Foo'], '... has excluded roles');    
+    }, undef, '... this lives as expected' );
+
+    is_deeply([$c->get_excluded_roles_list], ['Role::Foo'], '... has excluded roles');
 }
 
 
 # test conflict with an "inherited" exclusion
-dies_ok {
+isnt( exception {
     Moose::Meta::Role::Application::RoleSummation->new->apply(
         Moose::Meta::Role::Composite->new(
             roles => [
@@ -94,19 +91,19 @@ dies_ok {
             ]
         )
     );
-    
-} '... this fails as expected';
+
+}, undef, '... this fails as expected' );
 
 # test conflict with an "inherited" exclusion of an "inherited" role
-dies_ok {
+isnt( exception {
     Moose::Meta::Role::Application::RoleSummation->new->apply(
-        Moose::Meta::Role::Composite->new(        
+        Moose::Meta::Role::Composite->new(
             roles => [
-                Role::DoesFoo->meta,            
+                Role::DoesFoo->meta,
                 Role::DoesExcludesFoo->meta,
             ]
         )
     );
-} '... this fails as expected';
-
+}, undef, '... this fails as expected' );
 
+done_testing;