X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F85utf8.t;h=2a89fa687cdc6adfb43cd3b6c532f7fc931d7b0e;hb=55087b9990ac4c004f1e6b9742f73d89274cf7f2;hp=9a621dbfb2c08f832c90e62867875d4133358a3d;hpb=404939a4ab4a2bece2fd2a1f44abac7e435e464e;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/85utf8.t b/t/85utf8.t
index 9a621db..2a89fa6 100644
--- a/t/85utf8.t
+++ b/t/85utf8.t
@@ -1,28 +1,43 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
 use lib qw(t/lib);
 use DBICTest;
+use utf8;
 
 my $schema = DBICTest->init_schema();
 
-eval 'use Encode ; 1'
-    or plan skip_all => 'Install Encode run this test';
-
-plan tests => 3;
-
 DBICTest::Schema::CD->load_components('UTF8Columns');
 DBICTest::Schema::CD->utf8_columns('title');
 Class::C3->reinitialize();
 
-my $cd = $schema->resultset('CD')->create( { artist => 1, title => 'uni', year => 'foo' } );
-ok( Encode::is_utf8( $cd->title ), 'got title with utf8 flag' );
-ok( !Encode::is_utf8( $cd->year ), 'got year without utf8 flag' );
-
+my $cd = $schema->resultset('CD')->create( { artist => 1, title => 'øni', year => '2048' } );
 my $utf8_char = 'uniuni';
-Encode::_utf8_on($utf8_char);
+
+
+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( !Encode::is_utf8( $cd->{_column_data}{title} ),
-    'store utf8-less chars' );
+ok(! utf8::is_utf8( $cd->{_column_data}{title} ), 'store utf8-less chars' );
+
+
+my $v_utf8 = "\x{219}";
+
+$cd->update ({ title => $v_utf8 });
+$cd->title($v_utf8);
+ok( !$cd->is_column_changed('title'), 'column is not dirty after setting the same unicode value' );
+
+$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;