X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fopen.t;h=5bc4b6d18493dbce4d690641981518a48bf202cf;hb=92e830a9086d75f086574c378b1c63ff2e00edcf;hp=3113eff747ddce2e6c1a38655d0c545af7d977e9;hpb=1e616cf5bffcf11a1df72838e96be99b97cfab72;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/open.t b/lib/open.t
index 3113eff..5bc4b6d 100644
--- a/lib/open.t
+++ b/lib/open.t
@@ -3,9 +3,10 @@
 BEGIN {
 	chdir 't' if -d 't';
 	@INC = '../lib';
+	require Config; import Config;
 }
 
-use Test::More tests => 13;
+use Test::More tests => 15;
 
 # open::import expects 'open' as its first argument, but it clashes with open()
 sub import {
@@ -25,12 +26,6 @@ is( $^H & $open::hint_bits, 0,
 	'hint bits should not be set in $^H before open import' );
 
 # prevent it from loading I18N::Langinfo, so we can test encoding failures
-local @INC;
-$ENV{LC_ALL} = $ENV{LANG} = '';
-eval { import( 'IN', 'locale' ) };
-like( $@, qr/Cannot figure out an encoding/, 
-	'no encoding should be found without $ENV{LANG} or $ENV{LC_ALL}' );
-
 my $warn;
 local $SIG{__WARN__} = sub {
 	$warn .= shift;
@@ -67,14 +62,110 @@ is( ${^OPEN}, ":raw :crlf\0:raw :crlf",
 	'should set multi types, multi disciplines' );
 is( $^H{'open_IO'}, 'crlf', 'should record last layer set in %^H' );
 
-# the special :utf8 layer
-use open ':utf8';
-open(O, ">utf8");
-print O chr(0x100);
-close O;
-open(I, "<utf8");
-is(ord(<I>), 0x100, ":utf8");
-close I;
+SKIP: {
+    skip("no perlio, no :utf8", 4) unless $Config{'useperlio'};
+
+    eval <<EOE;
+    use open ':utf8';
+    open(O, ">utf8");
+    print O chr(0x100);
+    close O;
+    open(I, "<utf8");
+    is(ord(<I>), 0x100, ":utf8 single wide character round-trip");
+    close I;
+EOE
+
+    open F, ">a";
+    @a = map { chr(1 << ($_ << 2)) } 0..5; # 0x1, 0x10, .., 0x100000
+    unshift @a, chr(0); # ... and a null byte in front just for fun
+    print F @a;
+    close F;
+
+    sub systell {
+        use Fcntl 'SEEK_CUR';
+        sysseek($_[0], 0, SEEK_CUR);
+    }
+
+    require bytes; # not use
+
+    my $ok;
+
+    open F, "<:utf8", "a";
+    $ok = $a = 0;
+    for (@a) {
+        unless (
+		($c = sysread(F, $b, 1)) == 1  &&
+		length($b)               == 1  &&
+		ord($b)                  == ord($_) &&
+		systell(F)               == ($a += bytes::length($b))
+		) {
+	    print '# ord($_)           == ', ord($_), "\n";
+	    print '# ord($b)           == ', ord($b), "\n";
+	    print '# length($b)        == ', length($b), "\n";
+	    print '# bytes::length($b) == ', bytes::length($b), "\n";
+	    print '# systell(F)        == ', systell(F), "\n";
+	    print '# $a                == ', $a, "\n";
+	    print '# $c                == ', $c, "\n";
+	    last;
+	}
+	$ok++;
+    }
+    close F;
+    ok($ok == @a,
+       "on :utf8 streams sysread() should work on characters, not bytes");
+
+    # syswrite() on should work on characters, not bytes
+    open G, ">:utf8", "b";
+    $ok = $a = 0;
+    for (@a) {
+	unless (
+		($c = syswrite(G, $_, 1)) == 1 &&
+		systell(G)                == ($a += bytes::length($_))
+		) {
+	    print '# ord($_)           == ', ord($_), "\n";
+	    print '# bytes::length($_) == ', bytes::length($_), "\n";
+	    print '# systell(G)        == ', systell(G), "\n";
+	    print '# $a                == ', $a, "\n";
+	    print '# $c                == ', $c, "\n";
+	    print "not ";
+	    last;
+	}
+	$ok++;
+    }
+    close G;
+    ok($ok == @a,
+       "on :utf8 streams syswrite() should work on characters, not bytes");
+
+    open G, "<:utf8", "b";
+    $ok = $a = 0;
+    for (@a) {
+	unless (
+		($c = sysread(G, $b, 1)) == 1 &&
+		length($b)               == 1 &&
+		ord($b)                  == ord($_) &&
+		systell(G)               == ($a += bytes::length($_))
+		) {
+	    print '# ord($_)           == ', ord($_), "\n";
+	    print '# ord($b)           == ', ord($b), "\n";
+	    print '# length($b)        == ', length($b), "\n";
+	    print '# bytes::length($b) == ', bytes::length($b), "\n";
+	    print '# systell(G)        == ', systell(G), "\n";
+	    print '# $a                == ', $a, "\n";
+	    print '# $c                == ', $c, "\n";
+	    last;
+	}
+	$ok++;
+    }
+    close G;
+    ok($ok == @a,
+       "checking syswrite() output on :utf8 streams by reading it back in");
+}
+
+END {
+    1 while unlink "utf8";
+    1 while unlink "a";
+    1 while unlink "b";
+}
 
 # the test cases beyond __DATA__ need to be executed separately
 
@@ -84,12 +175,13 @@ eval { open::_get_locale_encoding() };
 like( $@, qr/too ambiguous/, 'should die with ambiguous locale encoding' );
 %%%
 # the special :locale layer
-$ENV{LANG} = 'ru_RU.KOI8-R';
-use open ':locale';
+$ENV{LC_ALL} = $ENV{LANG} = 'ru_RU.KOI8-R';
+# the :locale will probe the locale environment variables like LANG
+use open OUT => ':locale';
 open(O, ">koi8");
-print O chr(0x430); # Unicode CYRILLIC SMALL LETTER A = KOI8-R 0xC1
+print O chr(0x430); # Unicode CYRILLIC SMALL LETTER A = KOI8-R 0xc1
 close O;
 open(I, "<koi8");
-is(ord(<I>), 0xC1, ":locale");
+printf "%#x\n", ord(<I>), "\n"; # this should print 0xc1
 close I;
 %%%