Convert all tests to done_testing.

[gitmo/Moose.git] / t / 030_roles / 002_role.t

diff --git a/t/030_roles/002_role.t b/t/030_roles/002_role.t
index 4026a3b..778cd5d 100644 (file)
--- a/t/030_roles/002_role.t
+++ b/t/030_roles/002_role.t
@@ -3,19 +3,15 @@
 use strict;
 use warnings;
 
-use Test::More tests => 35;
+use Test::More;
 use Test::Exception;
 
-BEGIN {  
-    use_ok('Moose::Role');               
-}
-
 =pod
 
 NOTE:
 
 Should we be testing here that the has & override
-are injecting their methods correctly? In other 
+are injecting their methods correctly? In other
 words, should 'has_method' return true for them?
 
 =cut
@@ -23,28 +19,28 @@ words, should 'has_method' return true for them?
 {
     package FooRole;
     use Moose::Role;
-    
+
     our $VERSION = '0.01';
-    
+
     has 'bar' => (is => 'rw', isa => 'Foo');
-    has 'baz' => (is => 'ro');    
-    
+    has 'baz' => (is => 'ro');
+
     sub foo { 'FooRole::foo' }
-    sub boo { 'FooRole::boo' }    
-    
+    sub boo { 'FooRole::boo' }
+
     before 'boo' => sub { "FooRole::boo:before" };
-    
-    after  'boo' => sub { "FooRole::boo:after1"  }; 
-    after  'boo' => sub { "FooRole::boo:after2"  };        
-    
-    around 'boo' => sub { "FooRole::boo:around" };  
-    
-    override 'bling' => sub { "FooRole::bling:override" };   
-    override 'fling' => sub { "FooRole::fling:override" };  
-    
+
+    after  'boo' => sub { "FooRole::boo:after1"  };
+    after  'boo' => sub { "FooRole::boo:after2"  };
+
+    around 'boo' => sub { "FooRole::boo:around" };
+
+    override 'bling' => sub { "FooRole::bling:override" };
+    override 'fling' => sub { "FooRole::fling:override" };
+
     ::dies_ok { extends() } '... extends() is not supported';
-    ::dies_ok { augment() } '... augment() is not supported';    
-    ::dies_ok { inner()   } '... inner() is not supported';        
+    ::dies_ok { augment() } '... augment() is not supported';
+    ::dies_ok { inner()   } '... inner() is not supported';
 
     no Moose::Role;
 }
@@ -70,9 +66,12 @@ isa_ok($foo_role->get_method('boo'), 'Moose::Meta::Role::Method');
 
 is_deeply(
     [ sort $foo_role->get_method_list() ],
-    [ 'boo', 'foo' ],
+    [ 'boo', 'foo', 'meta' ],
     '... got the right method list');
-    
+
+ok(FooRole->can('foo'), "locally defined methods are still there");
+ok(!FooRole->can('has'), "sugar was unimported");
+
 # attributes ...
 
 is_deeply(
@@ -82,23 +81,31 @@ is_deeply(
 
 ok($foo_role->has_attribute('bar'), '... FooRole does have the bar attribute');
 
-is_deeply(
-    $foo_role->get_attribute('bar'),
-    { is => 'rw', isa => 'Foo' },
-    '... got the correct description of the bar attribute');
+my $bar_attr = $foo_role->get_attribute('bar');
+is($bar_attr->{is}, 'rw',
+   'bar attribute is rw');
+is($bar_attr->{isa}, 'Foo',
+   'bar attribute isa Foo');
+is(ref($bar_attr->{definition_context}), 'HASH',
+   'bar\'s definition context is a hash');
+is($bar_attr->{definition_context}->{package}, 'FooRole',
+   'bar was defined in FooRole');
 
 ok($foo_role->has_attribute('baz'), '... FooRole does have the baz attribute');
 
-is_deeply(
-    $foo_role->get_attribute('baz'),
-    { is => 'ro' },
-    '... got the correct description of the baz attribute');
+my $baz_attr = $foo_role->get_attribute('baz');
+is($baz_attr->{is}, 'ro',
+   'baz attribute is ro');
+is(ref($baz_attr->{definition_context}), 'HASH',
+   'bar\'s definition context is a hash');
+is($baz_attr->{definition_context}->{package}, 'FooRole',
+   'baz was defined in FooRole');
 
 # method modifiers
 
 ok($foo_role->has_before_method_modifiers('boo'), '... now we have a boo:before modifier');
-is(($foo_role->get_before_method_modifiers('boo'))[0]->(), 
-    "FooRole::boo:before", 
+is(($foo_role->get_before_method_modifiers('boo'))[0]->(),
+    "FooRole::boo:before",
     '... got the right method back');
 
 is_deeply(
@@ -107,21 +114,21 @@ is_deeply(
     '... got the right list of before method modifiers');
 
 ok($foo_role->has_after_method_modifiers('boo'), '... now we have a boo:after modifier');
-is(($foo_role->get_after_method_modifiers('boo'))[0]->(), 
-    "FooRole::boo:after1", 
+is(($foo_role->get_after_method_modifiers('boo'))[0]->(),
+    "FooRole::boo:after1",
+    '... got the right method back');
+is(($foo_role->get_after_method_modifiers('boo'))[1]->(),
+    "FooRole::boo:after2",
     '... got the right method back');
-is(($foo_role->get_after_method_modifiers('boo'))[1]->(), 
-    "FooRole::boo:after2", 
-    '... got the right method back');    
 
 is_deeply(
     [ $foo_role->get_method_modifier_list('after') ],
     [ 'boo' ],
     '... got the right list of after method modifiers');
-    
+
 ok($foo_role->has_around_method_modifiers('boo'), '... now we have a boo:around modifier');
-is(($foo_role->get_around_method_modifiers('boo'))[0]->(), 
-    "FooRole::boo:around", 
+is(($foo_role->get_around_method_modifiers('boo'))[0]->(),
+    "FooRole::boo:around",
     '... got the right method back');
 
 is_deeply(
@@ -132,13 +139,13 @@ is_deeply(
 ## overrides
 
 ok($foo_role->has_override_method_modifier('bling'), '... now we have a bling:override modifier');
-is($foo_role->get_override_method_modifier('bling')->(), 
-    "FooRole::bling:override", 
+is($foo_role->get_override_method_modifier('bling')->(),
+    "FooRole::bling:override",
     '... got the right method back');
 
 ok($foo_role->has_override_method_modifier('fling'), '... now we have a fling:override modifier');
-is($foo_role->get_override_method_modifier('fling')->(), 
-    "FooRole::fling:override", 
+is($foo_role->get_override_method_modifier('fling')->(),
+    "FooRole::fling:override",
     '... got the right method back');
 
 is_deeply(
@@ -146,3 +153,4 @@ is_deeply(
     [ 'bling', 'fling' ],
     '... got the right list of override method modifiers');
 
+done_testing;