X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fcharnames.t;h=29ee0f39a6a71c4eb1b076f128bab979bc6ea820;hb=702fa71c711a708b512dca4870841461f8f582ee;hp=6a961c6b74fbb64a30ffa27f44fdc1e4699a3927;hpb=80a5d8e74b5512d4ab704d0e83466ae41247ce55;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/charnames.t b/lib/charnames.t
index 6a961c6..29ee0f3 100644
--- a/lib/charnames.t
+++ b/lib/charnames.t
@@ -12,7 +12,7 @@ BEGIN {
 
 $| = 1;
 
-print "1..39\n";
+print "1..46\n";
 
 use charnames ':full';
 
@@ -144,7 +144,7 @@ sub to_bytes {
 
 {
     print "not " unless
-	sprintf "%04X\n", charnames::vianame("GOTHIC LETTER AHSA") eq "10330";
+	sprintf("%04X", charnames::vianame("GOTHIC LETTER AHSA")) eq "10330";
     print "ok 19\n";
 
     print "not " if
@@ -159,7 +159,7 @@ sub to_bytes {
     print "ok 21\n";
 
     print "not " unless
-	sprintf "%04X\n", charnames::vianame("GOTHIC LETTER AHSA") eq "10330";
+	sprintf("%04X", charnames::vianame("GOTHIC LETTER AHSA")) eq "10330";
     print "ok 22\n";
 
 }
@@ -173,14 +173,28 @@ print "ok 24\n";
 print "not " unless "\N{NULL}" eq "\c@";
 print "ok 25\n";
 
-print "not " unless "\N{LINE FEED (LF)}" eq "\n";
-print "ok 26\n";
+if ($^O eq 'MacOS')
+{
+	print "not " unless "\N{CARRIAGE RETURN (CR)}" eq "\n";
+	print "ok 26\n";
+
+	print "not " unless "\N{CARRIAGE RETURN}" eq "\n";
+	print "ok 27\n";
+
+	print "not " unless "\N{CR}" eq "\n";
+	print "ok 28\n";
+}
+else
+{
+	print "not " unless "\N{LINE FEED (LF)}" eq "\n";
+	print "ok 26\n";
 
-print "not " unless "\N{LINE FEED}" eq "\n";
-print "ok 27\n";
+	print "not " unless "\N{LINE FEED}" eq "\n";
+	print "ok 27\n";
 
-print "not " unless "\N{LF}" eq "\n";
-print "ok 28\n";
+	print "not " unless "\N{LF}" eq "\n";
+	print "ok 28\n";
+}
 
 my $nel = ord("A") == 193 ? qr/^(?:\x15|\x25)$/ : qr/^\x85$/;
 
@@ -226,3 +240,27 @@ print "ok 38\n";
     print "ok 39\n";
 }
 
+print "not " unless ord("\N{ZWNJ}") == 0x200C;
+print "ok 40\n";
+
+print "not " unless ord("\N{ZWJ}") == 0x200D;
+print "ok 41\n";
+
+print "not " unless "\N{U+263A}" eq "\N{WHITE SMILING FACE}";
+print "ok 42\n";
+
+{
+    print "not " unless
+	0x3093 == charnames::vianame("HIRAGANA LETTER N");
+    print "ok 43\n";
+
+    print "not " unless
+	0x0397 == charnames::vianame("GREEK CAPITAL LETTER ETA");
+    print "ok 44\n";
+}
+
+print "not " if defined charnames::viacode(0x110000);
+print "ok 45\n";
+
+print "not " if grep { /you asked for U+110000/ } @WARN;
+print "ok 46\n";