Loading t/20-vrr.t +66 −105 Original line number Diff line number Diff line Loading @@ -28,9 +28,7 @@ sub efa_conf { } sub efa_new { return new_ok( 'Travel::Routing::DE::VRR' => [%{efa_conf(@_)}] ); return new_ok( 'Travel::Routing::DE::VRR' => [ %{ efa_conf(@_) } ] ); } sub is_efa_post { Loading @@ -40,14 +38,16 @@ sub is_efa_post { my $ok = 1; is_deeply( $efa->{'config'}, efa_conf([$ck, $cv]), $efa->{'config'}, efa_conf( [ $ck, $cv ] ), "$ck => $cv: conf ok", ); foreach my $ref (@post) { my ( $key, $value ) = @{$ref}; if (not defined $efa->{'post'}->{"key"} and not defined $value) { if ( not defined $efa->{'post'}->{"key"} and not defined $value ) { next; } if ( $efa->{'post'}->{"$key"} ne $value ) { Loading @@ -55,17 +55,16 @@ sub is_efa_post { last; } } ok( $ok, "$ck => $cv: POST okay", ); ok( $ok, "$ck => $cv: POST okay", ); } sub is_efa_err { my ( $ck, $cv, $exception ) = @_; isa_ok( exception { Travel::Routing::DE::VRR->new(%{efa_conf([$ck, $cv])}) }, exception { Travel::Routing::DE::VRR->new( %{ efa_conf( [ $ck, $cv ] ) } ) }, $exception, "$ck => $cv" ); Loading @@ -76,14 +75,16 @@ is_efa_post('ignored', 'ignored'); my $efa; is_efa_post( 'via', ['MH', 'HBf'], 'via', [ 'MH', 'HBf' ], [ 'place_via', 'MH' ], [ 'name_via', 'HBf' ], [ 'type_via', 'stop' ], ); is_efa_post( 'origin', ['D', 'Fuerstenwall 232', 'address'], 'origin', [ 'D', 'Fuerstenwall 232', 'address' ], [ 'place_origin', 'D' ], [ 'name_origin', 'Fuerstenwall 232' ], [ 'type_origin', 'address' ], Loading Loading @@ -117,10 +118,7 @@ is_efa_post( [ 'itdDateYear', ( localtime(time) )[5] + 1900 ], ); is_efa_post( 'exclude', [qw[zug]], ['inclMOT_0', undef], ); is_efa_post( 'exclude', [qw[zug]], [ 'inclMOT_0', undef ], ); is_efa_post( 'exclude', [qw[stadtbus schiff ast]], Loading @@ -129,92 +127,55 @@ is_efa_post( [ 'inclMOT_10', undef ], ); is_efa_post( 'select_interchange_by', 'speed', ['routeType', 'LEASTTIME'], ); is_efa_post( 'select_interchange_by', 'speed', [ 'routeType', 'LEASTTIME' ], ); is_efa_post( 'select_interchange_by', 'waittime', is_efa_post( 'select_interchange_by', 'waittime', [ 'routeType', 'LEASTINTERCHANGE' ], ); is_efa_post( 'select_interchange_by', 'distance', is_efa_post( 'select_interchange_by', 'distance', [ 'routeType', 'LEASTWALKING' ], ); is_efa_post( 'train_type', 'local', ['lineRestriction', 403], ); is_efa_post( 'train_type', 'local', [ 'lineRestriction', 403 ], ); is_efa_post( 'train_type', 'ic', ['lineRestriction', 401], ); is_efa_post( 'train_type', 'ic', [ 'lineRestriction', 401 ], ); is_efa_post( 'train_type', 'ice', ['lineRestriction', 400], ); is_efa_post( 'train_type', 'ice', [ 'lineRestriction', 400 ], ); is_efa_post( 'walk_speed', 'normal', ['changeSpeed', 'normal'], ); is_efa_post( 'walk_speed', 'normal', [ 'changeSpeed', 'normal' ], ); is_efa_post( 'max_interchanges', 5, ['maxChanges', 5], ); is_efa_post( 'max_interchanges', 5, [ 'maxChanges', 5 ], ); is_efa_post( 'use_near_stops', 1, ['useProxFootSearch', 1], ); is_efa_post( 'use_near_stops', 1, [ 'useProxFootSearch', 1 ], ); is_efa_post( 'with_bike', 1, ['bikeTakeAlong', 1], ); is_efa_post( 'with_bike', 1, [ 'bikeTakeAlong', 1 ], ); is_efa_err( 'departure_time', '37:00', is_efa_err( 'departure_time', '37:00', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'departure_time', '07', is_efa_err( 'departure_time', '07', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'train_type', 'invalid', is_efa_err( 'train_type', 'invalid', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'walk_speed', 'invalid', is_efa_err( 'walk_speed', 'invalid', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'select_interchange_by', 'invalid', is_efa_err( 'select_interchange_by', 'invalid', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'exclude', [qw[sonstige invalid]], is_efa_err( 'exclude', [qw[sonstige invalid]], 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'date', '42.5.2003', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'date', '42.5.2003', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'date', '7.', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'date', '7.', 'Travel::Routing::DE::EFA::Exception::Setup', ); Loading
t/20-vrr.t +66 −105 Original line number Diff line number Diff line Loading @@ -28,9 +28,7 @@ sub efa_conf { } sub efa_new { return new_ok( 'Travel::Routing::DE::VRR' => [%{efa_conf(@_)}] ); return new_ok( 'Travel::Routing::DE::VRR' => [ %{ efa_conf(@_) } ] ); } sub is_efa_post { Loading @@ -40,14 +38,16 @@ sub is_efa_post { my $ok = 1; is_deeply( $efa->{'config'}, efa_conf([$ck, $cv]), $efa->{'config'}, efa_conf( [ $ck, $cv ] ), "$ck => $cv: conf ok", ); foreach my $ref (@post) { my ( $key, $value ) = @{$ref}; if (not defined $efa->{'post'}->{"key"} and not defined $value) { if ( not defined $efa->{'post'}->{"key"} and not defined $value ) { next; } if ( $efa->{'post'}->{"$key"} ne $value ) { Loading @@ -55,17 +55,16 @@ sub is_efa_post { last; } } ok( $ok, "$ck => $cv: POST okay", ); ok( $ok, "$ck => $cv: POST okay", ); } sub is_efa_err { my ( $ck, $cv, $exception ) = @_; isa_ok( exception { Travel::Routing::DE::VRR->new(%{efa_conf([$ck, $cv])}) }, exception { Travel::Routing::DE::VRR->new( %{ efa_conf( [ $ck, $cv ] ) } ) }, $exception, "$ck => $cv" ); Loading @@ -76,14 +75,16 @@ is_efa_post('ignored', 'ignored'); my $efa; is_efa_post( 'via', ['MH', 'HBf'], 'via', [ 'MH', 'HBf' ], [ 'place_via', 'MH' ], [ 'name_via', 'HBf' ], [ 'type_via', 'stop' ], ); is_efa_post( 'origin', ['D', 'Fuerstenwall 232', 'address'], 'origin', [ 'D', 'Fuerstenwall 232', 'address' ], [ 'place_origin', 'D' ], [ 'name_origin', 'Fuerstenwall 232' ], [ 'type_origin', 'address' ], Loading Loading @@ -117,10 +118,7 @@ is_efa_post( [ 'itdDateYear', ( localtime(time) )[5] + 1900 ], ); is_efa_post( 'exclude', [qw[zug]], ['inclMOT_0', undef], ); is_efa_post( 'exclude', [qw[zug]], [ 'inclMOT_0', undef ], ); is_efa_post( 'exclude', [qw[stadtbus schiff ast]], Loading @@ -129,92 +127,55 @@ is_efa_post( [ 'inclMOT_10', undef ], ); is_efa_post( 'select_interchange_by', 'speed', ['routeType', 'LEASTTIME'], ); is_efa_post( 'select_interchange_by', 'speed', [ 'routeType', 'LEASTTIME' ], ); is_efa_post( 'select_interchange_by', 'waittime', is_efa_post( 'select_interchange_by', 'waittime', [ 'routeType', 'LEASTINTERCHANGE' ], ); is_efa_post( 'select_interchange_by', 'distance', is_efa_post( 'select_interchange_by', 'distance', [ 'routeType', 'LEASTWALKING' ], ); is_efa_post( 'train_type', 'local', ['lineRestriction', 403], ); is_efa_post( 'train_type', 'local', [ 'lineRestriction', 403 ], ); is_efa_post( 'train_type', 'ic', ['lineRestriction', 401], ); is_efa_post( 'train_type', 'ic', [ 'lineRestriction', 401 ], ); is_efa_post( 'train_type', 'ice', ['lineRestriction', 400], ); is_efa_post( 'train_type', 'ice', [ 'lineRestriction', 400 ], ); is_efa_post( 'walk_speed', 'normal', ['changeSpeed', 'normal'], ); is_efa_post( 'walk_speed', 'normal', [ 'changeSpeed', 'normal' ], ); is_efa_post( 'max_interchanges', 5, ['maxChanges', 5], ); is_efa_post( 'max_interchanges', 5, [ 'maxChanges', 5 ], ); is_efa_post( 'use_near_stops', 1, ['useProxFootSearch', 1], ); is_efa_post( 'use_near_stops', 1, [ 'useProxFootSearch', 1 ], ); is_efa_post( 'with_bike', 1, ['bikeTakeAlong', 1], ); is_efa_post( 'with_bike', 1, [ 'bikeTakeAlong', 1 ], ); is_efa_err( 'departure_time', '37:00', is_efa_err( 'departure_time', '37:00', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'departure_time', '07', is_efa_err( 'departure_time', '07', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'train_type', 'invalid', is_efa_err( 'train_type', 'invalid', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'walk_speed', 'invalid', is_efa_err( 'walk_speed', 'invalid', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'select_interchange_by', 'invalid', is_efa_err( 'select_interchange_by', 'invalid', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'exclude', [qw[sonstige invalid]], is_efa_err( 'exclude', [qw[sonstige invalid]], 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'date', '42.5.2003', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'date', '42.5.2003', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'date', '7.', 'Travel::Routing::DE::EFA::Exception::Setup', ); is_efa_err( 'date', '7.', 'Travel::Routing::DE::EFA::Exception::Setup', );