X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F030_roles%2F008_role_conflict_edge_cases.t;h=4a6cee7b710b1745950f90b69c0d40f7fa1300ac;hb=b10dde3a27c11623547417c599ccbd4f92e42651;hp=aff9bd926f3404ee1cad99c81e674954f819ef6e;hpb=d4e538d9bf46d1c14d2ecfd36ac35ed541ae7ee6;p=gitmo%2FMoose.git

diff --git a/t/030_roles/008_role_conflict_edge_cases.t b/t/030_roles/008_role_conflict_edge_cases.t
index aff9bd9..4a6cee7 100644
--- a/t/030_roles/008_role_conflict_edge_cases.t
+++ b/t/030_roles/008_role_conflict_edge_cases.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use Test::More;
-use Test::Exception;
+use Test::Fatal;
 
 =pod
 
@@ -33,9 +33,9 @@ a conflict)
     package My::Test::Class1;
     use Moose;
 
-    ::lives_ok {
+    ::is( ::exception {
         with 'Role::Derived1', 'Role::Derived2';
-    } '... roles composed okay (no conflicts)';
+    }, undef, '... roles composed okay (no conflicts)' );
 }
 
 ok(Role::Base->meta->has_method('foo'), '... have the method foo as expected');
@@ -79,9 +79,9 @@ a method conflict with method modifiers
 
     extends 'My::Test::Class2::Base';
 
-    ::lives_ok {
+    ::is( ::exception {
         with 'Role::Derived3', 'Role::Derived4';
-    } '... roles composed okay (no conflicts)';
+    }, undef, '... roles composed okay (no conflicts)' );
 }
 
 ok(Role::Base2->meta->has_override_method_modifier('foo'), '... have the method foo as expected');
@@ -132,9 +132,9 @@ same for before/afters as well
 
     extends 'My::Test::Class3::Base';
 
-    ::lives_ok {
+    ::is( ::exception {
         with 'Role::Derived5', 'Role::Derived6';
-    } '... roles composed okay (no conflicts)';
+    }, undef, '... roles composed okay (no conflicts)' );
 }
 
 ok(Role::Base3->meta->has_around_method_modifiers('foo'), '... have the method foo as expected');
@@ -175,9 +175,9 @@ a conflict)
     package My::Test::Class4;
     use Moose;
 
-    ::lives_ok {
+    ::is( ::exception {
         with 'Role::Derived7', 'Role::Derived8';
-    } '... roles composed okay (no conflicts)';
+    }, undef, '... roles composed okay (no conflicts)' );
 }
 
 ok(Role::Base4->meta->has_attribute('foo'), '... have the attribute foo as expected');