X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fopen.t;h=9c36e1a5c85d76e988235fec3a877b8d9f93c863;hb=c812d14677001807a06200e23fed431e7ac774bb;hp=5c4c8758adea8d2c8c57cdc1a31923acacde82c3;hpb=f22a20695eae00da6d6892456727b75f7267e9ea;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/open.t b/lib/open.t
index 5c4c875..9c36e1a 100644
--- a/lib/open.t
+++ b/lib/open.t
@@ -7,7 +7,7 @@ BEGIN {
 	require Config; import Config;
 }
 
-use Test::More tests => 14;
+use Test::More tests => 22;
 
 # open::import expects 'open' as its first argument, but it clashes with open()
 sub import {
@@ -61,7 +61,7 @@ is( ${^OPEN}, ":raw :crlf\0:raw :crlf",
 is( $^H{'open_IO'}, 'crlf', 'should record last layer set in %^H' );
 
 SKIP: {
-    skip("no perlio, no :utf8", 4) unless (find PerlIO::Layer 'perlio');
+    skip("no perlio, no :utf8", 12) unless (find PerlIO::Layer 'perlio');
 
     eval <<EOE;
     use open ':utf8';
@@ -112,51 +112,73 @@ EOE
     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++;
+    sub diagnostics {
+	print '# ord($_)           == ', ord($_), "\n";
+	print '# bytes::length($_) == ', bytes::length($_), "\n";
+	print '# systell(G)        == ', systell(G), "\n";
+	print '# $a                == ', $a, "\n";
+	print '# $c                == ', $c, "\n";
     }
-    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;
+
+    my %actions = (
+		   syswrite => sub { syswrite G, shift; },
+		   'syswrite len' => sub { syswrite G, shift, 1; },
+		   'syswrite len pad' => sub {
+		       my $temp = shift() . "\243";
+		       syswrite G, $temp, 1; },
+		   'syswrite off' => sub { 
+		       my $temp = "\351" . shift();
+		       syswrite G, $temp, 1, 1; },
+		   'syswrite off pad' => sub { 
+		       my $temp = "\351" . shift() . "\243";
+		       syswrite G, $temp, 1, 1; },
+		  );
+
+    foreach my $key (sort keys %actions) {
+	# syswrite() on should work on characters, not bytes
+	open G, ">:utf8", "b";
+
+	print "# $key\n";
+	$ok = $a = 0;
+	for (@a) {
+	    unless (
+		    ($c = $actions{$key}($_)) == 1 &&
+		    systell(G)                == ($a += bytes::length($_))
+		   ) {
+		diagnostics();
+		last;
+	    }
+	    $ok++;
 	}
-	$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");
     }
-    close G;
-    ok($ok == @a,
-       "checking syswrite() output on :utf8 streams by reading it back in");
 }
 
 SKIP: {