X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fdefaults.t;h=34f25cd7d53124e16ea22c4061906b5dff42dbf0;hb=HEAD;hp=b43d01262bce5982f4d3e70baea0f2993ccb6165;hpb=36bf5c4d40113630e8c3aabed77262a62a7d8428;p=gitmo%2FMooseX-UndefTolerant.git

diff --git a/t/defaults.t b/t/defaults.t
index b43d012..34f25cd 100644
--- a/t/defaults.t
+++ b/t/defaults.t
@@ -1,4 +1,9 @@
-use Test::More tests => 22;
+use strict;
+use warnings;
+
+use Test::More;
+use Test::Fatal;
+use Test::Moose;
 
 use MooseX::UndefTolerant::Attribute ();
 
@@ -19,6 +24,12 @@ use MooseX::UndefTolerant::Attribute ();
         predicate => 'has_attr2',
         default => 2,
     );
+    has 'attr3' => (
+        is => 'ro',
+        isa => 'Maybe[Num]',
+        predicate => 'has_attr3',
+        default => 3,
+    );
 }
 
 {
@@ -38,61 +49,89 @@ use MooseX::UndefTolerant::Attribute ();
         predicate => 'has_attr2',
         default => 2,
     );
+    has 'attr3' => (
+        is => 'ro',
+        isa => 'Maybe[Num]',
+        predicate => 'has_attr3',
+        default => 3,
+    );
 }
 
 
 package main;
 
-note 'Default behaviour';
-note '';
-
-note 'Testing class with a single UndefTolerant attribute';
+sub do_tests
 {
-    my $obj = Foo->new;
-    ok($obj->has_attr1, 'attr1 has a value');
-    ok($obj->has_attr2, 'attr2 has a value');
-    is($obj->attr1, 1, 'attr1\'s value is its default');
-    is($obj->attr2, 2, 'attr2\'s value is its default');
-}
+    note 'Default behaviour: ',
+        (Foo->meta->is_immutable ? 'im' : '') . 'mutable classes', "\n";
 
-{
-    my $obj = Foo->new(attr1 => undef);
-    ok($obj->has_attr1, 'UT attr1 has a value when assigned undef in constructor');
-    is($obj->attr1, 1, 'attr1\'s value is its default');
-    is($obj->attr2, 2, 'attr2\'s value is its default');
-}
+    note 'Testing class with a single UndefTolerant attribute';
+    do_tests_with_class('Foo');
 
-{
-    my $obj = Foo->new(attr1 => 1234, attr2 => 5678);
-    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');
+    note '';
+    note 'Testing class with the entire class being UndefTolerant';
+    do_tests_with_class('Bar');
 }
 
-
-note '';
-note 'Testing class with the entire class being UndefTolerant';
+sub do_tests_with_class
 {
-    my $obj = Bar->new;
-    ok($obj->has_attr1, 'attr1 has a value');
-    ok($obj->has_attr2, 'attr2 has a value');
-    is($obj->attr1, 1, 'attr1\'s value is its default');
-    is($obj->attr2, 2, 'attr2\'s value is its default');
+    my $class = shift;
+
+    {
+        my $obj = $class->new;
+        ok($obj->has_attr1, 'attr1 has a value');
+        ok($obj->has_attr2, 'attr2 has a value');
+        ok($obj->has_attr3, 'attr3 has a value');
+
+        is($obj->attr1, 1, 'attr1\'s value is its default');
+        is($obj->attr2, 2, 'attr2\'s value is its default');
+        is($obj->attr3, 3, 'attr3\'s value is its default');
+    }
+
+    TODO: {
+        my $e = exception {
+            my $obj = $class->new(attr1 => undef, attr3 => undef);
+            {
+                local $TODO = 'not sure why this fails still... needs attr trait rewrite' if $obj->meta->is_immutable;
+                # FIXME: the object is successfully constructed, and the value
+                # for attr1 is properly removed, but the default is not then
+                # used instead...
+                # note "### constructed object: ", $obj->dump(2);
+                ok($obj->has_attr1, 'UT attr1 has a value when assigned undef in constructor');
+                is($obj->attr1, 1, 'attr1\'s value is its default');
+            }
+            ok($obj->has_attr3, 'attr3 retains its undef value when assigned undef in constructor');
+
+            is($obj->attr2, 2, 'attr2\'s value is its default');
+            is($obj->attr3, undef, 'attr3\'s value is not its default (explicitly set)');
+        };
+        local $TODO = 'some immutable cases are not handled yet; see CAVEATS'
+            if $class->meta->is_immutable and $class eq 'Foo';
+
+        is($e, undef, 'these tests do not die');
+    }
+
+    {
+        my $obj = $class->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');
+    }
 }
 
-{
-    my $obj = Bar->new(attr1 => undef);
-    ok($obj->has_attr1, 'UT attr1 has a value when assigned undef in constructor');
-    is($obj->attr1, 1, 'attr1\'s value is its default');
-    is($obj->attr2, 2, 'attr2\'s value is its default');
-}
+with_immutable {
+    do_tests;
+} qw(Foo Bar);
 
-{
-    my $obj = Bar->new(attr1 => 1234, attr2 => 5678);
-    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');
+TODO: {
+    local $TODO = 'some cases are still not handled yet; see CAVEATS';
+    is(Test::More->builder->current_test, 98, 'if we got here, we can declare victory!');
 }
 
+done_testing;
+