X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/e69a2255d0db4d110e403864fcb97407ce8e4ff9..4fa352c88e0cce67dac885937735609cff04a59e:/lib/open.t

diff --git a/lib/open.t b/lib/open.t
index 7e09d8d..3a5565d 100644
--- a/lib/open.t
+++ b/lib/open.t
@@ -3,11 +3,11 @@
 BEGIN {
 	chdir 't' if -d 't';
 	@INC = '../lib';
-	push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS';
 	require Config; import Config;
+	require './test.pl';
 }
 
-use Test::More tests => 16;
+plan 23;
 
 # open::import expects 'open' as its first argument, but it clashes with open()
 sub import {
@@ -19,43 +19,31 @@ ok( require 'open.pm', 'requiring open' );
 
 # this should fail
 eval { import() };
-like( $@, qr/needs explicit list of disciplines/,
+like( $@, qr/needs explicit list of PerlIO layers/,
 	'import should fail without args' );
 
-# the hint bits shouldn't be set yet
-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
 my $warn;
 local $SIG{__WARN__} = sub {
 	$warn .= shift;
 };
 
-# and it shouldn't be able to find this discipline
+# and it shouldn't be able to find this layer
 $warn = '';
 eval q{ no warnings 'layer'; use open IN => ':macguffin' ; };
 is( $warn, '',
-	'should not warn about unknown discipline with bad discipline provided' );
+	'should not warn about unknown layer with bad layer provided' );
 
 $warn = '';
 eval q{ use warnings 'layer'; use open IN => ':macguffin' ; };
-like( $warn, qr/Unknown discipline layer/,
-	'should warn about unknown discipline with bad discipline provided' );
+like( $warn, qr/Unknown PerlIO layer/,
+	'should warn about unknown layer with bad layer provided' );
 
-SKIP: {
-    skip("no perlio, no :utf8", 1) unless (find PerlIO::Layer 'perlio');
-    # now load a real-looking locale
-    $ENV{LC_ALL} = ' .utf8';
-    import( 'IN', 'locale' );
-    like( ${^OPEN}, qr/^(:utf8)?:utf8\0/,
-        'should set a valid locale layer' );
-}
+# open :locale logic changed since open 1.04, new logic
+# difficult to test portably.
 
-# and see if it sets the magic variables appropriately
+# see if it sets the magic variables appropriately
 import( 'IN', ':crlf' );
-ok( $^H & $open::hint_bits,
-	'hint bits should be set in $^H after open import' );
 is( $^H{'open_IN'}, 'crlf', 'should have set crlf layer' );
 
 # it should reset them appropriately, too
@@ -64,16 +52,16 @@ is( $^H{'open_IN'}, 'raw', 'should have reset to raw layer' );
 
 # it dies if you don't set IN, OUT, or IO
 eval { import( 'sideways', ':raw' ) };
-like( $@, qr/Unknown discipline class/, 'should croak with unknown class' );
+like( $@, qr/Unknown PerlIO layer class/, 'should croak with unknown class' );
 
 # but it handles them all so well together
 import( 'IO', ':raw :crlf' );
 is( ${^OPEN}, ":raw :crlf\0:raw :crlf",
-	'should set multi types, multi disciplines' );
+	'should set multi types, multi layer' );
 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';
@@ -124,51 +112,100 @@ 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: {
+    skip("no perlio", 2) unless (find PerlIO::Layer 'perlio');
+    skip("no Encode", 2) unless $Config{extensions} =~ m{\bEncode\b};
+
+    eval q[use Encode::Alias;use open ":std", ":locale"];
+    is($@, '', 'can use :std and :locale');
+}
+
+{
+    local $ENV{PERL_UNICODE};
+    delete $ENV{PERL_UNICODE};
+    is runperl(
+         progs => [
+            'use open q\:encoding(UTF-8)\, q-:std-;',
+            'use open q\:encoding(UTF-8)\;',
+            'if(($_ = <STDIN>) eq qq-\x{100}\n-) { print qq-stdin ok\n- }',
+            'else { print qq-got -, join(q q q, map ord, split//), "\n" }',
+            'print STDOUT qq-\x{ff}\n-;',
+            'print STDERR qq-\x{ff}\n-;',
+         ],
+         stdin => "\xc4\x80\n",
+         stderr => 1,
+       ),
+       "stdin ok\n\xc3\xbf\n\xc3\xbf\n",
+       "use open without :std does not affect standard handles",
+    ;
 }
 
 END {