From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Mon, 1 Jul 2002 13:04:18 +0000 (+0000)
Subject: Goes with lib/open.pm diagnostics changes
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7f17c5141d7d488a184915d744f3ef35257927e7;p=p5sagit%2Fp5-mst-13.2.git

Goes with lib/open.pm diagnostics changes

p4raw-id: //depot/perl@17389
---

diff --git a/lib/open.t b/lib/open.t
index 7e09d8d..5029292 100644
--- a/lib/open.t
+++ b/lib/open.t
@@ -19,7 +19,7 @@ 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
@@ -32,16 +32,16 @@ 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');
@@ -64,12 +64,12 @@ 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: {