Redid conversion to Test::Fatal

[gitmo/Moose.git] / t / 020_attributes / 006_attribute_required.t

diff --git a/t/020_attributes/006_attribute_required.t b/t/020_attributes/006_attribute_required.t
index 8f098b2..95ba4dc 100644 (file)
--- a/t/020_attributes/006_attribute_required.t
+++ b/t/020_attributes/006_attribute_required.t
@@ -3,58 +3,66 @@
 use strict;
 use warnings;
 
-use Test::More tests => 16;
-use Test::Exception;
+use Test::More;
+use Test::Fatal;
 
-BEGIN {
-    use_ok('Moose');           
-}
 
 {
     package Foo;
     use Moose;
-    
+
     has 'bar' => (is => 'ro', required => 1);
-    has 'baz' => (is => 'rw', default => 100, required => 1); 
-    has 'boo' => (is => 'rw', lazy => 1, default => 50, required => 1);       
+    has 'baz' => (is => 'rw',  default => 100, required => 1);
+    has 'boo' => (is => 'rw', lazy => 1, default => 50, required => 1);
 }
 
 {
     my $foo = Foo->new(bar => 10, baz => 20, boo => 100);
     isa_ok($foo, 'Foo');
-    
+
     is($foo->bar, 10, '... got the right bar');
-    is($foo->baz, 20, '... got the right baz');    
-    is($foo->boo, 100, '... got the right boo');        
+    is($foo->baz, 20, '... got the right baz');
+    is($foo->boo, 100, '... got the right boo');
 }
 
 {
     my $foo = Foo->new(bar => 10, boo => 5);
     isa_ok($foo, 'Foo');
-    
+
     is($foo->bar, 10, '... got the right bar');
-    is($foo->baz, 100, '... got the right baz');    
-    is($foo->boo, 5, '... got the right boo');            
+    is($foo->baz, 100, '... got the right baz');
+    is($foo->boo, 5, '... got the right boo');
 }
 
 {
     my $foo = Foo->new(bar => 10);
     isa_ok($foo, 'Foo');
-    
+
     is($foo->bar, 10, '... got the right bar');
-    is($foo->baz, 100, '... got the right baz');    
-    is($foo->boo, 50, '... got the right boo');            
+    is($foo->baz, 100, '... got the right baz');
+    is($foo->boo, 50, '... got the right boo');
 }
 
-throws_ok {
+#Yeah.. this doesn't work like this anymore, see below. (groditi)
+#throws_ok {
+#    Foo->new(bar => 10, baz => undef);
+#} qr/^Attribute \(baz\) is required and cannot be undef/, '... must supply all the required attribute';
+
+#throws_ok {
+#    Foo->new(bar => 10, boo => undef);
+#} qr/^Attribute \(boo\) is required and cannot be undef/, '... must supply all the required attribute';
+
+is( exception {
     Foo->new(bar => 10, baz => undef);
-} qr/^Attribute \(baz\) is required and cannot be undef/, '... must supply all the required attribute';
+}, undef, '... undef is a valid attribute value' );
 
-throws_ok {
+is( exception {
     Foo->new(bar => 10, boo => undef);
-} qr/^Attribute \(boo\) is required and cannot be undef/, '... must supply all the required attribute';
+}, undef, '... undef is a valid attribute value' );
+
 
-throws_ok {
+like( exception {
     Foo->new;
-} qr/^Attribute \(bar\) is required/, '... must supply all the required attribute';
+}, qr/^Attribute \(bar\) is required/, '... must supply all the required attribute' );
 
+done_testing;