X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fdefaults.t;h=34f25cd7d53124e16ea22c4061906b5dff42dbf0;hb=d2392ff6417375a22a07e3784bcf9ac58e67578e;hp=6e29950bd3a37791a2a1596b50faada4caabf0f8;hpb=015b91679983f142397cd7172262a5e56f3cd850;p=gitmo%2FMooseX-UndefTolerant.git

diff --git a/t/defaults.t b/t/defaults.t
index 6e29950..34f25cd 100644
--- a/t/defaults.t
+++ b/t/defaults.t
@@ -1,5 +1,9 @@
+use strict;
+use warnings;
+
 use Test::More;
 use Test::Fatal;
+use Test::Moose;
 
 use MooseX::UndefTolerant::Attribute ();
 
@@ -20,6 +24,12 @@ use MooseX::UndefTolerant::Attribute ();
         predicate => 'has_attr2',
         default => 2,
     );
+    has 'attr3' => (
+        is => 'ro',
+        isa => 'Maybe[Num]',
+        predicate => 'has_attr3',
+        default => 3,
+    );
 }
 
 {
@@ -39,6 +49,12 @@ use MooseX::UndefTolerant::Attribute ();
         predicate => 'has_attr2',
         default => 2,
     );
+    has 'attr3' => (
+        is => 'ro',
+        isa => 'Maybe[Num]',
+        predicate => 'has_attr3',
+        default => 3,
+    );
 }
 
 
@@ -46,6 +62,9 @@ package main;
 
 sub do_tests
 {
+    note 'Default behaviour: ',
+        (Foo->meta->is_immutable ? 'im' : '') . 'mutable classes', "\n";
+
     note 'Testing class with a single UndefTolerant attribute';
     do_tests_with_class('Foo');
 
@@ -62,42 +81,56 @@ sub do_tests_with_class
         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');
     }
 
-    {
-        my $obj = $class->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');
+    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);
+        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');
     }
 }
 
-note 'Default behaviour: mutable classes';
-note '';
-do_tests;
-
-note '';
-note 'Default behaviour: immutable classes';
-note '';
-Foo->meta->make_immutable;
-Bar->meta->make_immutable;
+with_immutable {
+    do_tests;
+} qw(Foo Bar);
 
 TODO: {
-    local $TODO = 'some immutable cases are not handled yet';
-    # for now, catch errors
-    is (exception { do_tests }, undef, 'tests do not die');
-
-    is(Test::More->builder->current_test, 44, 'if we got here, we can declare victory!');
+    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;