X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F030_method.t;h=f70df12c7f4bdaa824b29c2949a6e3af472945b4;hb=46fccbab1ce2ee3a115b69e05a383f42dbf78890;hp=4987909d4ea0ebbdd1cde764cbaff85d795d032b;hpb=643f2f94ab780ca0c247cd36a88b13cc51d5c0fc;p=gitmo%2FClass-MOP.git

diff --git a/t/030_method.t b/t/030_method.t
index 4987909..f70df12 100644
--- a/t/030_method.t
+++ b/t/030_method.t
@@ -1,98 +1,149 @@
 use strict;
 use warnings;
 
-use Test::More tests => 46;
-use Test::Exception;
+use Test::More;
+use Test::Fatal;
 
 use Class::MOP;
 use Class::MOP::Method;
 
-
 my $method = Class::MOP::Method->wrap(
-    sub { 1 },
+    sub {1},
     package_name => 'main',
     name         => '__ANON__',
 );
-is($method->meta, Class::MOP::Method->meta, '... instance and class both lead to the same meta');
-
-is($method->package_name, 'main', '... our package is main::');
-is($method->name, '__ANON__', '... our sub name is __ANON__');
-is($method->fully_qualified_name, 'main::__ANON__', '... our subs full name is main::__ANON__');
-is($method->original_method, undef, '... no original_method ');
-is($method->original_package_name, 'main', '... the original_package_name is the same as package_name');
-is($method->original_name, '__ANON__', '... the original_name is the same as name');
-is($method->original_fully_qualified_name, 'main::__ANON__', '... the original_fully_qualified_name is the same as fully_qualified_name');
+is( $method->meta, Class::MOP::Method->meta,
+    '... instance and class both lead to the same meta' );
+
+is( $method->package_name, 'main',     '... our package is main::' );
+is( $method->name,         '__ANON__', '... our sub name is __ANON__' );
+is( $method->fully_qualified_name, 'main::__ANON__',
+    '... our subs full name is main::__ANON__' );
+is( $method->original_method, undef, '... no original_method ' );
+is( $method->original_package_name, 'main',
+    '... the original_package_name is the same as package_name' );
+is( $method->original_name, '__ANON__',
+    '... the original_name is the same as name' );
+is( $method->original_fully_qualified_name, 'main::__ANON__',
+    '... the original_fully_qualified_name is the same as fully_qualified_name'
+);
 
-dies_ok { Class::MOP::Method->wrap } q{... can't call wrap() without some code};
-dies_ok { Class::MOP::Method->wrap([]) } q{... can't call wrap() without some code};
-dies_ok { Class::MOP::Method->wrap(bless {} => 'Fail') } q{... can't call wrap() without some code};
+isnt( exception { Class::MOP::Method->wrap }, undef, q{... can't call wrap() without some code} );
+isnt( exception { Class::MOP::Method->wrap( [] ) }, undef, q{... can't call wrap() without some code} );
+isnt( exception { Class::MOP::Method->wrap( bless {} => 'Fail' ) }, undef, q{... can't call wrap() without some code} );
 
-dies_ok { Class::MOP::Method->name } q{... can't call name() as a class method};
-dies_ok { Class::MOP::Method->body } q{... can't call body() as a class method};
-dies_ok { Class::MOP::Method->package_name } q{... can't call package_name() as a class method};
-dies_ok { Class::MOP::Method->fully_qualified_name } q{... can't call fully_qualified_name() as a class method};
+isnt( exception { Class::MOP::Method->name }, undef, q{... can't call name() as a class method} );
+isnt( exception { Class::MOP::Method->body }, undef, q{... can't call body() as a class method} );
+isnt( exception { Class::MOP::Method->package_name }, undef, q{... can't call package_name() as a class method} );
+isnt( exception { Class::MOP::Method->fully_qualified_name }, undef, q{... can't call fully_qualified_name() as a class method} );
 
 my $meta = Class::MOP::Method->meta;
-isa_ok($meta, 'Class::MOP::Class');
+isa_ok( $meta, 'Class::MOP::Class' );
 
-foreach my $method_name (qw(
+foreach my $method_name (
+    qw(
     wrap
-	package_name
-	name
-    )) {
-    ok($meta->has_method($method_name), '... Class::MOP::Method->has_method(' . $method_name . ')');
-	my $method = $meta->get_method($method_name);
-	is($method->package_name, 'Class::MOP::Method', '... our package is Class::MOP::Method');
-	is($method->name, $method_name, '... our sub name is "' . $method_name . '"');	
+    package_name
+    name
+    )
+    ) {
+    ok( $meta->has_method($method_name),
+        '... Class::MOP::Method->has_method(' . $method_name . ')' );
+    my $method = $meta->get_method($method_name);
+    is( $method->package_name, 'Class::MOP::Method',
+        '... our package is Class::MOP::Method' );
+    is( $method->name, $method_name,
+        '... our sub name is "' . $method_name . '"' );
 }
 
-dies_ok {
-    Class::MOP::Method->wrap()
-} '... bad args for &wrap';
+isnt( exception {
+    Class::MOP::Method->wrap();
+}, undef, '... bad args for &wrap' );
+
+isnt( exception {
+    Class::MOP::Method->wrap('Fail');
+}, undef, '... bad args for &wrap' );
 
-dies_ok {
-    Class::MOP::Method->wrap('Fail')
-} '... bad args for &wrap';
+isnt( exception {
+    Class::MOP::Method->wrap( [] );
+}, undef, '... bad args for &wrap' );
 
-dies_ok {
-    Class::MOP::Method->wrap([])
-} '... bad args for &wrap';
+isnt( exception {
+    Class::MOP::Method->wrap( sub {'FAIL'} );
+}, undef, '... bad args for &wrap' );
 
-dies_ok {
-    Class::MOP::Method->wrap(sub { 'FAIL' })
-} '... bad args for &wrap';
+isnt( exception {
+    Class::MOP::Method->wrap( sub {'FAIL'}, package_name => 'main' );
+}, undef, '... bad args for &wrap' );
 
-dies_ok {
-    Class::MOP::Method->wrap(sub { 'FAIL' }, package_name => 'main')
-} '... bad args for &wrap';
+isnt( exception {
+    Class::MOP::Method->wrap( sub {'FAIL'}, name => '__ANON__' );
+}, undef, '... bad args for &wrap' );
 
-dies_ok {
-    Class::MOP::Method->wrap(sub { 'FAIL' }, name => '__ANON__')
-} '... bad args for &wrap';
+is( exception {
+    Class::MOP::Method->wrap( bless( sub {'FAIL'}, "Foo" ),
+        name => '__ANON__', package_name => 'Foo::Bar' );
+}, undef, '... blessed coderef to &wrap' );
 
 my $clone = $method->clone(
     package_name => 'NewPackage',
     name         => 'new_name',
 );
 
-isa_ok($clone, 'Class::MOP::Method');
-is($clone->package_name, 'NewPackage', '... cloned method has new package name');
-is($clone->name, 'new_name', '... cloned method has new sub name');
-is($clone->fully_qualified_name, 'NewPackage::new_name', '... cloned method has new fq name');
-is($clone->original_method, $method, '... cloned method has correct original_method');
-is($clone->original_package_name, 'main', '... cloned method has correct original_package_name');
-is($clone->original_name, '__ANON__', '... cloned method has correct original_name');
-is($clone->original_fully_qualified_name, 'main::__ANON__', '... cloned method has correct original_fully_qualified_name');
+isa_ok( $clone, 'Class::MOP::Method' );
+is( $clone->package_name, 'NewPackage',
+    '... cloned method has new package name' );
+is( $clone->name, 'new_name', '... cloned method has new sub name' );
+is( $clone->fully_qualified_name, 'NewPackage::new_name',
+    '... cloned method has new fq name' );
+is( $clone->original_method, $method,
+    '... cloned method has correct original_method' );
+is( $clone->original_package_name, 'main',
+    '... cloned method has correct original_package_name' );
+is( $clone->original_name, '__ANON__',
+    '... cloned method has correct original_name' );
+is( $clone->original_fully_qualified_name, 'main::__ANON__',
+    '... cloned method has correct original_fully_qualified_name' );
 
 my $clone2 = $clone->clone(
     package_name => 'NewerPackage',
     name         => 'newer_name',
 );
 
-is($clone2->package_name, 'NewerPackage', '... clone of clone has new package name');
-is($clone2->name, 'newer_name', '... clone of clone has new sub name');
-is($clone2->fully_qualified_name, 'NewerPackage::newer_name', '... clone of clone new fq name');
-is($clone2->original_method, $clone, '... cloned method has correct original_method');
-is($clone2->original_package_name, 'main', '... original_package_name follows clone chain');
-is($clone2->original_name, '__ANON__', '... original_name follows clone chain');
-is($clone2->original_fully_qualified_name, 'main::__ANON__', '... original_fully_qualified_name follows clone chain');
+is( $clone2->package_name, 'NewerPackage',
+    '... clone of clone has new package name' );
+is( $clone2->name, 'newer_name', '... clone of clone has new sub name' );
+is( $clone2->fully_qualified_name, 'NewerPackage::newer_name',
+    '... clone of clone new fq name' );
+is( $clone2->original_method, $clone,
+    '... cloned method has correct original_method' );
+is( $clone2->original_package_name, 'main',
+    '... original_package_name follows clone chain' );
+is( $clone2->original_name, '__ANON__',
+    '... original_name follows clone chain' );
+is( $clone2->original_fully_qualified_name, 'main::__ANON__',
+    '... original_fully_qualified_name follows clone chain' );
+
+Class::MOP::Class->create(
+    'Method::Subclass',
+    superclasses => ['Class::MOP::Method'],
+    attributes   => [
+        Class::MOP::Attribute->new(
+            foo => (
+                accessor => 'foo',
+            )
+        ),
+    ],
+);
+
+my $wrapped = Method::Subclass->wrap($method, foo => 'bar');
+isa_ok($wrapped, 'Method::Subclass');
+isa_ok($wrapped, 'Class::MOP::Method');
+is($wrapped->foo, 'bar', 'attribute set properly');
+is($wrapped->package_name, 'main', 'package_name copied properly');
+is($wrapped->name, '__ANON__', 'method name copied properly');
+
+my $wrapped2 = Method::Subclass->wrap($method, foo => 'baz', name => 'FOO');
+is($wrapped2->name, 'FOO', 'got a new method name');
+
+done_testing;