Merge 'trunk' into 'replication_dedux'

[dbsrgits/DBIx-Class.git] / t / 85utf8.t

diff --git a/t/85utf8.t b/t/85utf8.t
index 562efb4..8ef3bda 100644 (file)
--- a/t/85utf8.t
+++ b/t/85utf8.t
@@ -7,21 +7,39 @@ use DBICTest;
 
 my $schema = DBICTest->init_schema();
 
-eval 'use Encode ; 1'
-    or plan skip_all => 'Install Encode run this test';
+if ($] <= 5.008000) {
 
-plan tests => 2;
+    eval 'use Encode; 1' or plan skip_all => 'Need Encode run this test';
 
-DBICTest::Schema::Artist->load_components('UTF8Columns');
-DBICTest::Schema::Artist->utf8_columns('name');
-Class::C3->reinitialize();
+} else {
+
+    eval 'use utf8; 1' or plan skip_all => 'Need utf8 run this test';
+}
 
-my $artist = $schema->resultset("Artist")->create( { name => 'uni' } );
-ok( Encode::is_utf8( $artist->name ), 'got name with utf8 flag' );
+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 => 'øni', year => 'foo' } );
 my $utf8_char = 'uniuni';
-Encode::_utf8_on($utf8_char);
-$artist->name($utf8_char);
-ok( !Encode::is_utf8( $artist->{_column_data}->{name} ),
-    'store utf8 less chars' );
 
+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( 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' );
+}