X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F003_methods.t;h=6b39b0ac1d228d123b5c5b78280e65fe29d534ce;hb=729fd9ba69ec6f9150504b4c24c46365fba7cdf4;hp=54062658d2e63f867d9790fecbc76b063e570cd1;hpb=ed33de10b6c31d157e5118006489af94bef54bbf;p=gitmo%2FClass-MOP.git

diff --git a/t/003_methods.t b/t/003_methods.t
index 5406265..6b39b0a 100644
--- a/t/003_methods.t
+++ b/t/003_methods.t
@@ -3,12 +3,21 @@
 use strict;
 use warnings;
 
-use Test::More tests => 66;
+use Test::More;
 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';
+    }
+}
+
+BEGIN {
     use_ok('Class::MOP');   
     use_ok('Class::MOP::Class');        
 }
@@ -29,6 +38,9 @@ BEGIN {
     # define a sub in package
     sub bar { 'Foo::bar' } 
     *baz = \&bar;
+    
+    # create something with the typeglob inside the package
+    *baaz = sub { 'Foo::baaz' };    
 
     { # method named with Sub::Name inside the package scope
         no strict 'refs';
@@ -36,7 +48,10 @@ BEGIN {
     }
 
     # We hateses the "used only once" warnings
-    { my $temp = \&Foo::baz }
+    { 
+        my $temp1 = \&Foo::baz;
+        my $temp2 = \&Foo::baaz;    
+    }
     
     package OinkyBoinky;
     our @ISA = "Foo";
@@ -84,27 +99,14 @@ is(Foo->foo(), 'Foo::foo', '... Foo->foo() returns "Foo::foo"');
 
 # now check all our other items ...
 
-if ($Foo->has_method('FOO_CONSTANT')) {
-    pass('... Foo->has_method(FOO_CONSTANT) (defined w/ use constant)');
-}
-else {
-    diag(q{
-        FIXME:
-        You are using bleadperl or 5.9.5 which handles constants 
-        in a differnt way then prior versions of perl. This will
-        cause this test to break, but the test it not critical 
-        to the operation of this module, so I am letting pass 
-        with a big FIXME note until I have the tuits to install
-        5.9.5 and fix it. 
-        
-        Of course, patches are *always* welcome :) });    
-    pass('... FIXME: Foo->has_method(FOO_CONSTANT) (defined w/ use constant)');    
-}
+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('bling'), '... Foo->has_method(bling) (defined in main:: using symbol tables (no Sub::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::)');
 
@@ -120,14 +122,14 @@ is( reftype($bar->body), "CODE", "the returned value is a code ref" );
 
 
 # calling get_method blessed them all
-for my $method_name (qw/FOO_CONSTANT
-                    	bar
+for my $method_name (qw/baaz
+                        bar
                     	baz
                     	floob
-                    	blah		
-                    	bling
-                    	bang	
-                    	evaled_foo/) {
+                    	blah
+                    	bang
+                    	evaled_foo
+                    	FOO_CONSTANT/) {
     isa_ok($Foo->get_method($method_name), 'Class::MOP::Method');
     {
         no strict 'refs';
@@ -135,6 +137,16 @@ for my $method_name (qw/FOO_CONSTANT
     }
 }
 
+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);
+    }
+}
+
 {
     package Foo::Aliasing;
     use metaclass;
@@ -154,25 +166,19 @@ 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 bang bar baz blah bling evaled_foo floob foo) ],
+    [ qw(FOO_CONSTANT baaz bang bar baz blah evaled_foo floob foo) ],
     '... 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
+            baaz            
             bang 
             bar 
             baz 
             blah 
-            bling 
             evaled_foo 
             floob 
             foo
@@ -186,28 +192,20 @@ dies_ok { Foo->foo } '... cannot call Foo->foo because it is not there';
 
 is_deeply(
     [ sort $Foo->get_method_list ],
-    [ qw(FOO_CONSTANT bang bar baz blah bling evaled_foo floob) ],
+    [ qw(FOO_CONSTANT baaz bang bar baz blah evaled_foo floob) ],
     '... got the right method list for Foo');
 
-ok($Foo->remove_method('FOO_CONSTANT'), '... removed the FOO_CONSTANT method');
-ok(!$Foo->has_method('FOO_CONSTANT'), '... !Foo->has_method(FOO_CONSTANT) we just removed it');
-dies_ok { Foo->FOO_CONSTANT } '... cannot call Foo->FOO_CONSTANT because it is not there';
-
-is_deeply(
-    [ sort $Foo->get_method_list ],
-    [ qw(bang bar baz blah bling 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)');
@@ -229,41 +227,20 @@ 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  => '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('baaz'),
+        $Foo->get_method('bang'),
+        $Bar->get_method('bar'),
+        (map { $Foo->get_method($_) } qw(        
             baz 
             blah 
-            bling 
             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'),
     ],
     '... got the right list of applicable methods for Bar');