Tidy all code

[gitmo/MooseX-ClassAttribute.git] / t / 06-role.t

diff --git a/t/06-role.t b/t/06-role.t
index fb1cbb5..e99c6bf 100644 (file)
--- a/t/06-role.t
+++ b/t/06-role.t
@@ -38,16 +38,15 @@ use Moose::Util qw( apply_all_roles );
         $self->ObjectCount( $self->ObjectCount() + 1 );
     }
 
-    sub _BuildIt {42}
+    sub _BuildIt { 42 }
 
     sub _CallTrigger {
         push @{ $_[0]->TriggerRecord() }, [@_];
     }
 }
 
-is_deeply(
-    [ map { $_->name() } ClassWithRoleHCA->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    ClassWithRoleHCA->meta()->does_role('RoleHCA'),
     'ClassWithRoleHCA does RoleHCA'
 );
 
@@ -55,13 +54,11 @@ SharedTests::run_tests('ClassWithRoleHCA');
 
 ClassWithRoleHCA->meta()->make_immutable();
 
-is_deeply(
-    [ map { $_->name() } ClassWithRoleHCA->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    ClassWithRoleHCA->meta()->does_role('RoleHCA'),
     'ClassWithRoleHCA (immutable) does RoleHCA'
 );
 
-
 # These next tests are aimed at testing to-role application followed by
 # to-class application
 {
@@ -73,6 +70,11 @@ is_deeply(
     with 'RoleHCA';
 }
 
+ok(
+    RoleWithRoleHCA->meta()->does_role('RoleHCA'),
+    'RoleWithRoleHCA does RoleHCA'
+);
+
 {
     package ClassWithRoleWithRoleHCA;
 
@@ -92,16 +94,15 @@ is_deeply(
         $self->ObjectCount( $self->ObjectCount() + 1 );
     }
 
-    sub _BuildIt {42}
+    sub _BuildIt { 42 }
 
     sub _CallTrigger {
         push @{ $_[0]->TriggerRecord() }, [@_];
     }
 }
 
-is_deeply(
-    [ map { $_->name() } ClassWithRoleHCA->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    ClassWithRoleWithRoleHCA->meta()->does_role('RoleHCA'),
     'ClassWithRoleWithRoleHCA does RoleHCA'
 );
 
@@ -109,9 +110,8 @@ SharedTests::run_tests('ClassWithRoleWithRoleHCA');
 
 ClassWithRoleWithRoleHCA->meta()->make_immutable();
 
-is_deeply(
-    [ map { $_->name() } ClassWithRoleHCA->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    ClassWithRoleWithRoleHCA->meta()->does_role('RoleHCA'),
     'ClassWithRoleWithRoleHCA (immutable) does RoleHCA'
 );
 
@@ -126,7 +126,7 @@ is_deeply(
         default => 5,
     );
 
-    sub _BuildIt {42}
+    sub _BuildIt { 42 }
 
     sub _CallTrigger {
         push @{ $_[0]->TriggerRecord() }, [@_];
@@ -137,9 +137,8 @@ my $instance = InstanceWithRoleHCA->new();
 
 apply_all_roles( $instance, 'RoleHCA' );
 
-is_deeply(
-    [ map { $_->name() } $instance->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    $instance->meta()->does_role('RoleHCA'),
     '$instance does RoleHCA'
 );
 
@@ -149,9 +148,8 @@ SharedTests::run_tests($instance);
 
 $instance->meta()->make_immutable();
 
-is_deeply(
-    [ map { $_->name() } $instance->meta()->calculate_all_roles() ],
-    ['RoleHCA'],
+ok(
+    $instance->meta()->does_role('RoleHCA'),
     '$instance (immutable) does RoleHCA'
 );