Make all the generate_* methods in CMOP::Accessor private.

[gitmo/Class-MOP.git] / t / 003_methods.t

diff --git a/t/003_methods.t b/t/003_methods.t
index d21e7be..e518c36 100644 (file)
--- a/t/003_methods.t
+++ b/t/003_methods.t
@@ -1,21 +1,11 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 65;
 use Test::Exception;
 
 use Scalar::Util qw/reftype/;
-
-BEGIN {
-    if ( eval 'use Sub::Name (); 1;' ) {
-        plan tests => 65;
-    }
-    else {
-        plan skip_all => 'These tests require Sub::Name';
-    }
-}
+use Sub::Name;
 
 use Class::MOP;
 use Class::MOP::Class;
@@ -73,8 +63,8 @@ use Class::MOP::Method;
 
 my $Foo = Class::MOP::Class->initialize('Foo');
 
-ok(!$Foo->has_method('pie'), '... got the method stub pie');
-ok(!$Foo->has_method('cake'), '... got the constant method stub cake');
+ok($Foo->has_method('pie'), '... got the method stub pie');
+ok($Foo->has_method('cake'), '... got the constant method stub cake');
 
 my $foo = sub { 'Foo::foo' };
 
@@ -94,6 +84,7 @@ is($foo_method->package_name, 'Foo', '... got the right package name for the met
 ok($Foo->has_method('foo'), '... Foo->has_method(foo) (defined with Sub::Name)');
 
 is($Foo->get_method('foo')->body, $foo, '... Foo->get_method(foo) == \&foo');
+is($Foo->get_method('foo')->execute, 'Foo::foo', '... _method_foo->execute returns "Foo::foo"');
 is(Foo->foo(), 'Foo::foo', '... Foo->foo() returns "Foo::foo"');
 
 # now check all our other items ...
@@ -146,17 +137,6 @@ for my $method_name (qw/
     }
 }
 
-{
-    package Foo::Aliasing;
-    use metaclass;
-    sub alias_me { '...' }
-}
-
-$Foo->alias_method('alias_me' => Foo::Aliasing->meta->get_method('alias_me'));
-
-ok($Foo->has_method('alias_me'), '... Foo->has_method(alias_me) (aliased from Foo::Aliasing)');
-ok(defined &Foo::alias_me, '... Foo does have a symbol table slow for alias_me though');
-
 ok(!$Foo->has_method('blessed'), '... !Foo->has_method(blessed) (imported into Foo)');
 ok(!$Foo->has_method('boom'), '... !Foo->has_method(boom) (defined in main:: using symbol tables and Sub::Name w/out package name)');
 
@@ -165,7 +145,7 @@ is($Foo->get_method('not_a_real_method'), undef, '... Foo->get_method(not_a_real
 
 is_deeply(
     [ sort $Foo->get_method_list ],
-    [ qw(FOO_CONSTANT alias_me baaz bang bar baz blah evaled_foo floob foo) ],
+    [ qw(FOO_CONSTANT baaz bang bar baz blah cake evaled_foo floob foo pie) ],
     '... got the right method list for Foo');
 
 is_deeply(
@@ -173,26 +153,28 @@ is_deeply(
     [
         map { $Foo->get_method($_) } qw(
             FOO_CONSTANT
-            alias_me
             baaz            
             bang 
             bar 
             baz 
             blah 
+            cake
             evaled_foo 
             floob 
             foo
+            pie
         )
     ],
     '... got the right list of applicable methods for Foo');
 
 is($Foo->remove_method('foo')->body, $foo, '... removed the foo method');
 ok(!$Foo->has_method('foo'), '... !Foo->has_method(foo) we just removed it');
+ok(!$Foo->get_method_map->{foo}, 'foo is not in the method map');
 dies_ok { Foo->foo } '... cannot call Foo->foo because it is not there';
 
 is_deeply(
     [ sort $Foo->get_method_list ],
-    [ qw(FOO_CONSTANT alias_me baaz bang bar baz blah evaled_foo floob) ],
+    [ qw(FOO_CONSTANT baaz bang bar baz blah cake evaled_foo floob pie) ],
     '... got the right method list for Foo');
 
 
@@ -230,18 +212,19 @@ is_deeply(
     [ sort { $a->name cmp $b->name } $Bar->get_all_methods() ],
     [
         $Foo->get_method('FOO_CONSTANT'),
-        $Foo->get_method('alias_me'),
         $Foo->get_method('baaz'),
         $Foo->get_method('bang'),
         $Bar->get_method('bar'),
         (map { $Foo->get_method($_) } qw(        
             baz 
             blah 
+            cake
             evaled_foo 
             floob 
         )),
         $Bar->get_method('foo'),
         $Bar->get_method('meta'),
+        $Foo->get_method('pie'),
     ],
     '... got the right list of applicable methods for Bar');