My previous role preservation fix made a todo test pass, so I moved the test and...

[gitmo/Moose.git] / t / 060_compat / 004_extends_nonmoose_that_isa_moose_with_metarole.t

diff --git a/t/060_compat/004_extends_nonmoose_that_isa_moose_with_metarole.t b/t/060_compat/004_extends_nonmoose_that_isa_moose_with_metarole.t
index 19fe24e..8ec5dcb 100644 (file)
--- a/t/060_compat/004_extends_nonmoose_that_isa_moose_with_metarole.t
+++ b/t/060_compat/004_extends_nonmoose_that_isa_moose_with_metarole.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More tests => 18;
+use Test::More;
 use Class::MOP ();
 
 {
@@ -22,11 +22,10 @@ use Class::MOP ();
     package SubSubClassUseBase;
     use Moose;
     use Test::More;
-    use Test::Exception;
-    lives_ok {
+    use Test::Fatal;
+    is( exception {
         extends 'SubClassUseBase';
-    }
-    'Can extend non-Moose class with parent class that is a Moose class with a meta role';
+    }, undef, 'Can extend non-Moose class with parent class that is a Moose class with a meta role' );
 }
 
 {
@@ -54,11 +53,10 @@ Class::MOP::remove_metaclass_by_name('SubClassUseBase');
     package MultiParent1;
     use Moose;
     use Test::More;
-    use Test::Exception;
-    lives_ok {
+    use Test::Fatal;
+    is( exception {
         extends qw( SubClassUseBase OtherSubClassUseBase );
-    }
-    'Can extend two non-Moose classes with parents that are different Moose metaclasses';
+    }, undef, 'Can extend two non-Moose classes with parents that are different Moose metaclasses' );
 }
 
 {
@@ -74,11 +72,10 @@ Class::MOP::remove_metaclass_by_name($_)
     package MultiParent2;
     use Moose;
     use Test::More;
-    use Test::Exception;
-    lives_ok {
+    use Test::Fatal;
+    is( exception {
         extends qw( OtherSubClassUseBase SubClassUseBase );
-    }
-    'Can extend two non-Moose classes with parents that are different Moose metaclasses (reverse order)';
+    }, undef, 'Can extend two non-Moose classes with parents that are different Moose metaclasses (reverse order)' );
 }
 
 {
@@ -94,11 +91,10 @@ Class::MOP::remove_metaclass_by_name($_)
     package MultiParent3;
     use Moose;
     use Test::More;
-    use Test::Exception;
-    lives_ok {
+    use Test::Fatal;
+    is( exception {
         extends qw( OtherClass SubClassUseBase );
-    }
-    'Can extend one Moose class and one non-Moose class';
+    }, undef, 'Can extend one Moose class and one non-Moose class' );
 }
 
 {
@@ -114,11 +110,10 @@ Class::MOP::remove_metaclass_by_name($_)
     package MultiParent4;
     use Moose;
     use Test::More;
-    use Test::Exception;
-    lives_ok {
+    use Test::Fatal;
+    is( exception {
         extends qw( SubClassUseBase OtherClass );
-    }
-    'Can extend one non-Moose class and one Moose class';
+    }, undef, 'Can extend one non-Moose class and one Moose class' );
 }
 
 {
@@ -134,11 +129,10 @@ Class::MOP::remove_metaclass_by_name($_)
     package MultiChild1;
     use Moose;
     use Test::More;
-    use Test::Exception;
-    lives_ok {
+    use Test::Fatal;
+    is( exception {
         extends 'MultiParent1';
-    }
-    'Can extend class that itself extends two non-Moose classes with Moose parents';
+    }, undef, 'Can extend class that itself extends two non-Moose classes with Moose parents' );
 }
 
 {
@@ -154,11 +148,10 @@ Class::MOP::remove_metaclass_by_name($_)
     package MultiChild2;
     use Moose;
     use Test::More;
-    use Test::Exception;
-    lives_ok {
+    use Test::Fatal;
+    is( exception {
         extends 'MultiParent2';
-    }
-    'Can extend class that itself extends two non-Moose classes with Moose parents (reverse order)';
+    }, undef, 'Can extend class that itself extends two non-Moose classes with Moose parents (reverse order)' );
 }
 
 {
@@ -174,11 +167,10 @@ Class::MOP::remove_metaclass_by_name($_)
     package MultiChild3;
     use Moose;
     use Test::More;
-    use Test::Exception;
-    lives_ok {
+    use Test::Fatal;
+    is( exception {
         extends 'MultiParent3';
-    }
-    'Can extend class that itself extends one Moose and one non-Moose parent';
+    }, undef, 'Can extend class that itself extends one Moose and one non-Moose parent' );
 }
 
 {
@@ -194,11 +186,10 @@ Class::MOP::remove_metaclass_by_name($_)
     package MultiChild4;
     use Moose;
     use Test::More;
-    use Test::Exception;
-    lives_ok {
+    use Test::Fatal;
+    is( exception {
         extends 'MultiParent4';
-    }
-    'Can extend class that itself extends one non-Moose and one Moose parent';
+    }, undef, 'Can extend class that itself extends one non-Moose and one Moose parent' );
 }
 
 {
@@ -210,3 +201,4 @@ Class::MOP::remove_metaclass_by_name($_)
 Class::MOP::remove_metaclass_by_name($_)
     for qw( SubClassUseBase OtherSubClassUseBase );
 
+done_testing;