Redid conversion to Test::Fatal

[gitmo/Moose.git] / t / 050_metaclasses / 013_metaclass_traits.t

diff --git a/t/050_metaclasses/013_metaclass_traits.t b/t/050_metaclasses/013_metaclass_traits.t
index 9a32641..a96d95e 100644 (file)
--- a/t/050_metaclasses/013_metaclass_traits.t
+++ b/t/050_metaclasses/013_metaclass_traits.t
@@ -3,8 +3,10 @@
 use strict;
 use warnings;
 
-use Test::More tests => 28;
-use Test::Exception;
+use lib 't/lib', 'lib';
+
+use Test::More;
+use Test::Fatal;
 
 {
     package My::SimpleTrait;
@@ -165,15 +167,16 @@ is( Role::Foo->meta()->simple(), 5,
 
 {
     require Moose::Util::TypeConstraints;
-    dies_ok( sub { Moose::Util::TypeConstraints->import( -traits => 'My::SimpleTrait' ) },
-             'cannot provide -traits to an exporting module that does not init_meta' );
-    like( $@, qr/does not have an init_meta/,
-          '... and error provides a useful explanation' );
+    like(
+        exception {
+            Moose::Util::TypeConstraints->import(
+                -traits => 'My::SimpleTrait' );
+        },
+        qr/does not have an init_meta/,
+        'cannot provide -traits to an exporting module that does not init_meta'
+    );
 }
 
-SKIP:
-{
-    skip 'This will blow up until Moose::Meta::Class->_fix_metaclass_incompatibility understands roles', 5;
 {
     package Foo::Subclass;
 
@@ -190,4 +193,34 @@ is( Foo::Subclass->meta()->simple2(), 55,
 can_ok( Foo::Subclass->meta(), 'attr2' );
 is( Foo::Subclass->meta()->attr2(), 'something',
     'Foo::Subclass->meta()->attr2() returns expected value' );
+
+{
+
+    package Class::WithAlreadyPresentTrait;
+    use Moose -traits => 'My::SimpleTrait';
+
+    has an_attr => ( is => 'ro' );
+}
+
+is( exception {
+    my $instance = Class::WithAlreadyPresentTrait->new( an_attr => 'value' );
+    is( $instance->an_attr, 'value', 'Can get value' );
+}, undef, 'Can create instance and access attributes' );
+
+{
+
+    package Class::WhichLoadsATraitFromDisk;
+
+    # Any role you like here, the only important bit is that it gets
+    # loaded from disk and has not already been defined.
+    use Moose -traits => 'Role::Parent';
+
+    has an_attr => ( is => 'ro' );
 }
+
+is( exception {
+    my $instance = Class::WhichLoadsATraitFromDisk->new( an_attr => 'value' );
+    is( $instance->an_attr, 'value', 'Can get value' );
+}, undef, 'Can create instance and access attributes' );
+
+done_testing;