X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMooseX-UndefTolerant.git;a=blobdiff_plain;f=t%2Fconstructor.t;h=810f3f91f4e5768dc5260c9a43aff5ac435505cb;hp=1d0f3dd663daa054c2231a22835c8aaf3a46d15e;hb=37acc77035246208322d14616beba7d370e8fb2f;hpb=9ee73670511a65764901d2f341ea24cd3b94e998

diff --git a/t/constructor.t b/t/constructor.t
index 1d0f3dd..810f3f9 100644
--- a/t/constructor.t
+++ b/t/constructor.t
@@ -1,133 +1,13 @@
+use strict;
+use warnings;
+
 use Test::More;
-use Test::Fatal;
 use Test::Moose;
 
-{
-    package Foo;
-    use Moose;
-
-    has 'attr1' => (
-        traits => [ qw(MooseX::UndefTolerant::Attribute)],
-        is => 'ro',
-        isa => 'Num',
-        predicate => 'has_attr1',
-    );
-    has 'attr2' => (
-        is => 'ro',
-        isa => 'Num',
-        predicate => 'has_attr2',
-    );
-    has 'attr3' => (
-        is => 'ro',
-        isa => 'Maybe[Num]',
-        predicate => 'has_attr3',
-    );
-}
-
-{
-    package Bar;
-    use Moose;
-    use MooseX::UndefTolerant;
-
-    has 'attr1' => (
-        is => 'ro',
-        isa => 'Num',
-        predicate => 'has_attr1',
-    );
-    has 'attr2' => (
-        is => 'ro',
-        isa => 'Num',
-        predicate => 'has_attr2',
-    );
-    has 'attr3' => (
-        is => 'ro',
-        isa => 'Maybe[Num]',
-        predicate => 'has_attr3',
-    );
-}
-
-package main;
-
-with_immutable
-{
-    note 'Testing class with a single UndefTolerant attribute';
-    {
-        my $obj = Foo->new;
-        ok(!$obj->has_attr1, 'attr1 has no value before it is assigned');
-        ok(!$obj->has_attr2, 'attr2 has no value before it is assigned');
-        ok(!$obj->has_attr3, 'attr3 has no value before it is assigned');
-    }
-
-    TODO: {
-        local $TODO;
-        $TODO = 'some immutable cases are not handled yet; see CAVEATS' if Foo->meta->is_immutable;
-        is(
-            exception {
-
-                my $obj = Foo->new(attr1 => undef);
-                ok(!$obj->has_attr1, 'UT attr1 has no value when assigned undef in constructor');
-                like(
-                    exception { $obj = Foo->new(attr2 => undef) },
-                    qr/\QAttribute (attr2) does not pass the type constraint because: Validation failed for 'Num' with value undef\E/,
-                    'But assigning undef to attr2 generates a type constraint error');
-
-                is (exception { $obj = Foo->new(attr3 => undef) }, undef,
-                    'assigning undef to attr3 is acceptable');
-                ok($obj->has_attr3, 'attr3 retains its undef value when assigned undef in constructor');
-            },
-            undef,
-            'successfully tested spot-applicaction of UT trait in immutable classes',
-        );
-    }
-
-    {
-        my $obj = Foo->new(attr1 => 1234, attr2 => 5678, attr3 => 9012);
-        is($obj->attr1, 1234, 'assigning a defined value during construction works as normal');
-        ok($obj->has_attr1, '...and the predicate returns true as normal');
-
-        is($obj->attr2, 5678, 'assigning a defined value during construction works as normal');
-        ok($obj->has_attr2, '...and the predicate returns true as normal');
-
-        is($obj->attr3, 9012, 'assigning a defined value during construction works as normal');
-        ok($obj->has_attr3, '...and the predicate returns true as normal');
-    }
-
-
-    note '';
-    note 'Testing class with the entire class being UndefTolerant';
-    {
-        my $obj = Bar->new;
-        ok(!$obj->has_attr1, 'attr1 has no value before it is assigned');
-        ok(!$obj->has_attr2, 'attr2 has no value before it is assigned');
-        ok(!$obj->has_attr3, 'attr3 has no value before it is assigned');
-    }
-
-    {
-        my $obj = Bar->new(attr1 => undef);
-        ok(!$obj->has_attr1, 'attr1 has no value when assigned undef in constructor');
-        # note this test differs from the Foo case above
-        is (exception { $obj = Bar->new(attr2 => undef) }, undef,
-            'assigning undef to attr2 does not produce an error');
-        ok(!$obj->has_attr2, 'attr2 has no value when assigned undef in constructor');
-
-        is( exception { $obj = Foo->new(attr3 => undef) }, undef,
-            'assigning undef to attr3 is acceptable');
-        ok($obj->has_attr3, 'attr3 retains its undef value when assigned undef in constructor');
-    }
-
-    {
-        my $obj = Bar->new(attr1 => 1234, attr2 => 5678, attr3 => 9012);
-        is($obj->attr1, 1234, 'assigning a defined value during construction works as normal');
-        ok($obj->has_attr1, '...and the predicate returns true as normal');
-
-        is($obj->attr2, 5678, 'assigning a defined value during construction works as normal');
-        ok($obj->has_attr2, '...and the predicate returns true as normal');
+use lib 't/lib';
+use ConstructorTests;
 
-        is($obj->attr3, 9012, 'assigning a defined value during construction works as normal');
-        ok($obj->has_attr3, '...and the predicate returns true as normal');
-    }
-}
-qw(Foo Bar);
+with_immutable { ConstructorTests::do_tests() } qw(Foo Bar);
 
 note 'Ran ', Test::More->builder->current_test, ' tests - should have run 56';