Redid conversion to Test::Fatal

[gitmo/Moose.git] / t / 030_roles / 017_extending_role_attrs.t

diff --git a/t/030_roles/017_extending_role_attrs.t b/t/030_roles/017_extending_role_attrs.t
index e960a67..d9b223b 100644 (file)
--- a/t/030_roles/017_extending_role_attrs.t
+++ b/t/030_roles/017_extending_role_attrs.t
@@ -3,9 +3,8 @@
 use strict;
 use warnings;
 
-use Test::More tests => 27;
-use Test::Exception;
-
+use Test::More;
+use Test::Fatal;
 
 
 =pod
@@ -30,9 +29,9 @@ on role attributes works right.
 
     with 'Foo::Role';
 
-    ::lives_ok {
+    ::is( ::exception {
         has '+bar' => (default => sub { 100 });
-    } '... extended the attribute successfully';
+    }, undef, '... extended the attribute successfully' );
 }
 
 my $foo = Foo->new;
@@ -55,11 +54,11 @@ is($foo->bar, 100, '... got the extended attribute');
 
     with 'Bar::Role';
 
-    ::lives_ok {
+    ::is( ::exception {
         has '+foo' => (
             isa => 'Int',
         )
-    } "... narrowed the role's type constraint successfully";
+    }, undef, "... narrowed the role's type constraint successfully" );
 }
 
 my $bar = Bar->new(foo => 42);
@@ -68,7 +67,7 @@ is($bar->foo, 42, '... got the extended attribute');
 $bar->foo(100);
 is($bar->foo, 100, "... can change the attribute's value to an Int");
 
-throws_ok { $bar->foo("baz") } qr/^Attribute \(foo\) does not pass the type constraint because: Validation failed for 'Int' failed with value baz at /;
+like( exception { $bar->foo("baz") }, qr/^Attribute \(foo\) does not pass the type constraint because: Validation failed for 'Int' with value baz at / );
 is($bar->foo, 100, "... still has the old Int value");
 
 
@@ -86,11 +85,11 @@ is($bar->foo, 100, "... still has the old Int value");
 
     with 'Baz::Role';
 
-    ::lives_ok {
+    ::is( ::exception {
         has '+baz' => (
             isa => 'Int | ClassName',
         )
-    } "... narrowed the role's type constraint successfully";
+    }, undef, "... narrowed the role's type constraint successfully" );
 }
 
 my $baz = Baz->new(baz => 99);
@@ -99,7 +98,7 @@ is($baz->baz, 99, '... got the extended attribute');
 $baz->baz('Foo');
 is($baz->baz, 'Foo', "... can change the attribute's value to a ClassName");
 
-throws_ok { $baz->baz("zonk") } qr/^Attribute \(baz\) does not pass the type constraint because: Validation failed for 'ClassName\|Int' failed with value zonk at /;
+like( exception { $baz->baz("zonk") }, qr/^Attribute \(baz\) does not pass the type constraint because: Validation failed for 'ClassName\|Int' with value zonk at / );
 is_deeply($baz->baz, 'Foo', "... still has the old ClassName value");
 
 
@@ -122,11 +121,11 @@ is_deeply($baz->baz, 'Foo', "... still has the old ClassName value");
         => as 'Int'
         => where { $_ > 0 };
 
-    ::lives_ok {
+    ::is( ::exception {
         has '+quux' => (
             isa => 'Positive | ArrayRef',
         )
-    } "... narrowed the role's type constraint successfully";
+    }, undef, "... narrowed the role's type constraint successfully" );
 }
 
 my $quux = Quux->new(quux => 99);
@@ -137,10 +136,10 @@ is($quux->quux, 100, "... can change the attribute's value to an Int");
 $quux->quux(["hi"]);
 is_deeply($quux->quux, ["hi"], "... can change the attribute's value to an ArrayRef");
 
-throws_ok { $quux->quux("quux") } qr/^Attribute \(quux\) does not pass the type constraint because: Validation failed for 'ArrayRef\|Positive' failed with value quux at /;
+like( exception { $quux->quux("quux") }, qr/^Attribute \(quux\) does not pass the type constraint because: Validation failed for 'ArrayRef\|Positive' with value quux at / );
 is_deeply($quux->quux, ["hi"], "... still has the old ArrayRef value");
 
-throws_ok { $quux->quux({a => 1}) } qr/^Attribute \(quux\) does not pass the type constraint because: Validation failed for 'ArrayRef\|Positive' failed with value HASH\(\w+\) at /;
+like( exception { $quux->quux({a => 1}) }, qr/^Attribute \(quux\) does not pass the type constraint because: Validation failed for 'ArrayRef\|Positive' with value HASH\(\w+\) at / );
 is_deeply($quux->quux, ["hi"], "... still has the old ArrayRef value");
 
 
@@ -160,16 +159,28 @@ is_deeply($quux->quux, ["hi"], "... still has the old ArrayRef value");
 
     with 'Err::Role';
 
-    ::lives_ok {
+    ::is( ::exception {
         has '+err1' => (isa => 'Defined');
-    } "can get less specific in the subclass";
+    }, undef, "can get less specific in the subclass" );
 
-    ::lives_ok {
+    ::is( ::exception {
         has '+err2' => (isa => 'Bool');
-    } "or change the type completely";
+    }, undef, "or change the type completely" );
 
-    ::lives_ok {
+    ::is( ::exception {
         has '+err3' => (isa => 'Str | ArrayRef');
-    } "or add new types to the union";
+    }, undef, "or add new types to the union" );
+}
+
+{
+    package Role::With::PlusAttr;
+    use Moose::Role;
+
+    with 'Foo::Role';
+
+    ::like( ::exception {
+        has '+bar' => ( is => 'ro' );
+    }, qr/has '\+attr' is not supported in roles/, "Test has '+attr' in roles explodes" );
 }
 
+done_testing;