X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Futf_incoming.t;h=147b222c2fa444275d4732f04fb90cfe6b2140fb;hb=0227a251f561c0a37f2487242bd590a9f87d1e8a;hp=3b8e965f2fb8fb784f4e13498b61365e01f0c5ae;hpb=c566191065a603f466e5066fdd2c0337ed080a75;p=catagits%2FCatalyst-Runtime.git diff --git a/t/utf_incoming.t b/t/utf_incoming.t index 3b8e965..147b222 100644 --- a/t/utf_incoming.t +++ b/t/utf_incoming.t @@ -3,7 +3,8 @@ use warnings; use strict; use Test::More; use HTTP::Request::Common; -use Encode 2.21 'decode_utf8', 'encode_utf8'; +use HTTP::Message::PSGI (); +use Encode 2.21 'decode_utf8', 'encode_utf8', 'encode'; use File::Spec; use JSON::MaybeXS; @@ -62,6 +63,8 @@ use JSON::MaybeXS; Test::More::is $c->req->args->[0], '♥'; Test::More::is $c->req->captures->[0], '♥'; + Test::More::is $arg, '♥'; + Test::More::is length($arg), 1, "got length of one"; $c->response->body("

This is base-link action ♥ ${\$c->req->args->[0]}

"); @@ -131,6 +134,7 @@ use JSON::MaybeXS; my $post = $c->req->body_data; Test::More::is $post->{'♥'}, '♥♥'; + Test::More::is length($post->{'♥'}), 2; $c->response->content_type('application/json'); # Encode JSON also encodes to a UTF-8 encoded, binary string. This is why we don't @@ -161,12 +165,37 @@ use JSON::MaybeXS; $c->response->body(Compress::Zlib::memGzip(Encode::encode_utf8("manual_1 ♥"))); } + sub override_encoding :Local { + my ($self, $c) = @_; + $c->res->content_type('text/plain'); + $c->encoding(Encode::find_encoding('UTF-8')); + $c->encoding(Encode::find_encoding('Shift_JIS')); + $c->response->body("テスト"); + } + + sub stream_write_error :Local { + my ($self, $c) = @_; + $c->response->content_type('text/html'); + $c->response->write("

This is stream_write action ♥

"); + $c->encoding(Encode::find_encoding('Shift_JIS')); + $c->response->write("

This is stream_write action ♥

"); + } + + sub from_external_psgi :Local { + my ($self, $c) = @_; + my $env = HTTP::Message::PSGI::req_to_psgi( HTTP::Request::Common::GET '/root/♥'); + $c->res->from_psgi_response( ref($c)->to_app->($env)); + } + + sub echo_arg :Local { + my ($self, $c) = @_; + $c->response->content_type('text/plain'); + $c->response->body($c->req->body_parameters->{arg}); + } + package MyApp; use Catalyst; - # Default encoding is now UTF-8 - # MyApp->config(encoding=>'UTF-8'); - Test::More::ok(MyApp->setup, 'setup app'); } @@ -268,6 +297,11 @@ use Catalyst::Test 'MyApp'; is $c->req->query_parameters->{'♥'}, '♥♥'; is $c->req->body_parameters->{'♥'}, '♥♥'; is $c->req->parameters->{'♥'}[0], '♥♥'; #combined with query and body + is $c->req->args->[0], '♥'; + is length($c->req->parameters->{'♥'}[0]), 2; + is length($c->req->query_parameters->{'♥'}), 2; + is length($c->req->body_parameters->{'♥'}), 2; + is length($c->req->args->[0]), 1; is $res->content_charset, 'UTF-8'; } } @@ -351,6 +385,17 @@ use Catalyst::Test 'MyApp'; } { + ok my $res = request "/root/override_encoding"; + ok my $enc = Encode::find_encoding('SHIFT_JIS'); + + is $res->code, 200, 'OK'; + is $enc->decode($res->content), "テスト", 'correct body'; + is $res->content_length, 6, 'correct length'; # Bytes over the wire + is length($enc->decode($res->content)), 3; + is $res->content_charset, 'SHIFT_JIS'; +} + +{ my $res = request "/root/manual_1"; is $res->code, 200, 'OK'; @@ -372,6 +417,52 @@ SKIP: { is $res->content_charset, 'UTF-8'; } +{ + my $res = request "/root/stream_write_error"; + + is $res->code, 200, 'OK'; + like decode_utf8($res->content), qr[

This is stream_write action ♥

code, 200, 'OK'; + is decode_utf8($res->content), '

This is path-heart action ♥

', 'correct body'; + is $res->content_length, 36, 'correct length'; + is $res->content_charset, 'UTF-8'; +} + +{ + my $utf8 = 'test ♥'; + my $shiftjs = 'test テスト'; + + ok my $req = POST '/root/echo_arg', + Content_Type => 'form-data', + Content => [ + arg0 => 'helloworld', + arg1 => [ + undef, '', + 'Content-Type' =>'text/plain; charset=UTF-8', + 'Content' => Encode::encode('UTF-8', $utf8)], + arg2 => [ + undef, '', + 'Content-Type' =>'text/plain; charset=SHIFT_JIS', + 'Content' => Encode::encode('SHIFT_JIS', $shiftjs)], + arg2 => [ + undef, '', + 'Content-Type' =>'text/plain; charset=SHIFT_JIS', + 'Content' => Encode::encode('SHIFT_JIS', $shiftjs)], + ]; + + my ($res, $c) = ctx_request $req; + + is $c->req->body_parameters->{'arg0'}, 'helloworld'; + is Encode::decode('UTF-8', $c->req->body_parameters->{'arg1'}), $utf8; + is Encode::decode('SHIFT_JIS', $c->req->body_parameters->{'arg2'}[0]), $shiftjs; + +} + ## should we use binmode on filehandles to force the encoding...? ## Not sure what else to do with multipart here, if docs are enough...