Revert "convert all uses of Test::Exception to Test::Fatal."

[gitmo/Class-MOP.git] / t / 073_make_mutable.t

diff --git a/t/073_make_mutable.t b/t/073_make_mutable.t
index ae6210f..4070b5c 100644 (file)
--- a/t/073_make_mutable.t
+++ b/t/073_make_mutable.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 101;
+use Test::More;
 use Test::Exception;
 
 use Scalar::Util;
@@ -44,25 +44,21 @@ use Class::MOP;
     my %orig_keys = map { $_ => 1 } grep { !/^_/ } keys %$meta;
     # Since this has no default it won't be present yet, but it will
     # be after the class is made immutable.
-    $orig_keys{immutable_transformer} = 1;
 
     lives_ok {$meta->make_immutable; } '... changed Baz to be immutable';
     ok(!$meta->is_mutable,              '... our class is no longer mutable');
     ok($meta->is_immutable,             '... our class is now immutable');
     ok(!$meta->make_immutable,          '... make immutable now returns nothing');
-    ok($meta->get_method_map->{new},    '... inlined constructor created');
-    ok($meta->has_method('new'),        '... inlined constructor created for sure');    
-    ok($meta->immutable_transformer->inlined_constructor,
-       '... transformer says it did inline the constructor');
+    ok($meta->get_method('new'),        '... inlined constructor created');
+    ok($meta->has_method('new'),        '... inlined constructor created for sure');
+    is_deeply([ map { $_->name } $meta->_inlined_methods ], [ 'new' ], '... really, i mean it');
 
     lives_ok { $meta->make_mutable; }  '... changed Baz to be mutable';
     ok($meta->is_mutable,               '... our class is mutable');
     ok(!$meta->is_immutable,            '... our class is not immutable');
     ok(!$meta->make_mutable,            '... make mutable now returns nothing');
-    ok(!$meta->get_method_map->{new},   '... inlined constructor removed');
-    ok(!$meta->has_method('new'),        '... inlined constructor removed for sure');    
-    ok(!$meta->immutable_transformer->inlined_constructor,
-       '... transformer says it did not inline the constructor');
+    ok(!$meta->get_method('new'),       '... inlined constructor created');
+    ok(!$meta->has_method('new'),       '... inlined constructor removed for sure');
 
     my %new_keys = map { $_ => 1 } grep { !/^_/ } keys %$meta;
     is_deeply(\%orig_keys, \%new_keys, '... no extraneous hashkeys');
@@ -89,11 +85,11 @@ use Class::MOP;
     is_deeply([@supers], [$meta->superclasses], '... reset the superclasses okay');
 
     ok( $meta->$_  , "... ${_} works")
-      for qw(get_meta_instance       compute_all_applicable_attributes
-             class_precedence_list  get_method_map );
+      for qw(get_meta_instance       get_all_attributes
+             class_precedence_list );
 
     lives_ok {$meta->make_immutable; } '... changed Baz to be immutable again';
-    ok($meta->get_method_map->{new},    '... inlined constructor recreated');
+    ok($meta->get_method('new'),    '... inlined constructor recreated');
 }
 
 {
@@ -118,8 +114,8 @@ use Class::MOP;
     dies_ok { $meta->superclasses('Foo') } '... set the superclasses';
 
     ok( $meta->$_  , "... ${_} works")
-      for qw(get_meta_instance       compute_all_applicable_attributes
-             class_precedence_list  get_method_map );
+      for qw(get_meta_instance       get_all_attributes
+             class_precedence_list );
 }
 
 {
@@ -127,9 +123,7 @@ use Class::MOP;
     ok(Baz->meta->is_immutable,  'Superclass is immutable');
     my $meta = Baz->meta->create_anon_class(superclasses => ['Baz']);
     my %orig_keys = map { $_ => 1 } grep { !/^_/ } keys %$meta;
-    $orig_keys{immutable_transformer} = 1;
-    my @orig_meths = sort { $a->name cmp $b->name }
-      $meta->get_all_methods;
+    my @orig_meths = sort { $a->name cmp $b->name } $meta->get_all_methods;
     ok($meta->is_anon_class,                  'We have an anon metaclass');
     ok($meta->is_mutable,  '... our anon class is mutable');
     ok(!$meta->is_immutable,  '... our anon class is not immutable');
@@ -180,8 +174,8 @@ use Class::MOP;
     is_deeply([@supers], [$meta->superclasses], '... reset the superclasses okay');
 
     ok( $meta->$_  , "... ${_} works")
-      for qw(get_meta_instance       compute_all_applicable_attributes
-             class_precedence_list  get_method_map );
+      for qw(get_meta_instance       get_all_attributes
+             class_precedence_list );
 };
 
 
@@ -213,15 +207,14 @@ use Class::MOP;
     dies_ok { $meta->superclasses('Foo') } '... set the superclasses';
 
     ok( $meta->$_  , "... ${_} works")
-      for qw(get_meta_instance       compute_all_applicable_attributes
-             class_precedence_list  get_method_map );
+      for qw(get_meta_instance       get_all_attributes
+             class_precedence_list );
 }
 
 {
     Foo->meta->make_immutable;
     Bar->meta->make_immutable;
     Bar->meta->make_mutable;
-
-    isnt( Foo->meta->immutable_transformer, Bar->meta->immutable_transformer,
-          'Foo and Bar should have different immutable transformer objects' );
 }
+
+done_testing;