Re: encoding neutral unpack

[p5sagit/p5-mst-13.2.git] / t / uni / chomp.t

diff --git a/t/uni/chomp.t b/t/uni/chomp.t
index 1cb3d15..5f52558 100644 (file)
--- a/t/uni/chomp.t
+++ b/t/uni/chomp.t
@@ -3,7 +3,7 @@
 BEGIN {
     if ($ENV{'PERL_CORE'}){
         chdir 't';
-        unshift @INC, '../lib';
+        @INC = '../lib';
     }
     require Config; import Config;
     if ($Config{'extensions'} !~ /\bEncode\b/) {
@@ -18,15 +18,15 @@ BEGIN {
         print "1..0 # Skip: PerlIO required\n";
         exit 0;
     }
-    eval 'use Encode';
-    if ($@ =~ /dynamic loading not available/) {
-        print "1..0 # Skip: no dynamic loading, no Encode\n";
+    if ($ENV{PERL_CORE_MINITEST}) {
+        print "1..0 # Skip: no dynamic loading on miniperl, no Encode\n";
         exit 0;
     }
 }
 
+use Encode;
 use strict;
-use Test::More tests => (4 * 4 * 4) * (3); # (@char ** 3) * (keys %mbchars)
+use Test::More;
 
 # %mbchars = (encoding => { bytes => utf8, ... }, ...);
 # * pack('C*') is expected to return bytes even if ${^ENCODING} is true.
@@ -45,6 +45,10 @@ our %mbchars = (
     },
 );
 
+# 4 == @char; paired tests inside 3 nested loops,
+# plus extra pair of tests in a loop, plus extra pair of tests.
+plan tests => 2 * (4 ** 3 + 4 + 1) * (keys %mbchars);
+
 for my $enc (sort keys %mbchars) {
     local ${^ENCODING} = find_encoding($enc);
     my @char = (sort(keys   %{ $mbchars{$enc} }),
@@ -55,10 +59,30 @@ for my $enc (sort keys %mbchars) {
        for my $start (@char) {
            for my $end (@char) {
                my $string = $start.$end;
-               my $expect = $end eq $rs ? $start : $string;
-               chomp $string;
-               is($string, $expect);
+               my ($expect, $return);
+               if ($end eq $rs) {
+                   $expect = $start;
+                   # The answer will always be a length in utf8, even if the
+                   # scalar was encoded with a different length
+                   $return = length ($end . "\x{100}") - 1;
+               } else {
+                   $expect = $string;
+                   $return = 0;
+               }
+               is (chomp ($string), $return);
+               is ($string, $expect); # "$enc \$/=$rs $start $end"
            }
        }
+       # chomp should not stringify references unless it decides to modify
+       # them
+       $_ = [];
+       my $got = chomp();
+       is ($got, 0);
+       is (ref($_), "ARRAY", "chomp ref (no modify)");
     }
+
+    $/ = ")";  # the last char of something like "ARRAY(0x80ff6e4)"
+    my $got = chomp();
+    is ($got, 1);
+    ok (!ref($_), "chomp ref (modify)");
 }