Update changes for release

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

diff --git a/t/003_methods.t b/t/003_methods.t
index 0946d49..519ed7c 100644 (file)
--- a/t/003_methods.t
+++ b/t/003_methods.t
@@ -1,18 +1,24 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More tests => 66;
+use Test::More;
 use Test::Exception;
 
 use Scalar::Util qw/reftype/;
 
 BEGIN {
-    use_ok('Class::MOP');   
-    use_ok('Class::MOP::Class');        
+    if ( eval 'use Sub::Name (); 1;' ) {
+        plan tests => 66;
+    }
+    else {
+        plan skip_all => 'These tests require Sub::Name';
+    }
 }
 
+use Class::MOP;
+use Class::MOP::Class;
+use Class::MOP::Method;
+
 {   # This package tries to test &has_method 
     # as exhaustively as possible. More corner
     # cases are welcome :)
@@ -65,8 +71,8 @@ BEGIN {
 
 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' };
 
@@ -86,12 +92,13 @@ 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 ...
 
-ok(!$Foo->has_method('FOO_CONSTANT'), '... Foo->has_method(FOO_CONSTANT) (defined w/ use constant)');
-ok(!$Foo->has_method('bling'), '... Foo->has_method(bling) (defined in main:: using symbol tables (no Sub::Name))');
+ok($Foo->has_method('FOO_CONSTANT'), '... not Foo->has_method(FOO_CONSTANT) (defined w/ use constant)');
+ok(!$Foo->has_method('bling'), '... not Foo->has_method(bling) (defined in main:: using symbol tables (no Sub::Name))');
 
 ok($Foo->has_method('bar'), '... Foo->has_method(bar) (defined in Foo)');
 ok($Foo->has_method('baz'), '... Foo->has_method(baz) (typeglob aliased within Foo)');
@@ -119,7 +126,8 @@ for my $method_name (qw/baaz
                        floob
                        blah
                        bang
-                       evaled_foo/) {
+                       evaled_foo
+                       FOO_CONSTANT/) {
     isa_ok($Foo->get_method($method_name), 'Class::MOP::Method');
     {
         no strict 'refs';
@@ -128,7 +136,6 @@ for my $method_name (qw/baaz
 }
 
 for my $method_name (qw/
-                    FOO_CONSTANT
                     bling
                     /) {
     is(ref($Foo->get_package_symbol('&' . $method_name)), 'CODE', '... got the __ANON__ methods');
@@ -146,7 +153,7 @@ for my $method_name (qw/
 
 $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($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)');
@@ -157,27 +164,25 @@ is($Foo->get_method('not_a_real_method'), undef, '... Foo->get_method(not_a_real
 
 is_deeply(
     [ sort $Foo->get_method_list ],
-    [ qw(baaz bang bar baz blah evaled_foo floob foo) ],
+    [ qw(FOO_CONSTANT alias_me baaz bang bar baz blah cake evaled_foo floob foo pie) ],
     '... got the right method list for Foo');
 
 is_deeply(
-    [ sort { $a->{name} cmp $b->{name} } $Foo->compute_all_applicable_methods() ],
+    [ sort { $a->name cmp $b->name } $Foo->get_all_methods() ],
     [
-        map {
-            {
-            name  => $_,
-            class => 'Foo',
-            code  => $Foo->get_method($_)
-            }
-        } qw(
+        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');
@@ -188,24 +193,20 @@ dies_ok { Foo->foo } '... cannot call Foo->foo because it is not there';
 
 is_deeply(
     [ sort $Foo->get_method_list ],
-    [ qw(baaz bang bar baz blah evaled_foo floob) ],
+    [ qw(FOO_CONSTANT alias_me baaz bang bar baz blah cake evaled_foo floob pie) ],
     '... got the right method list for Foo');
 
-is_deeply(
-    [ sort $Foo->get_method_list ],
-    [ qw(baaz bang bar baz blah evaled_foo floob) ],
-    '... got the right method list for Foo');
 
 # ... test our class creator 
 
 my $Bar = Class::MOP::Class->create(
-            'Bar' => (
-                superclasses => [ 'Foo' ],
-                methods => {
-                    foo => sub { 'Bar::foo' },
-                    bar => sub { 'Bar::bar' },                    
-                }
-            ));
+    package      => 'Bar',
+    superclasses => [ 'Foo' ],
+    methods      => {
+        foo => sub { 'Bar::foo' },
+        bar => sub { 'Bar::bar' },                    
+    }
+);
 isa_ok($Bar, 'Class::MOP::Class');
 
 ok($Bar->has_method('foo'), '... Bar->has_method(foo)');
@@ -227,46 +228,35 @@ is_deeply(
     '... got the right method list for Bar');  
     
 is_deeply(
-    [ sort { $a->{name} cmp $b->{name} } $Bar->compute_all_applicable_methods() ],
+    [ sort { $a->name cmp $b->name } $Bar->get_all_methods() ],
     [
-        {
-            name  => 'baaz',
-            class => 'Foo',
-            code  => $Foo->get_method('baaz')
-        },
-        {
-            name  => 'bang',
-            class => 'Foo',
-            code  => $Foo->get_method('bang')
-        },
-        {
-            name  => 'bar',
-            class => 'Bar',
-            code  => $Bar->get_method('bar') 
-        },
-        (map {
-            {
-                name  => $_,
-                class => 'Foo',
-                code  => $Foo->get_method($_)
-            }
-        } qw(        
+        $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 
         )),
-        {
-            name  => 'foo',
-            class => 'Bar',
-            code  => $Bar->get_method('foo')
-        },        
-        {
-            name  => 'meta',
-            class => 'Bar',
-            code  => $Bar->get_method('meta')
-        }        
+        $Bar->get_method('foo'),
+        $Bar->get_method('meta'),
+        $Foo->get_method('pie'),
     ],
     '... got the right list of applicable methods for Bar');
 
+my $method = Class::MOP::Method->wrap(
+    name         => 'objecty',
+    package_name => 'Whatever',
+    body         => sub {q{I am an object, and I feel an object's pain}},
+);
+
+Bar->meta->add_method( $method->name, $method );
+
+my $new_method = Bar->meta->get_method('objecty');
 
+isnt( $method, $new_method, 'add_method clones method objects as they are added' );
+is( $new_method->original_method, $method, '... the cloned method has the correct original method' );