X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F85utf8.t;h=399c46dfa96f74134dfcad867577d33b7afe7cbd;hb=71ef99d5005601cf1c000b3183d945f79af2d30d;hp=438bd8543b80cc47a61120b0dd73611db1ccbdf6;hpb=1d0057bd70e7846100004b3fd918168a852ac6f6;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/85utf8.t b/t/85utf8.t
index 438bd85..399c46d 100644
--- a/t/85utf8.t
+++ b/t/85utf8.t
@@ -1,48 +1,43 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
+use Test::Warn;
 use lib qw(t/lib);
 use DBICTest;
+use utf8;
 
-my $schema = DBICTest->init_schema();
-
-if ($] <= 5.008000) {
+warning_like (sub {
 
-    eval 'use Encode; 1' or plan skip_all => 'Need Encode run this test';
+  package A::Comp;
+  use base 'DBIx::Class';
+  sub store_column { shift->next::method (@_) };
+  1;
 
-} else {
+  package A::Test;
+  use base 'DBIx::Class::Core';
+  __PACKAGE__->load_components(qw(UTF8Columns +A::Comp));
+  1;
+}, qr/Incorrect loading order of DBIx::Class::UTF8Columns/ );
 
-    eval 'use utf8; 1' or plan skip_all => 'Need utf8 run this test';
-}
 
-plan tests => 5;
+my $schema = DBICTest->init_schema();
 
 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' );
+ok( utf8::is_utf8( $cd->title ), 'got title with utf8 flag' );
+ok(! utf8::is_utf8( $cd->year ), 'got year without utf8 flag' );
 
-} else {
+utf8::decode($utf8_char);
+$cd->title($utf8_char);
+ok(! utf8::is_utf8( $cd->{_column_data}{title} ), 'store utf8-less chars' );
 
-    ok( utf8::is_utf8( $cd->title ), 'got title with utf8 flag' );
-    ok( !utf8::is_utf8( $cd->year ), 'got year without utf8 flag' );
-
-    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 +48,11 @@ 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 (utf8::is_utf8( $cd->get_column ('name') ), 'utf8 flag propagates via as');
+}
+
+done_testing;