X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F073_make_mutable.t;h=4070b5c5082b06fa8cdf92526421b34fc16a1b1f;hb=8371f3de4e9525ab751008dca4a89e6df65345a6;hp=1cc9311bddfbfbd66853c3aca17775b9a9f7b7f0;hpb=c1809cb18c9ffb1f6fbb152bf546aca88647172b;p=gitmo%2FClass-MOP.git

diff --git a/t/073_make_mutable.t b/t/073_make_mutable.t
index 1cc9311..4070b5c 100644
--- a/t/073_make_mutable.t
+++ b/t/073_make_mutable.t
@@ -1,9 +1,7 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More tests => 113;
+use Test::More;
 use Test::Exception;
 
 use Scalar::Util;
@@ -43,41 +41,33 @@ 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.
 
     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->get_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->get_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 = 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');
 
     ok( $meta->add_method('xyz', sub{'xxx'}), '... added method');
     is( Baz->xyz, 'xxx',                      '... method xyz works');
 
-    ok(! $meta->has_method('zxy')             ,'...  we dont have the aliased method yet');    
-    ok( $meta->alias_method('zxy',sub{'xxx'}),'... aliased method');
-    ok( $meta->has_method('zxy')             ,'...  the aliased method does register');    
-    is( Baz->zxy, 'xxx',                      '... method zxy works');
-    ok( $meta->remove_method('xyz'),          '... removed method');
-    ok( $meta->remove_method('zxy'),          '... removed aliased method');
-
     ok($meta->add_attribute('fickle', accessor => 'fickle'), '... added attribute');
     ok(Baz->can('fickle'),                '... Baz can fickle');
     ok($meta->remove_attribute('fickle'), '... removed attribute');
@@ -95,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');
 }
 
 {
@@ -110,8 +100,6 @@ use Class::MOP;
     lives_ok { $meta->make_immutable() } '... changed Baz to be immutable';
 
     dies_ok{ $meta->add_method('xyz', sub{'xxx'})  } '... exception thrown as expected';
-    dies_ok{ $meta->alias_method('zxy',sub{'xxx'}) } '... exception thrown as expected';
-    dies_ok{ $meta->remove_method('zxy')           } '... exception thrown as expected';
 
     dies_ok {
       $meta->add_attribute('fickle', accessor => 'fickle')
@@ -126,17 +114,16 @@ 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 );
 }
 
 {
 
     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_meths = sort { $a->{name} cmp $b->{name} }
-      $meta->compute_all_applicable_methods;
+    my %orig_keys = map { $_ => 1 } grep { !/^_/ } keys %$meta;
+    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');
@@ -158,20 +145,17 @@ 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_meths = sort { $a->{name} cmp $b->{name} }
-      $meta->compute_all_applicable_methods;
-    is_deeply(\@orig_keys, \@new_keys, '... no straneous hashkeys');
+    my %new_keys  = map { $_ => 1 } grep { !/^_/ } keys %$meta;
+    my @new_meths = sort { $a->name cmp $b->name }
+      $meta->get_all_methods;
+    is_deeply(\%orig_keys, \%new_keys, '... no extraneous hashkeys');
     is_deeply(\@orig_meths, \@new_meths, '... no straneous methods');
 
     isa_ok($meta, 'Class::MOP::Class', '... Anon class isa Class::MOP::Class');
 
     ok( $meta->add_method('xyz', sub{'xxx'}), '... added method');
     is( $instance->xyz , 'xxx',               '... method xyz works');
-    ok( $meta->alias_method('zxy',sub{'xxx'}),'... aliased method');
-    is( $instance->zxy, 'xxx',                '... method zxy works');
     ok( $meta->remove_method('xyz'),          '... removed method');
-    ok( $meta->remove_method('zxy'),          '... removed aliased method');
 
     ok($meta->add_attribute('fickle', accessor => 'fickle'), '... added attribute');
     ok($instance->can('fickle'),          '... instance can fickle');
@@ -190,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 );
 };
 
 
@@ -209,8 +193,6 @@ use Class::MOP;
     lives_ok {$meta->make_immutable  } '... changed class to be immutable';
 
     dies_ok{ $meta->add_method('xyz', sub{'xxx'})  } '... exception thrown as expected';
-    dies_ok{ $meta->alias_method('zxy',sub{'xxx'}) } '... exception thrown as expected';
-    dies_ok{ $meta->remove_method('zxy')           } '... exception thrown as expected';
 
     dies_ok {
       $meta->add_attribute('fickle', accessor => 'fickle')
@@ -225,6 +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;
+}
+
+done_testing;