[svn:DBD-Pg] r14704 - DBD-Pg/trunk/t

Author: turnstep
Date: Thu Feb 10 20:03:25 2011
New Revision: 14704

Modified:
   DBD-Pg/trunk/t/02attribs.t
   DBD-Pg/trunk/t/09arrays.t

Log:
Clean up tests to remove recent utf8 work


Modified: DBD-Pg/trunk/t/02attribs.t
==============================================================================
--- DBD-Pg/trunk/t/02attribs.t	(original)
+++ DBD-Pg/trunk/t/02attribs.t	Thu Feb 10 20:03:25 2011
@@ -435,14 +435,14 @@
 	my ($id, $name) = $sth->fetchrow_array();
 	ok (Encode::is_utf8($name), $t);
 
-	$t='Unicode (utf8) data returned from UTF8 database is not corrupted';
+	$t='Unicode (utf8) data returned from database is not corrupted';
 	is (length($name), 4, $t);
 
-	$t='ASCII text returned from UTF8 database does have utf8 bit set';
+	$t='ASCII text returned from database does have utf8 bit set';
 	$sth->finish();
 	$sth->execute(1);
 	my ($id2, $name2) = $sth->fetchrow_array();
-	ok (Encode::is_utf8($name2), $t);
+	ok (!Encode::is_utf8($name2), $t);
 	$sth->finish();
 }
 

Modified: DBD-Pg/trunk/t/09arrays.t
==============================================================================
--- DBD-Pg/trunk/t/09arrays.t	(original)
+++ DBD-Pg/trunk/t/09arrays.t	Thu Feb 10 20:03:25 2011
@@ -569,6 +569,7 @@
 		if $server_encoding ne 'UTF8';
 
 	$t='String should be UTF-8';
+	local $dbh->{pg_enable_utf8} = 1;
 	my $utf8_str = chr(0x100).'dam'; # LATIN CAPITAL LETTER A WITH MACRON
     ok (Encode::is_utf8( $utf8_str ), $t);
 
@@ -633,8 +634,8 @@
 	$expected = [1,['Bob',$utf8_str],'one'];
 	is_deeply ($result, $expected, $t);
 
-	$t='Selected ASCII string should be UTF-8';
-    ok (Encode::is_utf8( $result->[1][0] ), $t);
+	$t='Selected ASCII string should not be UTF-8';
+    ok (!Encode::is_utf8( $result->[1][0] ), $t);
 
 	$t='Selected string should be UTF-8';
     ok (Encode::is_utf8( $result->[1][1] ), $t);