X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F020_attributes%2F021_method_generation_rules.t;h=89992d43fb4680549aa13cef1ec49c3317a6da76;hb=f0b2e5673e864903e74a429565d0c57b69a60b95;hp=d0fbe0b462de23ba63d7db9e043e2813e96f8c02;hpb=e606ae5f848070d889472329819c95f5ba763ca3;p=gitmo%2FMoose.git

diff --git a/t/020_attributes/021_method_generation_rules.t b/t/020_attributes/021_method_generation_rules.t
index d0fbe0b..89992d4 100644
--- a/t/020_attributes/021_method_generation_rules.t
+++ b/t/020_attributes/021_method_generation_rules.t
@@ -3,9 +3,8 @@
 use strict;
 use warnings;
 
-use Test::More tests => 17;
-use Test::Exception;
-
+use Test::More;
+use Test::Fatal;
 
 
 =pod
@@ -18,11 +17,11 @@ use Test::Exception;
 =cut
 
 sub make_class {
-	my ($is, $attr, $class) = @_;
+    my ($is, $attr, $class) = @_;
 
-	eval "package $class; use Moose; has 'foo' => ( is => '$is', $attr => '_foo' );";
+    eval "package $class; use Moose; has 'foo' => ( is => '$is', $attr => '_foo' );";
 
-	return $@ ? die $@ : $class;
+    return $@ ? die $@ : $class;
 }
 
 my $obj;
@@ -34,10 +33,10 @@ ok($class, "Can define attr with rw + writer");
 $obj = $class->new();
 
 can_ok($obj, qw/foo _foo/);
-lives_ok {$obj->_foo(1)} "$class->_foo is writer";
+is( exception {$obj->_foo(1)}, undef, "$class->_foo is writer" );
 is($obj->foo(), 1, "$class->foo is reader");
-dies_ok {$obj->foo(2)} "$class->foo is not writer"; # this should fail
-ok(!defined $obj->_foo(), "$class->_foo is not reader"); 
+isnt( exception {$obj->foo(2)}, undef, "$class->foo is not writer" ); # this should fail
+ok(!defined $obj->_foo(), "$class->_foo is not reader");
 
 $class = make_class('ro', 'writer', 'Test::Class::WriterRO');
 ok($class, "Can define attr with ro + writer");
@@ -45,9 +44,9 @@ ok($class, "Can define attr with ro + writer");
 $obj = $class->new();
 
 can_ok($obj, qw/foo _foo/);
-lives_ok {$obj->_foo(1)} "$class->_foo is writer";
+is( exception {$obj->_foo(1)}, undef, "$class->_foo is writer" );
 is($obj->foo(), 1, "$class->foo is reader");
-dies_ok {$obj->foo(1)} "$class->foo is not writer";
+isnt( exception {$obj->foo(1)}, undef, "$class->foo is not writer" );
 isnt($obj->_foo(), 1, "$class->_foo is not reader");
 
 $class = make_class('rw', 'accessor', 'Test::Class::AccessorRW');
@@ -56,8 +55,9 @@ ok($class, "Can define attr with rw + accessor");
 $obj = $class->new();
 
 can_ok($obj, qw/_foo/);
-lives_ok {$obj->_foo(1)} "$class->_foo is writer";
+is( exception {$obj->_foo(1)}, undef, "$class->_foo is writer" );
 is($obj->_foo(), 1, "$class->foo is reader");
 
-dies_ok { make_class('ro', 'accessor', "Test::Class::AccessorRO"); } "Cant define attr with ro + accessor";
+isnt( exception { make_class('ro', 'accessor', "Test::Class::AccessorRO"); }, undef, "Cant define attr with ro + accessor" );
 
+done_testing;