X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F09-optional.t;h=f0e2ba2e2569dda61283f29e982a7109ab46450a;hb=02aebec2f10b7bc8327fb0b2c9bb031f17764cd8;hp=a977c6a260fc5d5b341f0a348ab9e332f3db20d9;hpb=190a34ebaf957618baf301ad0574bfc21b2f76b1;p=gitmo%2FMooseX-Types-Structured.git

diff --git a/t/09-optional.t b/t/09-optional.t
index a977c6a..f0e2ba2 100755
--- a/t/09-optional.t
+++ b/t/09-optional.t
@@ -2,57 +2,57 @@ use strict;
 use warnings;
 
 use Test::More tests=>46;
-use Test::Exception;
+use Test::Fatal;
 use Moose::Util::TypeConstraints;
 use MooseX::Types::Structured qw(Optional);
 
 APITEST: {
 
-	ok my $Optional = Moose::Util::TypeConstraints::find_or_parse_type_constraint('MooseX::Types::Structured::Optional')
-	 => 'Got Optional';
-	
-	isa_ok $Optional
-	 => 'Moose::Meta::TypeConstraint::Parameterizable';
-	
-	ok my $int = Moose::Util::TypeConstraints::find_or_parse_type_constraint('Int')
-	 => 'Got Int';
-	
-	ok my $arrayref = Moose::Util::TypeConstraints::find_or_parse_type_constraint('ArrayRef[Int]')
-	 => 'Got ArrayRef[Int]';
-	
-	BASIC: {
-		ok my $Optional_Int = $Optional->parameterize($int), 'Parameterized Int';
-		ok my $Optional_ArrayRef = $Optional->parameterize($arrayref), 'Parameterized ArrayRef';
-		
-		ok $Optional_Int->check() => 'Optional is allowed to not exist';
-		
-		ok !$Optional_Int->check(undef) => 'Optional is NOT allowed to be undef';
-		ok $Optional_Int->check(199) => 'Correctly validates 199';
-		ok !$Optional_Int->check("a") => 'Correctly fails "a"';
-		
-		ok $Optional_ArrayRef->check() => 'Optional is allowed to not exist';
-		ok !$Optional_ArrayRef->check(undef) => 'Optional is NOT allowed to be undef';
-		ok $Optional_ArrayRef->check([1,2,3]) => 'Correctly validates [1,2,3]';
-		ok !$Optional_ArrayRef->check("a") => 'Correctly fails "a"';
-		ok !$Optional_ArrayRef->check(["a","b"]) => 'Correctly fails ["a","b"]';	
-	}
-	
-	SUBREF: {
-		ok my $Optional_Int = Optional->parameterize($int),'Parameterized Int';
-		ok my $Optional_ArrayRef = Optional->parameterize($arrayref), 'Parameterized ArrayRef';
-		
-		ok $Optional_Int->check() => 'Optional is allowed to not exist';
-		
-		ok !$Optional_Int->check(undef) => 'Optional is NOT allowed to be undef';
-		ok $Optional_Int->check(199) => 'Correctly validates 199';
-		ok !$Optional_Int->check("a") => 'Correctly fails "a"';
-		
-		ok $Optional_ArrayRef->check() => 'Optional is allowed to not exist';
-		ok !$Optional_ArrayRef->check(undef) => 'Optional is NOT allowed to be undef';
-		ok $Optional_ArrayRef->check([1,2,3]) => 'Correctly validates [1,2,3]';
-		ok !$Optional_ArrayRef->check("a") => 'Correctly fails "a"';
-		ok !$Optional_ArrayRef->check(["a","b"]) => 'Correctly fails ["a","b"]';		
-	}
+    ok my $Optional = Moose::Util::TypeConstraints::find_or_parse_type_constraint('MooseX::Types::Structured::Optional')
+     => 'Got Optional';
+
+    isa_ok $Optional
+     => 'Moose::Meta::TypeConstraint::Parameterizable';
+
+    ok my $int = Moose::Util::TypeConstraints::find_or_parse_type_constraint('Int')
+     => 'Got Int';
+
+    ok my $arrayref = Moose::Util::TypeConstraints::find_or_parse_type_constraint('ArrayRef[Int]')
+     => 'Got ArrayRef[Int]';
+
+    BASIC: {
+        ok my $Optional_Int = $Optional->parameterize($int), 'Parameterized Int';
+        ok my $Optional_ArrayRef = $Optional->parameterize($arrayref), 'Parameterized ArrayRef';
+
+        ok $Optional_Int->check() => 'Optional is allowed to not exist';
+
+        ok !$Optional_Int->check(undef) => 'Optional is NOT allowed to be undef';
+        ok $Optional_Int->check(199) => 'Correctly validates 199';
+        ok !$Optional_Int->check("a") => 'Correctly fails "a"';
+
+        ok $Optional_ArrayRef->check() => 'Optional is allowed to not exist';
+        ok !$Optional_ArrayRef->check(undef) => 'Optional is NOT allowed to be undef';
+        ok $Optional_ArrayRef->check([1,2,3]) => 'Correctly validates [1,2,3]';
+        ok !$Optional_ArrayRef->check("a") => 'Correctly fails "a"';
+        ok !$Optional_ArrayRef->check(["a","b"]) => 'Correctly fails ["a","b"]';
+    }
+
+    SUBREF: {
+        ok my $Optional_Int = Optional->parameterize($int),'Parameterized Int';
+        ok my $Optional_ArrayRef = Optional->parameterize($arrayref), 'Parameterized ArrayRef';
+
+        ok $Optional_Int->check() => 'Optional is allowed to not exist';
+
+        ok !$Optional_Int->check(undef) => 'Optional is NOT allowed to be undef';
+        ok $Optional_Int->check(199) => 'Correctly validates 199';
+        ok !$Optional_Int->check("a") => 'Correctly fails "a"';
+
+        ok $Optional_ArrayRef->check() => 'Optional is allowed to not exist';
+        ok !$Optional_ArrayRef->check(undef) => 'Optional is NOT allowed to be undef';
+        ok $Optional_ArrayRef->check([1,2,3]) => 'Correctly validates [1,2,3]';
+        ok !$Optional_ArrayRef->check("a") => 'Correctly fails "a"';
+        ok !$Optional_ArrayRef->check(["a","b"]) => 'Correctly fails ["a","b"]';
+    }
 }
 
 OBJECTTEST: {
@@ -60,131 +60,131 @@ OBJECTTEST: {
 
     use Moose;
     use MooseX::Types::Structured qw(Dict Tuple Optional);
-	use MooseX::Types::Moose qw(Int Str Object ArrayRef HashRef Maybe);
-	use MooseX::Types -declare => [qw(
+    use MooseX::Types::Moose qw(Int Str Object ArrayRef HashRef Maybe);
+    use MooseX::Types -declare => [qw(
         MoreThanFive TupleOptional1 TupleOptional2 Gender DictOptional1 Insane
     )];
-	
+
     subtype MoreThanFive,
      as Int,
      where { $_ > 5};
-	 
-	enum Gender,
-	 qw/male female transgendered/;
-	 
-    subtype TupleOptional1,
-		as Tuple[Int, MoreThanFive, Optional[Str|Object]];
+
+    enum Gender,
+     [ qw/male female transgendered/ ];
+
+    subtype TupleOptional1() =>
+        as Tuple[Int, MoreThanFive, Optional[Str|Object]];
 
     subtype TupleOptional2,
-		as Tuple[Int, MoreThanFive, Optional[HashRef[Int|Object]]];
-		
-	subtype DictOptional1,
-		as Dict[name=>Str, age=>Int, gender=>Optional[Gender]];
-		
-	subtype Insane,
-		as Tuple[
-			Int,
-			Optional[Str|Object],
-			DictOptional1,
-			Optional[ArrayRef[Int]]
-		];
-    
+        as Tuple[Int, MoreThanFive, Optional[HashRef[Int|Object]]];
+
+    subtype DictOptional1,
+        as Dict[name=>Str, age=>Int, gender=>Optional[Gender]];
+
+    subtype Insane,
+        as Tuple[
+            Int,
+            Optional[Str|Object],
+            DictOptional1,
+            Optional[ArrayRef[Int]]
+        ];
+
     has 'TupleOptional1Attr' => (is=>'rw', isa=>TupleOptional1);
     has 'TupleOptional2Attr' => (is=>'rw', isa=>TupleOptional2);
-    has 'DictOptional1Attr' => (is=>'rw', isa=>DictOptional1);	
-	has 'InsaneAttr' => (is=>'rw', isa=>Insane);	
+    has 'DictOptional1Attr' => (is=>'rw', isa=>DictOptional1);
+    has 'InsaneAttr' => (is=>'rw', isa=>Insane);
 }
 
 ok my $obj = Test::MooseX::Meta::TypeConstraint::Structured::Optional->new
  => 'Instantiated new test class.';
- 
+
 isa_ok $obj => 'Test::MooseX::Meta::TypeConstraint::Structured::Optional'
  => 'Created correct object type.';
- 
+
 # Test Insane
 
-lives_ok sub {
+is( exception {
     $obj->InsaneAttr([1,"hello",{name=>"John",age=>39,gender=>"male"},[1,2,3]]);
-} => 'Set InsaneAttr attribute without error [1,"hello",{name=>"John",age=>39,gender=>"male"},[1,2,3]]';
+} => undef, 'Set InsaneAttr attribute without error [1,"hello",{name=>"John",age=>39,gender=>"male"},[1,2,3]]');
 
-lives_ok sub {
+is( exception {
     $obj->InsaneAttr([1,$obj,{name=>"John",age=>39},[1,2,3]]);
-} => 'Set InsaneAttr attribute without error [1,$obj,{name=>"John",age=>39},[1,2,3]]';
+} => undef, 'Set InsaneAttr attribute without error [1,$obj,{name=>"John",age=>39},[1,2,3]]');
 
-lives_ok sub {
+is( exception {
     $obj->InsaneAttr([1,$obj,{name=>"John",age=>39}]);
-} => 'Set InsaneAttr attribute without error [1,$obj,{name=>"John",age=>39}]';
+} => undef, 'Set InsaneAttr attribute without error [1,$obj,{name=>"John",age=>39}]');
 
-throws_ok sub {
-    $obj->InsaneAttr([1,$obj,{name=>"John",age=>39},[qw/a b c/]]);   
+like( exception {
+    $obj->InsaneAttr([1,$obj,{name=>"John",age=>39},[qw/a b c/]]);
 }, qr/Attribute \(InsaneAttr\) does not pass the type constraint/
- => q{InsaneAttr correctly fails [1,$obj,{name=>"John",age=>39},[qw/a b c/]]};
+ => q{InsaneAttr correctly fails [1,$obj,{name=>"John",age=>39},[qw/a b c/]]});
 
-throws_ok sub {
-    $obj->InsaneAttr([1,"hello",{name=>"John",age=>39,gender=>undef},[1,2,3]]);   
+like( exception {
+    $obj->InsaneAttr([1,"hello",{name=>"John",age=>39,gender=>undef},[1,2,3]]);
 }, qr/Attribute \(InsaneAttr\) does not pass the type constraint/
- => q{InsaneAttr correctly fails [1,"hello",{name=>"John",age=>39,gender=>undef},[1,2,3]]};
- 
+ => q{InsaneAttr correctly fails [1,"hello",{name=>"John",age=>39,gender=>undef},[1,2,3]]});
+
 # Test TupleOptional1Attr
 
-lives_ok sub {
+is( exception {
     $obj->TupleOptional1Attr([1,10,"hello"]);
-} => 'Set TupleOptional1Attr attribute without error [1,10,"hello"]';
+} => undef, 'Set TupleOptional1Attr attribute without error [1,10,"hello"]');
 
-lives_ok sub {
+is( exception {
     $obj->TupleOptional1Attr([1,10,$obj]);
-} => 'Set TupleOptional1Attr attribute without error [1,10,$obj]';
+} => undef, 'Set TupleOptional1Attr attribute without error [1,10,$obj]');
 
-lives_ok sub {
+is( exception {
     $obj->TupleOptional1Attr([1,10]);
-} => 'Set TupleOptional1Attr attribute without error [1,10]';
+} => undef, 'Set TupleOptional1Attr attribute without error [1,10]');
 
-throws_ok sub {
-    $obj->TupleOptional1Attr([1,10,[1,2,3]]);    
+like( exception {
+    $obj->TupleOptional1Attr([1,10,[1,2,3]]);
 }, qr/Attribute \(TupleOptional1Attr\) does not pass the type constraint/
- => q{TupleOptional1Attr correctly fails [1,10,[1,2,3]]};
+ => q{TupleOptional1Attr correctly fails [1,10,[1,2,3]]});
 
-throws_ok sub {
-    $obj->TupleOptional1Attr([1,10,undef]);    
+like( exception {
+    $obj->TupleOptional1Attr([1,10,undef]);
 }, qr/Attribute \(TupleOptional1Attr\) does not pass the type constraint/
- => q{TupleOptional1Attr correctly fails [1,10,undef]};
- 
+ => q{TupleOptional1Attr correctly fails [1,10,undef]});
+
 # Test TupleOptional2Attr
 
-lives_ok sub {
+is( exception {
     $obj->TupleOptional2Attr([1,10,{key1=>1,key2=>$obj}]);
-} => 'Set TupleOptional2Attr attribute without error [1,10,{key1=>1,key2=>$obj}]';
+} => undef, 'Set TupleOptional2Attr attribute without error [1,10,{key1=>1,key2=>$obj}]');
 
-lives_ok sub {
+is( exception {
     $obj->TupleOptional2Attr([1,10]);
-} => 'Set TupleOptional2Attr attribute without error [1,10]'; 
+} => undef, 'Set TupleOptional2Attr attribute without error [1,10]');
 
-throws_ok sub {
-    $obj->TupleOptional2Attr([1,10,[1,2,3]]);    
+like( exception {
+    $obj->TupleOptional2Attr([1,10,[1,2,3]]);
 }, qr/Attribute \(TupleOptional2Attr\) does not pass the type constraint/
- => q{TupleOptional2Attr correctly fails [1,10,[1,2,3]]};
+ => q{TupleOptional2Attr correctly fails [1,10,[1,2,3]]});
 
-throws_ok sub {
-    $obj->TupleOptional2Attr([1,10,undef]);    
+like( exception {
+    $obj->TupleOptional2Attr([1,10,undef]);
 }, qr/Attribute \(TupleOptional2Attr\) does not pass the type constraint/
- => q{TupleOptional2Attr correctly fails [1,10,undef]};
- 
+ => q{TupleOptional2Attr correctly fails [1,10,undef]});
+
 # Test DictOptional1Attr: Dict[name=>Str, age=>Int, gender=>Optional[Gender]];
- 
-lives_ok sub {
+
+is( exception {
     $obj->DictOptional1Attr({name=>"John",age=>39,gender=>"male"});
-} => 'Set DictOptional1Attr attribute without error {name=>"John",age=>39,gender=>"male"}';
+} => undef, 'Set DictOptional1Attr attribute without error {name=>"John",age=>39,gender=>"male"}');
 
-lives_ok sub {
+is( exception {
     $obj->DictOptional1Attr({name=>"Vanessa",age=>34});
-} => 'Set DictOptional1Attr attribute without error {name=>"Vanessa",age=>34}';
+} => undef, 'Set DictOptional1Attr attribute without error {name=>"Vanessa",age=>34}');
 
-throws_ok sub {
-    $obj->DictOptional1Attr({name=>"John",age=>39,gender=>undef});    
+like( exception {
+    $obj->DictOptional1Attr({name=>"John",age=>39,gender=>undef});
 }, qr/Attribute \(DictOptional1Attr\) does not pass the type constraint/
- => q{TupleOptional2Attr correctly fails {name=>"John",age=>39,gender=>undef}};
+ => q{TupleOptional2Attr correctly fails {name=>"John",age=>39,gender=>undef}});
 
-throws_ok sub {
-    $obj->DictOptional1Attr({name=>"John",age=>39,gender=>"aaa"});    
+like( exception {
+    $obj->DictOptional1Attr({name=>"John",age=>39,gender=>"aaa"});
 }, qr/Attribute \(DictOptional1Attr\) does not pass the type constraint/
- => q{TupleOptional2Attr correctly fails {name=>"John",age=>39,gender=>"aaa"}};
+ => q{TupleOptional2Attr correctly fails {name=>"John",age=>39,gender=>"aaa"}});