Merge branch 'stable'

[gitmo/Class-MOP.git] / t / 071_immutable_w_custom_metaclass.t

diff --git a/t/071_immutable_w_custom_metaclass.t b/t/071_immutable_w_custom_metaclass.t
index 961d71b..eda3217 100644 (file)
--- a/t/071_immutable_w_custom_metaclass.t
+++ b/t/071_immutable_w_custom_metaclass.t
@@ -1,20 +1,19 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More tests => 14;
-use Test::Exception;
+use Test::More;
+use Test::Fatal;
 use Scalar::Util;
 
 use Class::MOP;
 
-use lib catdir($FindBin::Bin, 'lib');
+use lib catdir( $FindBin::Bin, 'lib' );
 
 {
+
     package Foo;
 
     use strict;
@@ -37,28 +36,39 @@ use lib catdir($FindBin::Bin, 'lib');
     use warnings;
     use metaclass 'MyMetaClass';
 
-    sub mymetaclass_attributes{
-      shift->meta->mymetaclass_attributes;
+    sub mymetaclass_attributes {
+        shift->meta->mymetaclass_attributes;
     }
 
-    ::lives_ok {
-        Baz->meta->superclasses('Bar');
-    } '... we survive the metaclass incompatibility test';
+    ::is( ::exception { Baz->meta->superclasses('Bar') }, undef, '... we survive the metaclass incompatibility test' );
 }
 
 {
     my $meta = Baz->meta;
-    ok($meta->is_mutable, '... Baz is mutable');
-    is(Scalar::Util::blessed(Foo->meta), Scalar::Util::blessed(Bar->meta), 'Foo and Bar immutable metaclasses match');
-    is(Scalar::Util::blessed($meta), 'MyMetaClass', 'Baz->meta blessed as MyMetaClass');
-    ok(Baz->can('mymetaclass_attributes'), '... Baz can do method before immutable');
-    ok($meta->can('mymetaclass_attributes'), '... meta can do method before immutable');
-    lives_ok { $meta->make_immutable } "Baz is now immutable";
-    ok($meta->is_immutable, '... Baz is immutable');
-    isa_ok($meta, 'MyMetaClass', 'Baz->meta');
-    ok(Baz->can('mymetaclass_attributes'), '... Baz can do method after imutable');
-    ok($meta->can('mymetaclass_attributes'), '... meta can do method after immutable');
-    isnt(Scalar::Util::blessed(Baz->meta), Scalar::Util::blessed(Bar->meta), 'Baz and Bar immutable metaclasses are different');
-    lives_ok { $meta->make_mutable } "Baz is now mutable";
-    ok($meta->is_mutable, '... Baz is mutable again');
+    ok( $meta->is_mutable, '... Baz is mutable' );
+    is(
+        Scalar::Util::blessed( Foo->meta ),
+        Scalar::Util::blessed( Bar->meta ),
+        'Foo and Bar immutable metaclasses match'
+    );
+    is( Scalar::Util::blessed($meta), 'MyMetaClass',
+        'Baz->meta blessed as MyMetaClass' );
+    ok( Baz->can('mymetaclass_attributes'),
+        '... Baz can do method before immutable' );
+    ok( $meta->can('mymetaclass_attributes'),
+        '... meta can do method before immutable' );
+    is( exception { $meta->make_immutable }, undef, "Baz is now immutable" );
+    ok( $meta->is_immutable, '... Baz is immutable' );
+    isa_ok( $meta, 'MyMetaClass', 'Baz->meta' );
+    ok( Baz->can('mymetaclass_attributes'),
+        '... Baz can do method after imutable' );
+    ok( $meta->can('mymetaclass_attributes'),
+        '... meta can do method after immutable' );
+    isnt( Scalar::Util::blessed( Baz->meta ),
+        Scalar::Util::blessed( Bar->meta ),
+        'Baz and Bar immutable metaclasses are different' );
+    is( exception { $meta->make_mutable }, undef, "Baz is now mutable" );
+    ok( $meta->is_mutable, '... Baz is mutable again' );
 }
+
+done_testing;