From: John Napiorkowski Date: Wed, 30 Jun 2010 16:01:44 +0000 (-0400) Subject: shut up the test eol complaints X-Git-Tag: 0.23~9 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMooseX-Types-Structured.git;a=commitdiff_plain;h=9eb6e8c6a5da5d60eb1986db304565b8ea826aed shut up the test eol complaints --- diff --git a/t/10-recursion.t b/t/10-recursion.t index 2f34346..c95315c 100644 --- a/t/10-recursion.t +++ b/t/10-recursion.t @@ -13,17 +13,17 @@ BEGIN { use MooseX::Types::Structured qw(Dict Tuple); use MooseX::Types::Moose qw( Int - Str + Str ScalarRef ); use MooseX::Types -declare => [qw( Var Const Pair - Op + Op BinOp - Lambda - App + Lambda + App Expr )]; @@ -64,33 +64,33 @@ BEGIN { my ($source, $e) = @_; $e ||= {}; #use Data::Dumper; warn "run(e) => " . Dumper $e; - return match $source, - Var() => sub { $e->{ ${$_} } }, - Const() => sub { $_[0] }, - BinOp() => sub { $_->[1] eq '+' + return match $source, + Var() => sub { $e->{ ${$_} } }, + Const() => sub { $_[0] }, + BinOp() => sub { $_->[1] eq '+' ? ( run( $_->[0], $e ) + run( $_->[2], $e ) ) - : ( run( $_->[0], $e ) - run( $_->[2], $e ) ) }, - Lambda() => sub { $_ }, - App() => sub { + : ( run( $_->[0], $e ) - run( $_->[2], $e ) ) }, + Lambda() => sub { $_ }, + App() => sub { my ( $p, $body ) = @{ run( $_[0]->[0], $e ) }; $e->{ ${ $p } } = run( $_[0]->[1], $e ); run( $body, $e ); - }, - Pair() => sub { $_ }, + }, + Pair() => sub { $_ }, Expr() => sub { run($_, $e) }, sub { confess "[run] Bad Source:" . Dumper $_ }; } sub pprint { my ($source) = @_; - return match $source, - Var() => sub { 'Var(' . ${$_} . ')' }, - Op() => sub { 'Op(' . $_ . ')' }, - Const() => sub { 'Const(' . $_ . ')' }, + return match $source, + Var() => sub { 'Var(' . ${$_} . ')' }, + Op() => sub { 'Op(' . $_ . ')' }, + Const() => sub { 'Const(' . $_ . ')' }, BinOp() => sub { 'BinOp( ' . ( join ' ' => map { pprint($_) } @{$_} ) . ' )' }, Lambda() => sub { "Lambda( " . pprint($_->[0]) . ' ' . pprint($_->[1]) . " )" }, - App() => sub { "App( " . pprint($_->[0]) . ' ' . pprint($_->[1]) . " )" }, - Pair() => sub { 'Pair(' . pprint($_->[0]) . ' => ' . pprint($_->[1]) . ')' }, + App() => sub { "App( " . pprint($_->[0]) . ' ' . pprint($_->[1]) . " )" }, + Pair() => sub { 'Pair(' . pprint($_->[0]) . ' => ' . pprint($_->[1]) . ')' }, Expr() => sub { pprint($_) }, sub { confess "[pprint] Bad Source:" . Dumper $_ }; } @@ -100,28 +100,28 @@ BEGIN { BEGIN { Interpreter->import(':all') }; ok is_Var(\'x'), q{passes is_Var('x')}; - + ok is_Const(1), q{passes is_Const(1)}; ok is_Const('Hello World'), q{passes is_Const}; - - ok is_Pair([ 'Hello', 'World' ]), q{passes is_Pair}; - ok is_Pair([ \'Hello', 'World' ]), q{passes is_Pair}; - ok is_Pair([ \'Hello', 100 ]), q{passes is_Pair}; - ok is_Pair([ \'Hello', [ 1, '+', 1] ]), q{passes is_Pair}; + + ok is_Pair([ 'Hello', 'World' ]), q{passes is_Pair}; + ok is_Pair([ \'Hello', 'World' ]), q{passes is_Pair}; + ok is_Pair([ \'Hello', 100 ]), q{passes is_Pair}; + ok is_Pair([ \'Hello', [ 1, '+', 1] ]), q{passes is_Pair}; ok is_Op('+'), q{passes is_Op('+')}; ok is_Op('-'), q{passes is_Op('-')}; ok is_BinOp([ 1, '+', 1]), q{passes is_BinOp([ 1, '+', 1])}; ok is_BinOp([ '+', '+', '+' ]), q{passes is_BinOp([ '+', '+', '+' ])}; - ok is_BinOp([ 1, '+', [ 1, '+', 1 ]]), q{passes is_BinOp([ 1, '+', 1])}; - - ok is_Lambda([ \'x', [ \'x', '+', \'x' ]]), q{passes is_Lambda}; - ok is_App([ [ \'x', [ \'x', '+', \'x' ]], 10 ]), q{passes is_App}; + ok is_BinOp([ 1, '+', [ 1, '+', 1 ]]), q{passes is_BinOp([ 1, '+', 1])}; + + ok is_Lambda([ \'x', [ \'x', '+', \'x' ]]), q{passes is_Lambda}; + ok is_App([ [ \'x', [ \'x', '+', \'x' ]], 10 ]), q{passes is_App}; ok Expr->check([ 11, '+', 12]), '... check is supported'; ok is_Expr(\'x'), q{passes is_Expr(\'x')}; - ok is_Expr(10), q{passes is_Expr(10)}; + ok is_Expr(10), q{passes is_Expr(10)}; ok is_Expr([ 1, '+', 1]), q{passes is_Expr([ 1, '+', 1])}; ok is_Expr([ 1, '+', [ 1, '+', 1 ]]), q{passes is_Expr([ 1, '+', [ 1, '+', 1 ]])}; @@ -130,24 +130,24 @@ BEGIN { is Interpreter::pprint($source), 'App( Lambda( Var(x) BinOp( Var(x) Op(+) Var(x) ) ) Const(10) )', '... pretty printed correctly'; - - is Interpreter::run([ 1, '+', 1 ]), 2, '... eval-ed correctly'; - - is Interpreter::run([ 1, '+', [ 1, '+', 1 ] ]), 3, '... eval-ed correctly'; - + + is Interpreter::run([ 1, '+', 1 ]), 2, '... eval-ed correctly'; + + is Interpreter::run([ 1, '+', [ 1, '+', 1 ] ]), 3, '... eval-ed correctly'; + is_deeply Interpreter::run([ \'x', [ \'x', '+', \'x' ]]), [ \'x', [ \'x', '+', \'x' ]], - '... eval-ed correctly'; - - is Interpreter::run($source), 20, '... eval-ed correctly'; - + '... eval-ed correctly'; + + is Interpreter::run($source), 20, '... eval-ed correctly'; + is Interpreter::run( [ [ \'x', [ \'x', '+', \'x' ] ], [ 2, '+', 2 ] ] - ), 8, '... eval-ed correctly'; - + ), 8, '... eval-ed correctly'; + } diff --git a/t/11-overflow.t b/t/11-overflow.t index 6a16706..8aec1b1 100644 --- a/t/11-overflow.t +++ b/t/11-overflow.t @@ -36,32 +36,3 @@ ok !$hash_tailed_dict->check([]), 'correct fail'; ok $hash_tailed_dict->check({name=>'Vanessa Li', age=>35, more1=>1,more2=>2}), 'correct pass with tail'; ok !$hash_tailed_dict->check({name=>'Vanessa Li', age=>35, more1=>1,more2=>"aa"}), 'correct fail with tail'; -__END__ - -my $hash_tailed_tuple = - subtype 'hash_tailed_tuple', - as Tuple[ - Int, - Str, - slurpy HashRef[Int], - ]; - -ok !$hash_tailed_tuple->check(['ss',1]), 'correct fail'; -ok $hash_tailed_tuple->check([1,'ss']), 'correct pass'; -ok !$hash_tailed_tuple->check({}), 'correct fail'; -ok $hash_tailed_tuple->check([1,'hello',age=>25,zip=>10533]), 'correct pass with tail'; -ok !$hash_tailed_tuple->check([1,'hello',age=>25,name=>'john']), 'correct fail with tail'; - -my $array_tailed_dict = - subtype 'hash_tailed_dict', - as Dict[ - name=>Str, - age=>Int, - slurpy ArrayRef[Int], - ]; - -ok !$array_tailed_dict->check({name=>'john',age=>'napiorkowski'}), 'correct fail'; -ok $array_tailed_dict->check({name=>'Vanessa Li', age=>35}), 'correct pass'; -ok !$array_tailed_dict->check([]), 'correct fail'; -ok $array_tailed_dict->check({name=>'Vanessa Li', age=>35, 1,2,3}), 'correct pass with tail'; -ok !$array_tailed_dict->check({name=>'Vanessa Li', age=>35, 1, "hello"}), 'correct fail with tail'; diff --git a/t/12-error.t b/t/12-error.t index fbdfcb4..e253c78 100644 --- a/t/12-error.t +++ b/t/12-error.t @@ -29,7 +29,7 @@ like $simple_tuple->validate({a=>1,b=>2}), like $simple_tuple->validate(['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/, 'Correctly failed due to object not a Str'; @@ -47,11 +47,11 @@ like $simple_tuple->validate([1,'hello','too many']), like $simple_dict->validate([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/, 'Correctly failed due to age not an Int'; - + like $simple_dict->validate({name=>$simple_dict,age=>1}), qr/with value { age: 1, name: MooseX:/, 'Correctly failed due to object not a Str'; @@ -63,12 +63,12 @@ like $simple_dict->validate({name=>'John'}), 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 }/, 'Wrong basic type'; @@ -76,7 +76,7 @@ like $simple_dict->validate({name=>'Vincent', age=>15,extra=>'morethanIneed'}), 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([1,$simple_tuple]), qr/failed for 'MooseX::Types::Structured::Optional\[Str\]' with value MooseX/, 'Correctly failed due to object not a Str'; @@ -88,11 +88,11 @@ like $optional_tuple->validate([1,'hello','too many']), like $optional_dict->validate([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/, 'Correctly failed due to age not an Int'; - + like $optional_dict->validate({name=>$simple_dict,age=>1}), qr/with value { age: 1, name: MooseX:/, 'Correctly failed due to object not a Str'; @@ -100,7 +100,7 @@ like $optional_dict->validate({name=>$simple_dict,age=>1}), 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 +112,14 @@ 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'; - + ## Success Tests... ok !$deep_tuple->validate([1,{a=>2},{name=>'John',age=>40}]), 'Validates ok'; diff --git a/t/regressions/01-is_type_of.t b/t/regressions/01-is_type_of.t index c9f6c49..60788fe 100644 --- a/t/regressions/01-is_type_of.t +++ b/t/regressions/01-is_type_of.t @@ -9,7 +9,7 @@ BEGIN { use MooseX::Types::Structured qw(Dict Tuple); use MooseX::Types::Moose qw(Int Str Item); use MooseX::Types -declare => [qw( - MyDict1 MyDict2 MyDict4 + MyDict1 MyDict2 MyDict4 )]; subtype MyDict1,