From: Peter Rabbitson Date: Sat, 27 Jun 2009 10:39:03 +0000 (+0000) Subject: Todoified (unsolvable) test from RT#42466 X-Git-Tag: v0.08108~56 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=db087eb170266bdbd06ee1e1a3d357bba45c88c8;p=dbsrgits%2FDBIx-Class.git Todoified (unsolvable) test from RT#42466 --- diff --git a/t/85utf8.t b/t/85utf8.t index 438bd85..b9993a1 100644 --- a/t/85utf8.t +++ b/t/85utf8.t @@ -16,33 +16,23 @@ if ($] <= 5.008000) { eval 'use utf8; 1' or plan skip_all => 'Need utf8 run this test'; } -plan tests => 5; +plan tests => 6; DBICTest::Schema::CD->load_components('UTF8Columns'); DBICTest::Schema::CD->utf8_columns('title'); Class::C3->reinitialize(); -my $cd = $schema->resultset('CD')->create( { artist => 1, title => 'øni', year => 'foo' } ); +my $cd = $schema->resultset('CD')->create( { artist => 1, title => 'øni', year => '2048' } ); my $utf8_char = 'uniuni'; -if ($] <= 5.008000) { - - ok( Encode::is_utf8( $cd->title ), 'got title with utf8 flag' ); - ok( !Encode::is_utf8( $cd->year ), 'got year without utf8 flag' ); - - Encode::_utf8_on($utf8_char); - $cd->title($utf8_char); - ok( !Encode::is_utf8( $cd->{_column_data}{title} ), 'store utf8-less chars' ); -} else { +ok( _is_utf8( $cd->title ), 'got title with utf8 flag' ); +ok(! _is_utf8( $cd->year ), 'got year without utf8 flag' ); - ok( utf8::is_utf8( $cd->title ), 'got title with utf8 flag' ); - ok( !utf8::is_utf8( $cd->year ), 'got year without utf8 flag' ); +_force_utf8($utf8_char); +$cd->title($utf8_char); +ok(! _is_utf8( $cd->{_column_data}{title} ), 'store utf8-less chars' ); - utf8::decode($utf8_char); - $cd->title($utf8_char); - ok( !utf8::is_utf8( $cd->{_column_data}{title} ), 'store utf8-less chars' ); -} my $v_utf8 = "\x{219}"; @@ -53,3 +43,28 @@ ok( !$cd->is_column_changed('title'), 'column is not dirty after setting the sam $cd->update ({ title => $v_utf8 }); $cd->title('something_else'); ok( $cd->is_column_changed('title'), 'column is dirty after setting to something completely different'); + +TODO: { + local $TODO = 'There is currently no way to propagate aliases to inflate_result()'; + $cd = $schema->resultset('CD')->find ({ title => $v_utf8 }, { select => 'title', as => 'name' }); + ok (_is_utf8( $cd->get_column ('name') ), 'utf8 flag propagates via as'); +} + + +sub _force_utf8 { + if ($] <= 5.008000) { + Encode::_utf8_on ($_[0]); + } + else { + utf8::decode ($_[0]); + } +} + +sub _is_utf8 { + if ($] <= 5.008000) { + return Encode::is_utf8 (shift); + } + else { + return utf8::is_utf8 (shift); + } +}