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

diff --git a/t/85utf8.t b/t/85utf8.t
index 9a621db..8ef3bda 100644
--- a/t/85utf8.t
+++ b/t/85utf8.t
@@ -7,8 +7,14 @@ use DBICTest;
 
 my $schema = DBICTest->init_schema();
 
-eval 'use Encode ; 1'
-    or plan skip_all => 'Install Encode run this test';
+if ($] <= 5.008000) {
+
+    eval 'use Encode; 1' or plan skip_all => 'Need Encode run this test';
+
+} else {
+
+    eval 'use utf8; 1' or plan skip_all => 'Need utf8 run this test';
+}
 
 plan tests => 3;
 
@@ -16,13 +22,24 @@ 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 => 'foo' } );
 my $utf8_char = 'uniuni';
-Encode::_utf8_on($utf8_char);
-$cd->title($utf8_char);
-ok( !Encode::is_utf8( $cd->{_column_data}{title} ),
-    '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' );
+}