X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F003_methods.t;h=a6ba53a89f8afd357ca20785260a5b53d1c61c31;hb=e97359e7b712496ad47de5a78c6c6a8c61587c37;hp=f1780342a9e0cdfd0ab6b3b9819830f3a83069ba;hpb=25a5f083d2d06a7823822e3a0c66baad3377d75b;p=gitmo%2FClass-MOP.git

diff --git a/t/003_methods.t b/t/003_methods.t
index f178034..a6ba53a 100644
--- a/t/003_methods.t
+++ b/t/003_methods.t
@@ -1,250 +1,279 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 67;
 use Test::Exception;
 
 use Scalar::Util qw/reftype/;
-
-BEGIN {
-    if ( eval 'use Sub::Name (); 1;' ) {
-        plan tests => 66;
-    }
-    else {
-        plan skip_all => 'These tests require Sub::Name';
-    }
-}
+use 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 :)
+{
+    # This package tries to test &has_method as exhaustively as
+    # possible. More corner cases are welcome :)
     package Foo;
-    
+
     # import a sub
-    use Scalar::Util 'blessed'; 
-    
+    use Scalar::Util 'blessed';
+
     sub pie;
     sub cake ();
 
     use constant FOO_CONSTANT => 'Foo-CONSTANT';
-    
+
     # define a sub in package
-    sub bar { 'Foo::bar' } 
+    sub bar {'Foo::bar'}
     *baz = \&bar;
-    
+
     # create something with the typeglob inside the package
-    *baaz = sub { 'Foo::baaz' };    
+    *baaz = sub {'Foo::baaz'};
 
-    { # method named with Sub::Name inside the package scope
+    {    # method named with Sub::Name inside the package scope
         no strict 'refs';
-        *{'Foo::floob'} = Sub::Name::subname 'floob' => sub { '!floob!' }; 
+        *{'Foo::floob'} = Sub::Name::subname 'floob' => sub {'!floob!'};
     }
 
     # We hateses the "used only once" warnings
-    { 
+    {
         my $temp1 = \&Foo::baz;
-        my $temp2 = \&Foo::baaz;    
+        my $temp2 = \&Foo::baaz;
     }
-    
+
     package OinkyBoinky;
     our @ISA = "Foo";
-    
-    sub elk { 'OinkyBoinky::elk' }
+
+    sub elk {'OinkyBoinky::elk'}
 
     package main;
-    
+
     sub Foo::blah { $_[0]->Foo::baz() }
-    
+
     {
         no strict 'refs';
-        *{'Foo::bling'} = sub { '$$Bling$$' };
-        *{'Foo::bang'} = Sub::Name::subname 'Foo::bang' => sub { '!BANG!' }; 
-        *{'Foo::boom'} = Sub::Name::subname 'boom' => sub { '!BOOM!' };     
-        
-        eval "package Foo; sub evaled_foo { 'Foo::evaled_foo' }";           
+        *{'Foo::bling'} = sub {'$$Bling$$'};
+        *{'Foo::bang'} = Sub::Name::subname 'Foo::bang' => sub {'!BANG!'};
+        *{'Foo::boom'} = Sub::Name::subname 'boom'      => sub {'!BOOM!'};
+
+        eval "package Foo; sub evaled_foo { 'Foo::evaled_foo' }";
     }
 }
 
 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' };
+my $foo = sub {'Foo::foo'};
 
-ok(!UNIVERSAL::isa($foo, 'Class::MOP::Method'), '... our method is not yet blessed');
+ok( !UNIVERSAL::isa( $foo, 'Class::MOP::Method' ),
+    '... our method is not yet blessed' );
 
 lives_ok {
-    $Foo->add_method('foo' => $foo);
-} '... we added the method successfully';
+    $Foo->add_method( 'foo' => $foo );
+}
+'... we added the method successfully';
 
 my $foo_method = $Foo->get_method('foo');
 
-isa_ok($foo_method, 'Class::MOP::Method');
+isa_ok( $foo_method, 'Class::MOP::Method' );
 
-is($foo_method->name, 'foo', '... got the right name for the method');
-is($foo_method->package_name, 'Foo', '... got the right package name for the method');
+is( $foo_method->name, 'foo', '... got the right name for the method' );
+is( $foo_method->package_name, 'Foo',
+    '... got the right package name for the method' );
 
-ok($Foo->has_method('foo'), '... Foo->has_method(foo) (defined with Sub::Name)');
+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"');
+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'), '... 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('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)');
-ok($Foo->has_method('baaz'), '... Foo->has_method(baaz) (typeglob aliased within Foo)');
-ok($Foo->has_method('floob'), '... Foo->has_method(floob) (defined in Foo:: using symbol tables and Sub::Name w/out package name)');
-ok($Foo->has_method('blah'), '... Foo->has_method(blah) (defined in main:: using fully qualified package name)');
-ok($Foo->has_method('bang'), '... Foo->has_method(bang) (defined in main:: using symbol tables and Sub::Name)');
-ok($Foo->has_method('evaled_foo'), '... Foo->has_method(evaled_foo) (evaled in main::)');
+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)' );
+ok( $Foo->has_method('baaz'),
+    '... Foo->has_method(baaz) (typeglob aliased within Foo)' );
+ok( $Foo->has_method('floob'),
+    '... Foo->has_method(floob) (defined in Foo:: using symbol tables and Sub::Name w/out package name)'
+);
+ok( $Foo->has_method('blah'),
+    '... Foo->has_method(blah) (defined in main:: using fully qualified package name)'
+);
+ok( $Foo->has_method('bang'),
+    '... Foo->has_method(bang) (defined in main:: using symbol tables and Sub::Name)'
+);
+ok( $Foo->has_method('evaled_foo'),
+    '... Foo->has_method(evaled_foo) (evaled in main::)' );
 
 my $OinkyBoinky = Class::MOP::Class->initialize('OinkyBoinky');
 
-ok($OinkyBoinky->has_method('elk'), "the method 'elk' is defined in OinkyBoinky");
+ok( $OinkyBoinky->has_method('elk'),
+    "the method 'elk' is defined in OinkyBoinky" );
 
-ok(!$OinkyBoinky->has_method('bar'), "the method 'bar' is not defined in OinkyBoinky");
+ok( !$OinkyBoinky->has_method('bar'),
+    "the method 'bar' is not defined in OinkyBoinky" );
 
-ok(my $bar = $OinkyBoinky->find_method_by_name('bar'), "but if you look in the inheritence chain then 'bar' does exist");
-
-is( reftype($bar->body), "CODE", "the returned value is a code ref" );
+ok( my $bar = $OinkyBoinky->find_method_by_name('bar'),
+    "but if you look in the inheritence chain then 'bar' does exist" );
 
+is( reftype( $bar->body ), "CODE", "the returned value is a code ref" );
 
 # calling get_method blessed them all
-for my $method_name (qw/baaz
-                        bar
-                    	baz
-                    	floob
-                    	blah
-                    	bang
-                    	evaled_foo
-                    	FOO_CONSTANT/) {
-    isa_ok($Foo->get_method($method_name), 'Class::MOP::Method');
+for my $method_name (
+    qw/baaz
+    bar
+    baz
+    floob
+    blah
+    bang
+    evaled_foo
+    FOO_CONSTANT/
+    ) {
+    isa_ok( $Foo->get_method($method_name), 'Class::MOP::Method' );
     {
         no strict 'refs';
-        is($Foo->get_method($method_name)->body, \&{'Foo::' . $method_name}, '... body matches CODE ref in package for ' . $method_name);
+        is( $Foo->get_method($method_name)->body,
+            \&{ 'Foo::' . $method_name },
+            '... body matches CODE ref in package for ' . $method_name );
     }
 }
 
-for my $method_name (qw/
-                    bling
-                    /) {
-    is(ref($Foo->get_package_symbol('&' . $method_name)), 'CODE', '... got the __ANON__ methods');
+for my $method_name (
+    qw/
+    bling
+    /
+    ) {
+    is( ref( $Foo->get_package_symbol( '&' . $method_name ) ), 'CODE',
+        '... got the __ANON__ methods' );
     {
         no strict 'refs';
-        is($Foo->get_package_symbol('&' . $method_name), \&{'Foo::' . $method_name}, '... symbol matches CODE ref in package for ' . $method_name);
+        is( $Foo->get_package_symbol( '&' . $method_name ),
+            \&{ 'Foo::' . $method_name },
+            '... symbol matches CODE ref in package for ' . $method_name );
     }
 }
 
-{
-    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)');
+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)'
+);
 
-ok(!$Foo->has_method('not_a_real_method'), '... !Foo->has_method(not_a_real_method) (does not exist)');
-is($Foo->get_method('not_a_real_method'), undef, '... Foo->get_method(not_a_real_method) == undef');
+ok( !$Foo->has_method('not_a_real_method'),
+    '... !Foo->has_method(not_a_real_method) (does not exist)' );
+is( $Foo->get_method('not_a_real_method'), undef,
+    '... Foo->get_method(not_a_real_method) == undef' );
 
 is_deeply(
     [ sort $Foo->get_method_list ],
-    [ qw(FOO_CONSTANT alias_me baaz bang bar baz blah evaled_foo floob foo) ],
-    '... got the right method list for Foo');
+    [qw(FOO_CONSTANT 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->get_all_methods() ],
     [
-        map { $Foo->get_method($_) } qw(
+        map { $Foo->get_method($_) }
+            qw(
             FOO_CONSTANT
-            alias_me
-            baaz            
-            bang 
-            bar 
-            baz 
-            blah 
-            evaled_foo 
-            floob 
+            baaz
+            bang
+            bar
+            baz
+            blah
+            cake
+            evaled_foo
+            floob
             foo
-        )
+            pie
+            )
     ],
-    '... got the right list of applicable methods for Foo');
+    '... 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');
+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) ],
-    '... got the right method list for Foo');
-
+    [qw(FOO_CONSTANT baaz bang bar baz blah cake evaled_foo floob pie)],
+    '... got the right method list for Foo'
+);
 
-# ... test our class creator 
+# ... test our class creator
 
 my $Bar = Class::MOP::Class->create(
     package      => 'Bar',
-    superclasses => [ 'Foo' ],
+    superclasses => ['Foo'],
     methods      => {
-        foo => sub { 'Bar::foo' },
-        bar => sub { 'Bar::bar' },                    
+        foo => sub {'Bar::foo'},
+        bar => sub {'Bar::bar'},
     }
 );
-isa_ok($Bar, 'Class::MOP::Class');
+isa_ok( $Bar, 'Class::MOP::Class' );
 
-ok($Bar->has_method('foo'), '... Bar->has_method(foo)');
-ok($Bar->has_method('bar'), '... Bar->has_method(bar)');
+ok( $Bar->has_method('foo'), '... Bar->has_method(foo)' );
+ok( $Bar->has_method('bar'), '... Bar->has_method(bar)' );
 
-is(Bar->foo, 'Bar::foo', '... Bar->foo == Bar::foo');
-is(Bar->bar, 'Bar::bar', '... Bar->bar == Bar::bar');
+is( Bar->foo, 'Bar::foo', '... Bar->foo == Bar::foo' );
+is( Bar->bar, 'Bar::bar', '... Bar->bar == Bar::bar' );
 
 lives_ok {
-    $Bar->add_method('foo' => sub { 'Bar::foo v2' });
-} '... overwriting a method is fine';
+    $Bar->add_method( 'foo' => sub {'Bar::foo v2'} );
+}
+'... overwriting a method is fine';
+
+is_deeply( [ Class::MOP::get_code_info( $Bar->get_method('foo')->body ) ],
+    [ "Bar", "foo" ], "subname applied to anonymous method" );
 
-ok($Bar->has_method('foo'), '... Bar-> (still) has_method(foo)');
-is(Bar->foo, 'Bar::foo v2', '... Bar->foo == "Bar::foo v2"');
+ok( $Bar->has_method('foo'), '... Bar-> (still) has_method(foo)' );
+is( Bar->foo, 'Bar::foo v2', '... Bar->foo == "Bar::foo v2"' );
 
 is_deeply(
     [ sort $Bar->get_method_list ],
-    [ qw(bar foo meta) ],
-    '... got the right method list for Bar');  
-    
+    [qw(bar foo meta)],
+    '... got the right method list for Bar'
+);
+
 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 
-            evaled_foo 
-            floob 
-        )),
+        (
+            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');
+    '... got the right list of applicable methods for Bar'
+);
 
 my $method = Class::MOP::Method->wrap(
     name         => 'objecty',
@@ -256,5 +285,52 @@ 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' );
+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' )
+        or diag $new_method->dump;
+
+{
+    package CustomAccessor;
+
+    use Class::MOP;
+
+    my $meta = Class::MOP::Class->initialize(__PACKAGE__);
+
+    $meta->add_attribute(
+        foo => (
+            accessor => 'foo',
+        )
+    );
+
+    {
+        no warnings 'redefine', 'once';
+        *foo = sub {
+            my $self = shift;
+            $self->{custom_store} = $_[0];
+        };
+    }
+
+    $meta->add_around_method_modifier(
+        'foo',
+        sub {
+            my $orig = shift;
+            $orig->(@_);
+        }
+    );
+
+    $meta->add_method( 'new', sub { return bless {}, shift } );
+}
+
+{
+    my $o   = CustomAccessor->new;
+    my $str = 'string';
+
+    $o->foo($str);
+
+    is(
+        $o->{custom_store}, $str,
+        'Custom glob-assignment-created accessor is still method modifier is added'
+    );
+}