X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F060_compat%2F004_extends_nonmoose_that_isa_moose_with_metarole.t;h=8ec5dcbed2f72ee18e175fd9bbb5083087dc3de0;hb=61697425b329bc667185bb5b2f4be223f2be62c0;hp=bc175d49744077782d209bd67ebb42b4a6faf160;hpb=ef55236d74702a0abd8eaea73961381db5c11ae6;p=gitmo%2FMoose.git

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 bc175d4..8ec5dcb 100644
--- 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' );
 }
 
 {
@@ -35,9 +34,9 @@ use Class::MOP ();
         'SubSubClassUseBase meta metaclass does the My::Role role' );
 }
 
-# Note, remote metaclasses of the 'use base' classes after each test, so that
-# they have to be re-initialized - otherwise latter tests would not demonstrate
-# the original issue.
+# Note, remove metaclasses of the 'use base' classes after each test,
+# so that they have to be re-initialized - otherwise latter tests
+# would not demonstrate the original issue.
 Class::MOP::remove_metaclass_by_name('SubClassUseBase');
 
 {
@@ -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' );
 }
 
 {
@@ -67,17 +65,17 @@ Class::MOP::remove_metaclass_by_name('SubClassUseBase');
         'MultiParent1 meta metaclass does the My::Role role' );
 }
 
-Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
+Class::MOP::remove_metaclass_by_name($_)
+    for qw( SubClassUseBase OtherSubClassUseBase );
 
 {
     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)' );
 }
 
 {
@@ -86,17 +84,17 @@ Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
         'MultiParent2 meta metaclass does the My::Role role' );
 }
 
-Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
+Class::MOP::remove_metaclass_by_name($_)
+    for qw( SubClassUseBase OtherSubClassUseBase );
 
 {
     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' );
 }
 
 {
@@ -105,17 +103,17 @@ Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
         'MultiParent3 meta metaclass does the My::Role role' );
 }
 
-Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
+Class::MOP::remove_metaclass_by_name($_)
+    for qw( SubClassUseBase OtherSubClassUseBase );
 
 {
     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' );
 }
 
 {
@@ -124,17 +122,17 @@ Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
         'MultiParent4 meta metaclass does the My::Role role' );
 }
 
-Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
+Class::MOP::remove_metaclass_by_name($_)
+    for qw( SubClassUseBase OtherSubClassUseBase );
 
 {
     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' );
 }
 
 {
@@ -143,17 +141,17 @@ Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
         'MultiChild1 meta metaclass does the My::Role role' );
 }
 
-Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
+Class::MOP::remove_metaclass_by_name($_)
+    for qw( SubClassUseBase OtherSubClassUseBase );
 
 {
     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)' );
 }
 
 {
@@ -162,17 +160,17 @@ Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
         'MultiChild2 meta metaclass does the My::Role role' );
 }
 
-Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
+Class::MOP::remove_metaclass_by_name($_)
+    for qw( SubClassUseBase OtherSubClassUseBase );
 
 {
     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' );
 }
 
 {
@@ -181,17 +179,17 @@ Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
         'MultiChild3 meta metaclass does the My::Role role' );
 }
 
-Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
+Class::MOP::remove_metaclass_by_name($_)
+    for qw( SubClassUseBase OtherSubClassUseBase );
 
 {
     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' );
 }
 
 {
@@ -200,5 +198,7 @@ Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
         'MultiChild4 meta metaclass does the My::Role role' );
 }
 
-Class::MOP::remove_metaclass_by_name(qw/SubClassUseBase OtherSubClassUseBase/);
+Class::MOP::remove_metaclass_by_name($_)
+    for qw( SubClassUseBase OtherSubClassUseBase );
 
+done_testing;