X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02-tuple.t;h=1acd9509435523a60f95f32f61bf94b7ccdd8988;hb=15404f7d7c05be18da6c04ac847ceac45c406b7c;hp=b214f9a5b519be8b09a3cd09f52e467459766187;hpb=a30fa8914f1b06d293d2cc743bd75c2de3e157f4;p=gitmo%2FMooseX-Types-Structured.git

diff --git a/t/02-tuple.t b/t/02-tuple.t
index b214f9a..1acd950 100644
--- a/t/02-tuple.t
+++ b/t/02-tuple.t
@@ -1,7 +1,7 @@
 BEGIN {
 	use strict;
 	use warnings;
-	use Test::More tests=>26;
+	use Test::More tests=>32;
 	use Test::Exception;
 }
 
@@ -11,12 +11,23 @@ BEGIN {
     use Moose;
     use MooseX::Types::Structured qw(Tuple);
 	use MooseX::Types::Moose qw(Int Str Object ArrayRef HashRef Maybe);
-	use MooseX::Types -declare => [qw(MyString)];
+	use MooseX::Types -declare => [qw(MyString MoreThanFive FiveByFive MyArrayRefMoreThanTwoInt)];
 	
     subtype MyString,
-     as 'Str',
+     as Str,
      where { $_=~m/abc/};
      
+    subtype MoreThanFive,
+     as Int,
+     where { $_ > 5};
+     
+    subtype MyArrayRefMoreThanTwoInt,
+     as ArrayRef[MoreThanFive],
+     where { scalar @$_ > 2 };
+     
+    subtype FiveByFive,
+     as Tuple[MoreThanFive, MyArrayRefMoreThanTwoInt];
+     
     #use Data::Dump qw/dump/; warn dump Tuple;
 
     has 'tuple' => (is=>'rw', isa=>Tuple[Int, Str, MyString]);
@@ -26,6 +37,7 @@ BEGIN {
 	has 'tuple_with_union' => (is=>'rw', isa=>Tuple[Int,Str,Int|Object,Int]);
 	has 'tuple2' => (is=>'rw', isa=>Tuple[Int,Str,Int]);
 	has 'tuple_with_parameterized' => (is=>'rw', isa=>Tuple[Int,Str,Int,ArrayRef[Int]]);
+    has 'FiveByFiveAttr' => (is=>'rw', isa=>FiveByFive);
 }
 
 ## Instantiate a new test object
@@ -91,10 +103,13 @@ lives_ok sub {
     $record->tuple_with_maybe2([1,'hello',undef]);
 } => 'Set tuple attribute without error skipping optional parameter';
 
-throws_ok sub {
-    $record->tuple_with_maybe2([1,'hello']);
-}, qr/Attribute \(tuple_with_maybe2\) does not pass the type constraint/
- => 'Properly fails for missing maybe (needs to be at least undef)';
+SKIP: {
+    skip 'Core Maybe incorrectly allows null.', 1, 1;
+    throws_ok sub {
+        $record->tuple_with_maybe2([1,'hello']);
+    }, qr/Attribute \(tuple_with_maybe2\) does not pass the type constraint/
+     => 'Properly fails for missing maybe (needs to be at least undef)';
+}
 
 ## Test Tuple with parameterized type
 
@@ -149,3 +164,35 @@ throws_ok sub {
 	$record->tuple_with_parameterized([1,'hello',3,[1,2,'world']]);
 }, qr/Attribute \(tuple_with_parameterized\) does not pass the type constraint/
  => "[1,'hello',3,[1,2,'world']] properly fails";
+
+## Test FiveByFiveAttr
+
+lives_ok sub {
+    $record->FiveByFiveAttr([6,[7,8,9]]);
+} => 'Set FiveByFiveAttr correctly';
+
+throws_ok sub {
+    $record->FiveByFiveAttr([1,'hello', 'test']);    
+}, qr/Attribute \(FiveByFiveAttr\) does not pass the type constraint/
+ => q{Properly failed for bad value in FiveByFiveAttr [1,'hello', 'test']};
+
+throws_ok sub {
+    $record->FiveByFiveAttr([1,[8,9,10]]);    
+}, qr/Attribute \(FiveByFiveAttr\) does not pass the type constraint/
+ => q{Properly failed for bad value in FiveByFiveAttr [1,[8,9,10]]};
+ 
+throws_ok sub {
+    $record->FiveByFiveAttr([10,[11,12,0]]);    
+}, qr/Attribute \(FiveByFiveAttr\) does not pass the type constraint/
+ => q{Properly failed for bad value in FiveByFiveAttr [10,[11,12,0]]};
+ 
+throws_ok sub {
+    $record->FiveByFiveAttr([1,[1,1,0]]);    
+}, qr/Attribute \(FiveByFiveAttr\) does not pass the type constraint/
+ => q{Properly failed for bad value in FiveByFiveAttr [1,[1,1,0]]};
+
+throws_ok sub {
+    $record->FiveByFiveAttr([10,[11,12]]);    
+}, qr/Attribute \(FiveByFiveAttr\) does not pass the type constraint/
+ => q{Properly failed for bad value in FiveByFiveAttr [10,[11,12]};
+