fix for new moose

[gitmo/MooseX-Types-Structured.git] / t / 12-error.t

diff --git a/t/12-error.t b/t/12-error.t
index fcd29dc..0edf798 100644 (file)
--- a/t/12-error.t
+++ b/t/12-error.t
@@ -1,8 +1,6 @@
-BEGIN {
-       use strict;
-       use warnings;
-       use Test::More tests=>25;
-}
+use strict;
+use warnings;
+use Test::More;
 
 use Moose::Util::TypeConstraints;
 use MooseX::Types::Structured qw(Dict Tuple Optional);
@@ -23,19 +21,19 @@ ok !$simple_dict->check({name=>$simple_dict,age=>'hello'}), "simple_dict fails:
 ## Let's check all the expected validation errors for tuple
 
 like $simple_tuple->validate({a=>1,b=>2}),
- qr/Validation failed for 'simple_tuple' with value { a: 1, b: 2 }/,
+ qr/Validation failed for 'simple_tuple' with value .*{ a: 1, b: 2 }/,
  'Wrong basic type';
 
 like $simple_tuple->validate(['a','b']),
- qr/failed for 'simple_tuple' with value \[ "a", "b" \]/,
+ qr/failed for 'simple_tuple' with value .*\[ "a", "b" \]/,
  'Correctly failed due to "a" not an Int';
- 
+
 like $simple_tuple->validate([1,$simple_tuple]),
- qr/Validation failed for 'simple_tuple' with value \[ 1, MooseX::Meta::TypeConstraint::Structured/,
+ qr/Validation failed for 'simple_tuple' with value .*\[ 1, MooseX::Meta::TypeConstraint::Structured/,
  'Correctly failed due to object not a Str';
 
 like $simple_tuple->validate([1]),
- qr/Validation failed for 'Str' with value NULL/,
+ qr/Validation failed for 'Str' with value .*NULL/,
  'Not enought values';
 
 like $simple_tuple->validate([1,'hello','too many']),
@@ -45,40 +43,40 @@ like $simple_tuple->validate([1,'hello','too many']),
 ## And the same thing for dicts [name=>Str,age=>Int]
 
 like $simple_dict->validate([1,2]),
- qr/ with value \[ 1, 2 \]/,
+ qr/ with value .*\[ 1, 2 \]/,
  'Wrong basic type';
- 
-like $simple_dict->validate({name=>'John',age=>'a'}),
- qr/failed for 'Int' with value a/,
+
+like $simple_dict->validate({name=>'John',age=>'foobar'}),
+ qr/failed for 'Int' with value .*foobar/,
  'Correctly failed due to age not an Int';
- 
+
 like $simple_dict->validate({name=>$simple_dict,age=>1}),
- qr/with value { age: 1, name: MooseX:/,
+ qr/with value .*{ age: 1, name: MooseX:/,
  'Correctly failed due to object not a Str';
 
 like $simple_dict->validate({name=>'John'}),
- qr/failed for 'Int' with value NULL/,
+ qr/failed for 'Int' with value .*NULL/,
  'Not enought values';
 
 like $simple_dict->validate({name=>'Vincent', age=>15,extra=>'morethanIneed'}),
  qr/More values than Type Constraints!/,
  'Too Many values';
- 
+
  ## TODO some with Optional (or Maybe) and slurpy
- 
+
  my $optional_tuple = subtype 'optional_tuple', as Tuple[Int,Optional[Str]];
  my $optional_dict = subtype 'optional_dict', as Dict[name=>Str,age=>Optional[Int]];
- 
+
  like $optional_tuple->validate({a=>1,b=>2}),
- qr/Validation failed for 'optional_tuple' with value { a: 1, b: 2 }/,
+ qr/Validation failed for 'optional_tuple' with value .*{ a: 1, b: 2 }/,
  'Wrong basic type';
 
-like $optional_tuple->validate(['a','b']),
- qr/failed for 'Int' with value a/,
- 'Correctly failed due to "a" not an Int';
- 
+like $optional_tuple->validate(['baz','b']),
+ qr/failed for 'Int' with value .*baz/,
+ 'Correctly failed due to "baz" not an Int';
+
 like $optional_tuple->validate([1,$simple_tuple]),
- qr/failed for 'MooseX::Types::Structured::Optional\[Str\]' with value MooseX/,
+ qr/failed for 'Optional\[Str\]' with value .*MooseX/,
  'Correctly failed due to object not a Str';
 
 like $optional_tuple->validate([1,'hello','too many']),
@@ -86,21 +84,21 @@ like $optional_tuple->validate([1,'hello','too many']),
  'Too Many values';
 
 like $optional_dict->validate([1,2]),
- qr/ with value \[ 1, 2 \]/,
+ qr/ with value .*\[ 1, 2 \]/,
  'Wrong basic type';
- 
-like $optional_dict->validate({name=>'John',age=>'a'}),
- qr/Validation failed for 'MooseX::Types::Structured::Optional\[Int\]' with value a/,
+
+like $optional_dict->validate({name=>'John',age=>'quux'}),
+ qr/Validation failed for 'Optional\[Int\]' with value .*quux/,
  'Correctly failed due to age not an Int';
- 
+
 like $optional_dict->validate({name=>$simple_dict,age=>1}),
- qr/with value { age: 1, name: MooseX:/,
+ qr/with value .*{ age: 1, name: MooseX:/,
  'Correctly failed due to object not a Str';
 
 like $optional_dict->validate({name=>'Vincent', age=>15,extra=>'morethanIneed'}),
  qr/More values than Type Constraints!/,
  'Too Many values';
- 
+
 ## Deeper constraints
 
 my $deep_tuple = subtype 'deep_tuple',
@@ -112,14 +110,27 @@ my $deep_tuple = subtype 'deep_tuple',
       age=>Int,
     ],
   ];
-  
+
 ok $deep_tuple->check([1,{a=>2},{name=>'Vincent',age=>15}]),
   'Good Constraint';
-  
-like $deep_tuple->validate([1,{a=>2},{name=>'Vincent',age=>'Hello'}]),
-  qr/Error is: Validation failed for 'MooseX::Types::Structured::Dict\[name,Str,age,Int\]'/,
-  'Example deeper error';
-  
+
+{
+    my $message = $deep_tuple->validate([1,{a=>2},{name=>'Vincent',age=>'Hello'}]);
+    like $message,
+      qr/Validation failed for 'Dict\[name,Str,age,Int\]'/,
+      'Example deeper error';
+}
+
+like $simple_tuple->validate(["aaa","bbb"]),
+  qr/'Int' with value .*aaa/,
+  'correct deeper error';
+
+like $deep_tuple->validate([1,{a=>2},{name=>'Vincent1',age=>'Hello1'}]),
+  qr/'Int' with value .*Hello1/,
+  'correct deeper error';
+
 ## Success Tests...
 
 ok !$deep_tuple->validate([1,{a=>2},{name=>'John',age=>40}]), 'Validates ok';
+
+done_testing();