Convert charnames.t to use t/lib/common.pl

4 files changed, 252 insertions, 269 deletions

diff --git a/MANIFEST b/MANIFEST
index 7089e3a50c..0feae39262 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -4287,6 +4287,7 @@ t/io/through.t			See if pipe passes data intact
 t/io/utf8.t			See if file seeking works
 t/japh/abigail.t		Obscure tests
 t/lib/1_compile.t		See if the various libraries and extensions compile
+t/lib/charnames/alias		Tests of "use charnames" with aliases.
 t/lib/Cname.pm			Test charnames in regexes (op/pat.t)
 t/lib/common.pl			Helper for lib/{warnings,feature}.t
 t/lib/commonsense.t		See if configuration meets basic needs
diff --git a/lib/charnames.t b/lib/charnames.t
index ce2bc34fd9..f50076cf68 100644
--- a/lib/charnames.t
+++ b/lib/charnames.t
@@ -7,16 +7,15 @@ BEGIN {
     unless(grep /blib/, @INC) {
 	chdir 't' if -d 't';
 	@INC = '../lib';
-	require './test.pl';
     }
     $SIG{__WARN__} = sub { push @WARN, @_ };
 }
 
-require File::Spec;
+our $pragma_name = "charnames";
+our $local_tests = 58;
 
-$| = 1;
-
-plan(85);
+# ---- For the alias extensions
+require "../t/lib/common.pl";
 
 use charnames ':full';
 
@@ -200,58 +199,6 @@ is(charnames::viacode(0), "NULL");
 is(charnames::viacode("BE"), "VULGAR FRACTION THREE QUARTERS");
 is(charnames::viacode("U+00000000000FEED"), "ARABIC LETTER WAW ISOLATED FORM");
 
-
-# ---- Alias extensions
-
-my $alifile = File::Spec->catfile(File::Spec->updir, qw(lib unicore xyzzy_alias.pl));
-
-my @prgs;
-{
-    local $/ = undef;
-    @prgs = split "\n########\n", <DATA>;
-}
-
-for (@prgs) {
-    my ($code, $exp) = ((split m/\nEXPECT\n/), '$');
-    my ($prog, $fil) = ((split m/\nFILE\n/, $code), "");
-    my $tmpfile = tempfile();
-    open my $tmp, "> $tmpfile" or die "Could not open $tmpfile: $!";
-    print $tmp $prog, "\n";
-    close $tmp or die "Could not close $tmpfile: $!";
-    if ($fil) {
-	$fil .= "\n";
-	open my $ali, "> $alifile" or die "Could not open $alifile: $!";
-	print $ali $fil;
-	close $ali or die "Could not close $alifile: $!";
-    }
-    my $switch = "";
-    my $res = runperl( switches => $switch,
-                       progfile => $tmpfile,
-                       stderr => 1 );
-    my $status = $?;
-    $res =~ s/[\r\n]+$//;
-    $res =~ s/tmp\d+/-/g;			# fake $prog from STDIN
-    $res =~ s/\n%[A-Z]+-[SIWEF]-.*$//		# clip off DCL status msg
-	if $^O eq "VMS";
-    $exp =~ s/[\r\n]+$//;
-    my $pfx = ($res =~ s/^PREFIX\n//);
-    my $rexp = qr{^$exp};
-    my $expected = "";      # Unsure why this is here, as was never initialized
-
-    SKIP: {
-        skip $res, 1, if $res =~ s/^SKIPPED\n//;
-        if (($pfx and $res !~ /^\Q$expected/) or
-            (!$pfx and $res !~ $rexp))
-        {
-            fail("PROG:\n$prog\nFILE:\n${fil}EXPECTED:\n$exp\nGOT:\n$res");
-        } else {
-            pass("");
-        }
-    }
-    $fil or next;
-    1 while unlink $alifile;
-}
-
 # [perl #30409] charnames.pm clobbers default variable
 $_ = 'foobar';
 eval "use charnames ':full';";
@@ -297,212 +244,3 @@ is("\N{U+1D0C5}", "\N{BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA VASIS}");
     $res .= '-3' if ":" =~ /\N{COLON}/i;
     is($res, "foo-foo-1--2-3");
 }
-
-__END__
-# unsupported pragma
-use charnames ":scoobydoo";
-"Here: \N{e_ACUTE}!\n";
-EXPECT
-unsupported special ':scoobydoo' in charnames at
-########
-# wrong type of alias (missing colon)
-use charnames "alias";
-"Here: \N{e_ACUTE}!\n";
-EXPECT
-Unknown charname 'e_ACUTE' at
-########
-# alias without an argument
-use charnames ":alias";
-"Here: \N{e_ACUTE}!\n";
-EXPECT
-:alias needs an argument in charnames at
-########
-# reversed sequence
-use charnames ":alias" => ":full";
-"Here: \N{e_ACUTE}!\n";
-EXPECT
-:alias cannot use existing pragma :full \(reversed order\?\) at
-########
-# alias with hashref but no :full
-use charnames ":alias" => { e_ACUTE => "LATIN SMALL LETTER E WITH ACUTE" };
-"Here: \N{e_ACUTE}!\n";
-EXPECT
-Unknown charname 'LATIN SMALL LETTER E WITH ACUTE' at
-########
-# alias with hashref but with :short
-use charnames ":short", ":alias" => { e_ACUTE => "LATIN SMALL LETTER E WITH ACUTE" };
-"Here: \N{e_ACUTE}!\n";
-EXPECT
-Unknown charname 'LATIN SMALL LETTER E WITH ACUTE' at
-########
-# alias with hashref to :full OK
-use charnames ":full", ":alias" => { e_ACUTE => "LATIN SMALL LETTER E WITH ACUTE" };
-"Here: \N{e_ACUTE}!\n";
-EXPECT
-$
-########
-# alias with hashref to :short but using :full
-use charnames ":full", ":alias" => { e_ACUTE => "LATIN:e WITH ACUTE" };
-"Here: \N{e_ACUTE}!\n";
-EXPECT
-Unknown charname 'LATIN:e WITH ACUTE' at
-########
-# alias with hashref to :short OK
-use charnames ":short", ":alias" => { e_ACUTE => "LATIN:e WITH ACUTE" };
-"Here: \N{e_ACUTE}!\n";
-EXPECT
-$
-########
-# alias with bad hashref
-use charnames ":short", ":alias" => "e_ACUTE";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-EXPECT
-unicore/e_ACUTE_alias.pl cannot be used as alias file for charnames at
-########
-# alias with arrayref
-use charnames ":short", ":alias" => [ e_ACUTE => "LATIN:e WITH ACUTE" ];
-"Here: \N{e_ACUTE}!\n";
-EXPECT
-Only HASH reference supported as argument to :alias at
-########
-# alias with bad hashref
-use charnames ":short", ":alias" => { e_ACUTE => "LATIN:e WITH ACUTE", "a_ACUTE" };
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-EXPECT
-Use of uninitialized value
-########
-# alias with hashref two aliases
-use charnames ":short", ":alias" => {
-    e_ACUTE => "LATIN:e WITH ACUTE",
-    a_ACUTE => "",
-    };
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-EXPECT
-Unknown charname '' at
-########
-# alias with hashref two aliases
-use charnames ":short", ":alias" => {
-    e_ACUTE => "LATIN:e WITH ACUTE",
-    a_ACUTE => "LATIN:a WITH ACUTE",
-    };
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-EXPECT
-$
-########
-# alias with hashref using mixed aliasses
-use charnames ":short", ":alias" => {
-    e_ACUTE => "LATIN:e WITH ACUTE",
-    a_ACUTE => "LATIN SMALL LETTER A WITH ACUT",
-    };
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-EXPECT
-Unknown charname 'LATIN SMALL LETTER A WITH ACUT' at
-########
-# alias with hashref using mixed aliasses
-use charnames ":short", ":alias" => {
-    e_ACUTE => "LATIN:e WITH ACUTE",
-    a_ACUTE => "LATIN SMALL LETTER A WITH ACUTE",
-    };
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-EXPECT
-Unknown charname 'LATIN SMALL LETTER A WITH ACUTE' at
-########
-# alias with hashref using mixed aliasses
-use charnames ":full", ":alias" => {
-    e_ACUTE => "LATIN:e WITH ACUTE",
-    a_ACUTE => "LATIN SMALL LETTER A WITH ACUTE",
-    };
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-EXPECT
-Unknown charname 'LATIN:e WITH ACUTE' at
-########
-# alias with nonexisting file
-use charnames ":full", ":alias" => "xyzzy";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-EXPECT
-unicore/xyzzy_alias.pl cannot be used as alias file for charnames at
-########
-# alias with bad file name
-use charnames ":full", ":alias" => "xy 7-";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-EXPECT
-Charnames alias files can only have identifier characters at
-########
-# alias with non_absolute (existing) file name (which it should /not/ use)
-use charnames ":full", ":alias" => "perl";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-EXPECT
-unicore/perl_alias.pl cannot be used as alias file for charnames at
-########
-# alias with bad file
-use charnames ":full", ":alias" => "xyzzy";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-FILE
-#!perl
-0;
-EXPECT
-unicore/xyzzy_alias.pl did not return a \(valid\) list of alias pairs at
-########
-# alias with file with empty list
-use charnames ":full", ":alias" => "xyzzy";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-FILE
-#!perl
-();
-EXPECT
-Unknown charname 'e_ACUTE' at
-########
-# alias with file OK but file has :short aliasses
-use charnames ":full", ":alias" => "xyzzy";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-FILE
-#!perl
-(   e_ACUTE => "LATIN:e WITH ACUTE",
-    a_ACUTE => "LATIN:a WITH ACUTE",
-    );
-EXPECT
-Unknown charname 'LATIN:e WITH ACUTE' at
-########
-# alias with :short and file OK
-use charnames ":short", ":alias" => "xyzzy";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-FILE
-#!perl
-(   e_ACUTE => "LATIN:e WITH ACUTE",
-    a_ACUTE => "LATIN:a WITH ACUTE",
-    );
-EXPECT
-$
-########
-# alias with :short and file OK has :long aliasses
-use charnames ":short", ":alias" => "xyzzy";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-FILE
-#!perl
-(   e_ACUTE => "LATIN SMALL LETTER E WITH ACUTE",
-    a_ACUTE => "LATIN SMALL LETTER A WITH ACUTE",
-    );
-EXPECT
-Unknown charname 'LATIN SMALL LETTER E WITH ACUTE' at
-########
-# alias with file implicit :full but file has :short aliasses
-use charnames ":alias" => ":xyzzy";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-FILE
-#!perl
-(   e_ACUTE => "LATIN:e WITH ACUTE",
-    a_ACUTE => "LATIN:a WITH ACUTE",
-    );
-EXPECT
-Unknown charname 'LATIN:e WITH ACUTE' at
-########
-# alias with file implicit :full and file has :long aliasses
-use charnames ":alias" => ":xyzzy";
-"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
-FILE
-#!perl
-(   e_ACUTE => "LATIN SMALL LETTER E WITH ACUTE",
-    a_ACUTE => "LATIN SMALL LETTER A WITH ACUTE",
-    );
-EXPECT
-$
diff --git a/t/lib/charnames/alias b/t/lib/charnames/alias
new file mode 100644
index 0000000000..76a139fef2
--- /dev/null
+++ b/t/lib/charnames/alias
@@ -0,0 +1,244 @@
+Tests for use charnames with aliases.
+(With the exception of the first test, which otherwise would need its own file)
+__END__
+# unsupported pragma
+use charnames ":scoobydoo";
+"Here: \N{e_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+unsupported special ':scoobydoo' in charnames at
+########
+# wrong type of alias (missing colon)
+use charnames "alias";
+"Here: \N{e_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'e_ACUTE' at
+########
+# alias without an argument
+use charnames ":alias";
+"Here: \N{e_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+:alias needs an argument in charnames at
+########
+# reversed sequence
+use charnames ":alias" => ":full";
+"Here: \N{e_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+:alias cannot use existing pragma :full \(reversed order\?\) at
+########
+# alias with hashref but no :full
+use charnames ":alias" => { e_ACUTE => "LATIN SMALL LETTER E WITH ACUTE" };
+"Here: \N{e_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'LATIN SMALL LETTER E WITH ACUTE' at
+########
+# alias with hashref but with :short
+use charnames ":short", ":alias" => { e_ACUTE => "LATIN SMALL LETTER E WITH ACUTE" };
+"Here: \N{e_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'LATIN SMALL LETTER E WITH ACUTE' at
+########
+# alias with hashref to :full OK
+use charnames ":full", ":alias" => { e_ACUTE => "LATIN SMALL LETTER E WITH ACUTE" };
+"Here: \N{e_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+$
+########
+# alias with hashref to :short but using :full
+use charnames ":full", ":alias" => { e_ACUTE => "LATIN:e WITH ACUTE" };
+"Here: \N{e_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'LATIN:e WITH ACUTE' at
+########
+# alias with hashref to :short OK
+use charnames ":short", ":alias" => { e_ACUTE => "LATIN:e WITH ACUTE" };
+"Here: \N{e_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+$
+########
+# alias with bad hashref
+use charnames ":short", ":alias" => "e_ACUTE";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+unicore/e_ACUTE_alias.pl cannot be used as alias file for charnames at
+########
+# alias with arrayref
+use charnames ":short", ":alias" => [ e_ACUTE => "LATIN:e WITH ACUTE" ];
+"Here: \N{e_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Only HASH reference supported as argument to :alias at
+########
+# alias with bad hashref
+use charnames ":short", ":alias" => { e_ACUTE => "LATIN:e WITH ACUTE", "a_ACUTE" };
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Use of uninitialized value
+########
+# alias with hashref two aliases
+use charnames ":short", ":alias" => {
+    e_ACUTE => "LATIN:e WITH ACUTE",
+    a_ACUTE => "",
+    };
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname '' at
+########
+# alias with hashref two aliases
+use charnames ":short", ":alias" => {
+    e_ACUTE => "LATIN:e WITH ACUTE",
+    a_ACUTE => "LATIN:a WITH ACUTE",
+    };
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+$
+########
+# alias with hashref using mixed aliasses
+use charnames ":short", ":alias" => {
+    e_ACUTE => "LATIN:e WITH ACUTE",
+    a_ACUTE => "LATIN SMALL LETTER A WITH ACUT",
+    };
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'LATIN SMALL LETTER A WITH ACUT' at
+########
+# alias with hashref using mixed aliasses
+use charnames ":short", ":alias" => {
+    e_ACUTE => "LATIN:e WITH ACUTE",
+    a_ACUTE => "LATIN SMALL LETTER A WITH ACUTE",
+    };
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'LATIN SMALL LETTER A WITH ACUTE' at
+########
+# alias with hashref using mixed aliasses
+use charnames ":full", ":alias" => {
+    e_ACUTE => "LATIN:e WITH ACUTE",
+    a_ACUTE => "LATIN SMALL LETTER A WITH ACUTE",
+    };
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'LATIN:e WITH ACUTE' at
+########
+# alias with nonexisting file
+use charnames ":full", ":alias" => "xyzzy";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+unicore/xyzzy_alias.pl cannot be used as alias file for charnames at
+########
+# alias with bad file name
+use charnames ":full", ":alias" => "xy 7-";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Charnames alias files can only have identifier characters at
+########
+# alias with non_absolute (existing) file name (which it should /not/ use)
+use charnames ":full", ":alias" => "perl";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+unicore/perl_alias.pl cannot be used as alias file for charnames at
+########
+# alias with bad file
+--FILE-- ../lib/unicore/xyzzy_alias.pl
+#!perl
+0;
+--FILE--
+use charnames ":full", ":alias" => "xyzzy";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+unicore/xyzzy_alias.pl did not return a \(valid\) list of alias pairs at
+########
+# alias with file with empty list
+--FILE-- ../lib/unicore/xyzzy_alias.pl
+#!perl
+();
+--FILE--
+use charnames ":full", ":alias" => "xyzzy";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'e_ACUTE' at
+########
+# alias with file OK but file has :short aliasses
+--FILE-- ../lib/unicore/xyzzy_alias.pl
+#!perl
+(   e_ACUTE => "LATIN:e WITH ACUTE",
+    a_ACUTE => "LATIN:a WITH ACUTE",
+    );
+--FILE--
+use charnames ":full", ":alias" => "xyzzy";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'LATIN:e WITH ACUTE' at
+########
+# alias with :short and file OK
+--FILE-- ../lib/unicore/xyzzy_alias.pl
+#!perl
+(   e_ACUTE => "LATIN:e WITH ACUTE",
+    a_ACUTE => "LATIN:a WITH ACUTE",
+    );
+--FILE--
+use charnames ":short", ":alias" => "xyzzy";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+$
+########
+# alias with :short and file OK has :long aliasses
+--FILE-- ../lib/unicore/xyzzy_alias.pl
+#!perl
+(   e_ACUTE => "LATIN SMALL LETTER E WITH ACUTE",
+    a_ACUTE => "LATIN SMALL LETTER A WITH ACUTE",
+    );
+--FILE--
+use charnames ":short", ":alias" => "xyzzy";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'LATIN SMALL LETTER E WITH ACUTE' at
+########
+# alias with file implicit :full but file has :short aliasses
+--FILE-- ../lib/unicore/xyzzy_alias.pl
+#!perl
+(   e_ACUTE => "LATIN:e WITH ACUTE",
+    a_ACUTE => "LATIN:a WITH ACUTE",
+    );
+--FILE--
+use charnames ":alias" => ":xyzzy";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+Unknown charname 'LATIN:e WITH ACUTE' at
+########
+# alias with file implicit :full and file has :long aliasses
+--FILE-- ../lib/unicore/xyzzy_alias.pl
+#!perl
+(   e_ACUTE => "LATIN SMALL LETTER E WITH ACUTE",
+    a_ACUTE => "LATIN SMALL LETTER A WITH ACUTE",
+    );
+--FILE--
+use charnames ":alias" => ":xyzzy";
+"Here: \N{e_ACUTE}\N{a_ACUTE}!\n";
+EXPECT
+OPTIONS regex
+$
diff --git a/t/lib/common.pl b/t/lib/common.pl
index 9167323494..20bfa4f320 100644
--- a/t/lib/common.pl
+++ b/t/lib/common.pl
@@ -1,4 +1,4 @@
-# This code is used by lib/feature.t, lib/strict.t and lib/warnings.t
+# This code is used by lib/charnames.t, lib/feature.t, lib/strict.t and lib/warnings.t
 
 BEGIN {
     require './test.pl';
@@ -90,10 +90,10 @@ for (@prgs){
 	    my $filename = shift @files ;
 	    my $code = shift @files ;
     	    push @temps, $filename ;
-    	    if ($filename =~ m#(.*)/#) {
+    	    if ($filename =~ m#(.*)/# && $filename !~ m#^\.\./#) {
                 mkpath($1);
                 push(@temp_path, $1);
-    	    }
+	    }
 	    open F, ">$filename" or die "Cannot open $filename: $!\n" ;
 	    print F $code ;
 	    close F or die "Cannot close $filename: $!\n";