From: Guillermo Roditi Date: Mon, 23 Jun 2008 21:18:56 +0000 (+0000) Subject: Fix tests that were testing object internals instead of accessors. X-Git-Tag: 5.8000_03~101 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=8e061fef6ed2e38808032cbb722098c5c183ec03 Fix tests that were testing object internals instead of accessors. r17795@martha (orig r7726): konobi | 2008-05-08 15:10:48 -0400 --- diff --git a/t/live_engine_request_uploads.t b/t/live_engine_request_uploads.t index d2e95ab..88668fa 100644 --- a/t/live_engine_request_uploads.t +++ b/t/live_engine_request_uploads.t @@ -60,7 +60,7 @@ use HTTP::Request::Common; my $disposition = $part->header('Content-Disposition'); my %parameters = @{ ( split_header_words($disposition) )[0] }; - my $upload = $creq->{uploads}->{ $parameters{filename} }; + my $upload = $creq->uploads->{ $parameters{filename} }; isa_ok( $upload, 'Catalyst::Request::Upload' ); @@ -68,7 +68,7 @@ use HTTP::Request::Common; is( $upload->size, length( $part->content ), 'Upload Content-Length' ); # make sure upload is accessible via legacy params->{$file} - is( $creq->{parameters}->{ $upload->filename }, + is( $creq->parameters->{ $upload->filename }, $upload->filename, 'legacy param method ok' ); ok( !-e $upload->tempname, 'Upload temp file was deleted' ); @@ -120,7 +120,7 @@ use HTTP::Request::Common; my $disposition = $part->header('Content-Disposition'); my %parameters = @{ ( split_header_words($disposition) )[0] }; - my $upload = $creq->{uploads}->{ $parameters{name} }->[$i]; + my $upload = $creq->uploads->{ $parameters{name} }->[$i]; isa_ok( $upload, 'Catalyst::Request::Upload' ); is( $upload->type, $part->content_type, 'Upload Content-Type' ); @@ -220,7 +220,7 @@ use HTTP::Request::Common; is( $creq->content_length, $request->content_length, 'Catalyst::Request Content-Length' ); - my $param = $creq->{parameters}->{testfile}; + my $param = $creq->parameters->{testfile}; ok( @$param == 2, '2 values' ); is( $param->[0], 'textfield value', 'correct value' ); @@ -233,7 +233,7 @@ use HTTP::Request::Common; next unless exists $parameters{filename}; - my $upload = $creq->{uploads}->{ $parameters{name} }; + my $upload = $creq->uploads->{ $parameters{name} }; isa_ok( $upload, 'Catalyst::Request::Upload' ); diff --git a/t/live_engine_request_uri.t b/t/live_engine_request_uri.t index cecab6c..01a19fa 100644 --- a/t/live_engine_request_uri.t +++ b/t/live_engine_request_uri.t @@ -62,8 +62,8 @@ SKIP: ok( my $response = request('http://localhost/engine/request/uri?a=1;a=2;b=3'), 'Request' ); ok( $response->is_success, 'Response Successful 2xx' ); ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' ); - is( $creq->{uri}->query, 'a=1;a=2;b=3', 'Query string ok' ); - is_deeply( $creq->{parameters}, $parameters, 'Parameters ok' ); + is( $creq->uri->query, 'a=1;a=2;b=3', 'Query string ok' ); + is_deeply( $creq->parameters, $parameters, 'Parameters ok' ); } # test that query params are unescaped properly @@ -71,8 +71,8 @@ SKIP: ok( my $response = request('http://localhost/engine/request/uri?text=Catalyst%20Rocks'), 'Request' ); ok( $response->is_success, 'Response Successful 2xx' ); ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' ); - is( $creq->{uri}->query, 'text=Catalyst%20Rocks', 'Query string ok' ); - is( $creq->{parameters}->{text}, 'Catalyst Rocks', 'Unescaped param ok' ); + is( $creq->uri->query, 'text=Catalyst%20Rocks', 'Query string ok' ); + is( $creq->parameters->{text}, 'Catalyst Rocks', 'Unescaped param ok' ); } # test that uri_with adds params