X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F020_attributes%2F011_more_attr_delegation.t;h=050ec3d4e76aed1685215507435eb58b71ae6a40;hb=f0b2e5673e864903e74a429565d0c57b69a60b95;hp=51a5d6e4716dcfc88aad0db5f3fd25389dfab952;hpb=575ca97412cccdd0bce12c61df9e4c3ba8bb334a;p=gitmo%2FMoose.git

diff --git a/t/020_attributes/011_more_attr_delegation.t b/t/020_attributes/011_more_attr_delegation.t
index 51a5d6e..050ec3d 100644
--- a/t/020_attributes/011_more_attr_delegation.t
+++ b/t/020_attributes/011_more_attr_delegation.t
@@ -3,8 +3,8 @@
 use strict;
 use warnings;
 
-use Test::More tests => 43;
-use Test::Exception;
+use Test::More;
+use Test::Fatal;
 
 =pod
 
@@ -92,42 +92,43 @@ do not fail at compile time.
     use Moose;
 
     sub parent_method_1 { "parent_1" }
+    ::can_ok('Parent', 'parent_method_1');
 
-    ::dies_ok {
+    ::isnt( ::exception {
         has child_a => (
             is      => "ro",
             default => sub { ChildA->new },
             handles => qr/.*/,
         );
-    } "all_methods requires explicit isa";
+    }, undef, "all_methods requires explicit isa" );
 
-    ::lives_ok {
+    ::is( ::exception {
         has child_a => (
             isa     => "ChildA",
             is      => "ro",
             default => sub { ChildA->new },
             handles => qr/.*/,
         );
-    } "allow all_methods with explicit isa";
+    }, undef, "allow all_methods with explicit isa" );
 
-    ::lives_ok {
+    ::is( ::exception {
         has child_b => (
             is      => 'ro',
             default => sub { ChildB->new },
             handles => [qw/child_b_method_1/],
         );
-    } "don't need to declare isa if method list is predefined";
+    }, undef, "don't need to declare isa if method list is predefined" );
 
-    ::lives_ok {
+    ::is( ::exception {
         has child_c => (
             isa     => "ChildC",
             is      => "ro",
             default => sub { ChildC->new },
             handles => qr/_la$/,
         );
-    } "can declare regex collector";
+    }, undef, "can declare regex collector" );
 
-    ::dies_ok {
+    ::isnt( ::exception {
         has child_d => (
             is      => "ro",
             default => sub { ChildD->new },
@@ -135,9 +136,9 @@ do not fail at compile time.
                 my ( $class, $delegate_class ) = @_;
             }
         );
-    } "can't create attr with generative handles parameter and no isa";
+    }, undef, "can't create attr with generative handles parameter and no isa" );
 
-    ::lives_ok {
+    ::is( ::exception {
         has child_d => (
             isa     => "ChildD",
             is      => "ro",
@@ -147,19 +148,19 @@ do not fail at compile time.
                 return;
             }
         );
-    } "can't create attr with generative handles parameter and no isa";
+    }, undef, "can't create attr with generative handles parameter and no isa" );
 
-    ::lives_ok {
+    ::is( ::exception {
         has child_e => (
             isa     => "ChildE",
             is      => "ro",
             default => sub { ChildE->new },
             handles => ["child_e_method_2"],
         );
-    } "can delegate to non moose class using explicit method list";
+    }, undef, "can delegate to non moose class using explicit method list" );
 
     my $delegate_class;
-    ::lives_ok {
+    ::is( ::exception {
         has child_f => (
             isa     => "ChildF",
             is      => "ro",
@@ -169,38 +170,40 @@ do not fail at compile time.
                 return;
             },
         );
-    } "subrefs on non moose class give no meta";
+    }, undef, "subrefs on non moose class give no meta" );
 
     ::is( $delegate_class, "ChildF", "plain classes are handed down to subs" );
 
-    ::lives_ok {
+    ::is( ::exception {
         has child_g => (
             isa     => "ChildG",
             default => sub { ChildG->new },
             handles => ["child_g_method_1"],
         );
-    } "can delegate to object even without explicit reader";
+    }, undef, "can delegate to object even without explicit reader" );
 
-    ::dies_ok {
+    ::can_ok('Parent', 'parent_method_1');
+    ::isnt( ::exception {
         has child_h => (
             isa     => "ChildH",
             is      => "ro",
             default => sub { ChildH->new },
             handles => sub { map { $_, $_ } $_[1]->get_all_method_names },
         );
-    } "Can't override exisiting class method in delegate";
+    }, undef, "Can't override exisiting class method in delegate" );
+    ::can_ok('Parent', 'parent_method_1');
 
-    ::lives_ok {
+    ::is( ::exception {
         has child_i => (
             isa     => "ChildI",
             is      => "ro",
             default => sub { ChildI->new },
             handles => sub {
-                map { $_, $_ } grep { !/^parent_method_1$/ }
+                map { $_, $_ } grep { !/^parent_method_1|meta$/ }
                     $_[1]->get_all_method_names;
             },
         );
-    } "Test handles code ref for skipping predefined methods";
+    }, undef, "Test handles code ref for skipping predefined methods" );
 
 
     sub parent_method { "p" }
@@ -253,3 +256,8 @@ is( $p->child_e_method_2, "e2", "delegate to non moose class (child_e_method_2)"
 
 can_ok( $p, "child_g_method_1" );
 is( $p->child_g_method_1, "g1", "delegate to moose class without reader (child_g_method_1)" );
+
+can_ok( $p, "child_i_method_1" );
+is( $p->parent_method_1, "parent_1", "delegate doesn't override existing method" );
+
+done_testing;