Major refactoring of the immutabilization code. This greatly

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

diff --git a/t/073_make_mutable.t b/t/073_make_mutable.t
index dca59cd..1ad0c96 100644 (file)
--- a/t/073_make_mutable.t
+++ b/t/073_make_mutable.t
@@ -41,7 +41,10 @@ use Class::MOP;
 {
     my $meta = Baz->meta;
     is($meta->name, 'Baz', '... checking the Baz metaclass');
-    my @orig_keys = sort grep { !/^_/ } keys %$meta;
+    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');
@@ -49,7 +52,7 @@ use Class::MOP;
     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->get_immutable_transformer->inlined_constructor,
+    ok($meta->immutable_transformer->inlined_constructor,
        '... transformer says it did inline the constructor');
 
     lives_ok { $meta->make_mutable; }  '... changed Baz to be mutable';
@@ -58,11 +61,11 @@ use Class::MOP;
     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->get_immutable_transformer->inlined_constructor,
+    ok(!$meta->immutable_transformer->inlined_constructor,
        '... transformer says it did not inline the constructor');
 
-    my @new_keys = sort grep { !/^_/ } keys %$meta;
-    is_deeply(\@orig_keys, \@new_keys, '... no straneous hashkeys');
+    my %new_keys = map { $_ => 1 } grep { !/^_/ } keys %$meta;
+    is_deeply(\%orig_keys, \%new_keys, '... no extraneous hashkeys');
 
     isa_ok($meta, 'Class::MOP::Class', '... Baz->meta isa Class::MOP::Class');
 
@@ -132,7 +135,8 @@ use Class::MOP;
 
     ok(Baz->meta->is_immutable,  'Superclass is immutable');
     my $meta = Baz->meta->create_anon_class(superclasses => ['Baz']);
-    my @orig_keys  = sort grep { !/^_/ } keys %$meta;
+    my %orig_keys = map { $_ => 1 } grep { !/^_/ } keys %$meta;
+    $orig_keys{immutable_transformer} = 1;
     my @orig_meths = sort { $a->{name} cmp $b->{name} }
       $meta->compute_all_applicable_methods;
     ok($meta->is_anon_class,                  'We have an anon metaclass');
@@ -156,11 +160,11 @@ use Class::MOP;
     ok($meta->is_anon_class,          '... still marked as an anon class');
     my $instance = $meta->new_object;
 
-    my @new_keys  = sort grep { !/^_/ } keys %$meta;
+    my %new_keys  = map { $_ => 1 } grep { !/^_/ } keys %$meta;
     my @new_meths = sort { $a->{name} cmp $b->{name} }
       $meta->compute_all_applicable_methods;
-    is_deeply(\@orig_keys, \@new_keys, '... no straneous hashkeys');
-    is_deeply(\@orig_meths, \@new_meths, '... no straneous methods');
+    is_deeply(\%orig_keys, \%new_keys, '... no extraneous hashkeys');
+    is_deeply(\@orig_meths, \@new_meths, '... no extraneous methods');
 
     isa_ok($meta, 'Class::MOP::Class', '... Anon class isa Class::MOP::Class');
 
@@ -232,6 +236,6 @@ use Class::MOP;
     Bar->meta->make_immutable;
     Bar->meta->make_mutable;
 
-    isnt( Foo->meta->get_immutable_transformer, Bar->meta->get_immutable_transformer,
+    isnt( Foo->meta->immutable_transformer, Bar->meta->immutable_transformer,
           'Foo and Bar should have different immutable transformer objects' );
 }