[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring/tests mb_strlen.phpt mb_substr.phpt

[Seiji Masugata]

masugata                Sat Jul 29 17:11:09 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/mbstring/tests mb_strlen.phpt mb_substr.phpt 
  Log:
  fix tests.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strlen.phpt?r1=1.3.6.1&r2=1.3.6.2&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strlen.phpt
diff -u php-src/ext/mbstring/tests/mb_strlen.phpt:1.3.6.1 
php-src/ext/mbstring/tests/mb_strlen.phpt:1.3.6.2
--- php-src/ext/mbstring/tests/mb_strlen.phpt:1.3.6.1   Mon May 29 21:08:02 2006
+++ php-src/ext/mbstring/tests/mb_strlen.phpt   Sat Jul 29 17:11:09 2006
@@ -21,35 +21,35 @@
 
 // ASCII
 echo "== ASCII ==\n";
-print  strlen($ascii,'ASCII') . "\n";
+print  mb_strlen($ascii,'ASCII') . "\n";
 print  strlen($ascii) . "\n";
 
 // EUC-JP
 echo "== EUC-JP ==\n";
-print  strlen($euc_jp,'EUC-JP') . "\n";
+print  mb_strlen($euc_jp,'EUC-JP') . "\n";
 mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n");
 print  strlen($euc_jp) . "\n";
 
 // SJIS
 echo "== SJIS ==\n";
-$sjis = mb_convert_encoding($euc_jp, 'SJIS');
-print  strlen($sjis,'SJIS') . "\n";
+$sjis = mb_convert_encoding($euc_jp, 'SJIS','EUC-JP');
+print  mb_strlen($sjis,'SJIS') . "\n";
 mb_internal_encoding('SJIS') or print("mb_internal_encoding() failed\n");
 print  strlen($sjis) . "\n";
 
 // JIS
 // Note: either convert_encoding or strlen has problem
 echo "== JIS ==\n";
-$jis = mb_convert_encoding($euc_jp, 'JIS');
-print  strlen($jis,'JIS') . "\n";
+$jis = mb_convert_encoding($euc_jp, 'JIS','EUC-JP');
+print  mb_strlen($jis,'JIS') . "\n";
 mb_internal_encoding('JIS')  or print("mb_internal_encoding() failed\n");
 print  strlen($jis) . "\n"; 
 
 // UTF-8
 // Note: either convert_encoding or strlen has problem
 echo "== UTF-8 ==\n";
-$utf8 = mb_convert_encoding($euc_jp, 'UTF-8');
-print  strlen($utf8,'UTF-8') . "\n";
+$utf8 = mb_convert_encoding($euc_jp, 'UTF-8','EUC-JP');
+print  mb_strlen($utf8,'UTF-8') . "\n";
 mb_internal_encoding('UTF-8')  or print("mb_internal_encoding() failed\n");
 print  strlen($utf8) . "\n";  
 
@@ -66,7 +66,7 @@
 echo $r."\n";
 // Wrong encoding
 mb_internal_encoding('EUC-JP');
-$r = strlen($euc_jp, 'BAD_NAME');
+$r = mb_strlen($euc_jp, 'BAD_NAME');
 echo $r."\n";
 
 
@@ -76,25 +76,20 @@
 
 --EXPECT--
 == ASCII ==
-ERR: Warning
-
+40
 40
 == EUC-JP ==
-ERR: Warning
-
+43
 72
 == SJIS ==
-ERR: Warning
-
+43
 72
 == JIS ==
-ERR: Warning
-
-121
+43
+90
 == UTF-8 ==
-ERR: Warning
-
-174
+43
+101
 == WRONG PARAMETERS ==
 ERR: Notice
 5
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_substr.phpt?r1=1.3&r2=1.3.20.1&diff_format=u
Index: php-src/ext/mbstring/tests/mb_substr.phpt
diff -u php-src/ext/mbstring/tests/mb_substr.phpt:1.3 
php-src/ext/mbstring/tests/mb_substr.phpt:1.3.20.1
--- php-src/ext/mbstring/tests/mb_substr.phpt:1.3       Sun Nov  3 08:37:59 2002
+++ php-src/ext/mbstring/tests/mb_substr.phpt   Sat Jul 29 17:11:09 2006
@@ -4,6 +4,7 @@
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
 output_handler=
+mbstring.func_overload=0
 --FILE--
 <?php
 // TODO: Add more encodings

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php