changelog

[gitmo/Moose.git] / t / 030_roles / 005_role_conflict_detection.t

diff --git a/t/030_roles/005_role_conflict_detection.t b/t/030_roles/005_role_conflict_detection.t
index 5f432a3..0c4f9a8 100644 (file)
--- a/t/030_roles/005_role_conflict_detection.t
+++ b/t/030_roles/005_role_conflict_detection.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 90; # it's really 126 with kolibre's tests;
+use Test::More tests => 89; # it's really 126 with kolibre's tests;
 use Test::Exception;
 
 BEGIN {
@@ -164,11 +164,12 @@ is(My::Test6->bling, 'My::Test6::bling', '... and we got the local method');
 
 ok(Role::Bling::Bling->meta->has_method('bling'), '... still got the bling method in Role::Bling::Bling');
 ok(Role::Bling::Bling->meta->does_role('Role::Bling::Bling'), '... our role correctly does() the other role');
-ok(Role::Bling::Bling::Bling->meta->has_method('bling'), '... still got the bling method in Role::Bling::Bling::Bling');
+ok(Role::Bling::Bling::Bling->meta->has_method('bling'), '... dont have the bling method in Role::Bling::Bling::Bling');
 is(Role::Bling::Bling::Bling->meta->get_method('bling')->(), 
     'Role::Bling::Bling::Bling::bling',
     '... still got the bling method in Role::Bling::Bling::Bling');
 
+
 =pod
 
 Role attribute conflicts
@@ -193,7 +194,7 @@ Role attribute conflicts
     
     ::throws_ok {
         with 'Role::Boo', 'Role::Boo::Hoo';
-    } qr/Role \'Role::Boo::Hoo\' has encountered an attribute conflict/, 
+    } qr/We have encountered an attribute conflict/, 
       '... role attrs conflicted and method was required';
 
     package My::Test8;
@@ -219,7 +220,7 @@ Role attribute conflicts
     
     ::throws_ok {
         with 'Role::Boo', 'Role::Boo::Hoo';
-    } qr/Role \'Role::Boo::Hoo\' has encountered an attribute conflict/, 
+    } qr/We have encountered an attribute conflict/, 
       '... role attrs conflicted and cannot be manually disambiguted';  
 
 }
@@ -343,7 +344,7 @@ is(My::Test14->twist(), 'My::Test::Base::twist', '... got the right method retur
 }    
 
 ok(Role::Reality->meta->has_method('twist'), '... the twist method has not been added');
-ok(!Role::Reality->meta->does_role('Role::Plot'), '... our role does() the correct roles');
+#ok(!Role::Reality->meta->does_role('Role::Plot'), '... our role does() the correct roles');
 is(Role::Reality->meta->get_method('twist')->(), 
     'Role::Reality::twist', 
     '... the twist method returns the right value');