tests bug16069.inc bug16069.phpt eucjp2iso2022jp.inc eucjp2iso2022jp.phpt eucjp2sjis.inc eucjp2sjis.phpt eucjp2utf8.inc eucjp2utf8.phpt iconv001.phpt iconv002.inc iconv002.phpt ob_iconv_handler.phpt skipif.inc test.inc translit-failure.phpt translit-utf8.inc translit-utf8.phpt

Marcus B�rger Mon, 28 Oct 2002 09:17:11 -0800

helly           Mon Oct 28 12:15:22 2002 EDT

  Added files:                 
    /php4/ext/iconv/tests       test.inc


  Removed files:               
    /php4/ext/iconv/tests       bug16069.inc eucjp2iso2022jp.inc 
                                eucjp2sjis.inc eucjp2utf8.inc iconv002.inc 
                                translit-utf8.inc 

  Modified files:              
    /php4/ext/iconv/tests       bug16069.phpt eucjp2iso2022jp.phpt 
                                eucjp2sjis.phpt eucjp2utf8.phpt iconv001.phpt 
                                iconv002.phpt ob_iconv_handler.phpt 
                                skipif.inc translit-failure.phpt 
                                translit-utf8.phpt 
  Log:
  fix this tests
  -they did not dl load module in test....
  -disable E_NOTICE

Index: php4/ext/iconv/tests/bug16069.phpt
diff -u php4/ext/iconv/tests/bug16069.phpt:1.2 php4/ext/iconv/tests/bug16069.phpt:1.3
--- php4/ext/iconv/tests/bug16069.phpt:1.2      Mon Oct 21 06:35:02 2002
+++ php4/ext/iconv/tests/bug16069.phpt  Mon Oct 28 12:15:21 2002
@@ -7,9 +7,16 @@
        die("skip  CP932 translit not available\n");
 }
 ?>
---POST--
---GET--
+--INI--
+error_reporting=2039
 --FILE--
-<?php include('bug16069.inc'); ?>
+<?php
+include('test.inc');
+/* charset=CP932, KOI8-R */
+$str = 
+"\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d";
+print iconv( "CP932", "EUC-JP//TRANSLIT", $str );
+$str = "(\x9c\xe4\x9c)";
+print iconv( "KOI8-R", "EUC-JP//TRANSLIT", $str );
+?>
 --EXPECT--
 
�ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���ߥ�С���(�맥��)
Index: php4/ext/iconv/tests/eucjp2iso2022jp.phpt
diff -u php4/ext/iconv/tests/eucjp2iso2022jp.phpt:1.2 
php4/ext/iconv/tests/eucjp2iso2022jp.phpt:1.3
--- php4/ext/iconv/tests/eucjp2iso2022jp.phpt:1.2       Fri Jul 12 21:05:13 2002
+++ php4/ext/iconv/tests/eucjp2iso2022jp.phpt   Mon Oct 28 12:15:21 2002
@@ -2,10 +2,57 @@
 EUC-JP to ISO-2022-JP
 --SKIPIF--
 <?php include('skipif.inc'); ?>
---POST--
---GET--
+--INI--
+error_reporting=2039
 --FILE--
-<?php include('eucjp2iso2022jp.inc'); ?>
+<?php
+include('test.inc');
+/* charset=EUC-JP */
+
+$str = "
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+";
+
+$str = iconv("EUC-JP", "ISO-2022-JP", $str);
+$str = base64_encode($str);
+echo $str."\n";
+
+?>
 --EXPECT--
 
ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0Cg==
 
Index: php4/ext/iconv/tests/eucjp2sjis.phpt
diff -u php4/ext/iconv/tests/eucjp2sjis.phpt:1.1 
php4/ext/iconv/tests/eucjp2sjis.phpt:1.2
--- php4/ext/iconv/tests/eucjp2sjis.phpt:1.1    Sat Mar  2 02:00:40 2002
+++ php4/ext/iconv/tests/eucjp2sjis.phpt        Mon Oct 28 12:15:21 2002
@@ -2,10 +2,57 @@
 EUC-JP to SJIS
 --SKIPIF--
 <?php include('skipif.inc'); ?>
---POST--
---GET--
+--INI--
+error_reporting=2039
 --FILE--
-<?php include('eucjp2sjis.inc'); ?>
+<?php
+include('test.inc');
+/* charset=EUC-JP */
+
+$str = "
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+";
+
+$str = iconv("EUC-JP", "SJIS", $str);
+$str = base64_encode($str);
+echo $str."\n";
+
+?>
 --EXPECT--
 
CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0Cg==
 
Index: php4/ext/iconv/tests/eucjp2utf8.phpt
diff -u php4/ext/iconv/tests/eucjp2utf8.phpt:1.5 
php4/ext/iconv/tests/eucjp2utf8.phpt:1.6
--- php4/ext/iconv/tests/eucjp2utf8.phpt:1.5    Sat Jul 13 21:12:23 2002
+++ php4/ext/iconv/tests/eucjp2utf8.phpt        Mon Oct 28 12:15:21 2002
@@ -2,10 +2,57 @@
 EUC-JP to UTF8
 --SKIPIF--
 <?php include('skipif.inc');?>
---POST--
---GET--
+--INI--
+error_reporting=2039
 --FILE--
-<?php include('eucjp2utf8.inc'); ?>
+<?php
+include('test.inc');
+/* charset=EUC-JP */
+
+$str = "
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+���ܸ�ƥ����Ȥ�English Text
+";
+
+$str = iconv("EUC-JP", "UTF-8", $str); /* libiconv(1.8) doesn't know "UTF8" but 
+"UTF-8". */ 
+$str = base64_encode($str);
+echo $str."\n";
+
+?>
 --EXPECT--
 
CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0Cg==
 
Index: php4/ext/iconv/tests/iconv001.phpt
diff -u php4/ext/iconv/tests/iconv001.phpt:1.1 php4/ext/iconv/tests/iconv001.phpt:1.2
--- php4/ext/iconv/tests/iconv001.phpt:1.1      Sat Oct 26 04:50:05 2002
+++ php4/ext/iconv/tests/iconv001.phpt  Mon Oct 28 12:15:21 2002
@@ -2,10 +2,11 @@
 iconv test
 --SKIPIF--
 <?php include('skipif.inc'); ?>
---POST--
---GET--
+--INI--
+error_reporting=2039
 --FILE--
 <?php
+include('test.inc');
 echo "iconv extension is available\n";
 $test = "���";
 var_dump("ISO-8859-1: $test");
Index: php4/ext/iconv/tests/iconv002.phpt
diff -u php4/ext/iconv/tests/iconv002.phpt:1.1 php4/ext/iconv/tests/iconv002.phpt:1.2
--- php4/ext/iconv/tests/iconv002.phpt:1.1      Sat Oct 26 04:50:05 2002
+++ php4/ext/iconv/tests/iconv002.phpt  Mon Oct 28 12:15:21 2002
@@ -2,8 +2,24 @@
 UCS4BE to ASCII
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+error_reporting=2039
 --FILE--
-<?php include('iconv002.inc'); ?>
+<?php
+include('test.inc');
+/*
+Expected output:
+&#97;&#98;&#99;&#100;
+abcd
+*/
+
+   $s = unpack("V*", iconv("ascii","UCS-4LE", "abcd"));
+   foreach($s as $c) { print "&#$c;"; } print "\n";
+
+   $s = pack("NNNN", 97, 98, 99, 100);
+   $q = iconv("UCS-4BE", "ascii", $s);
+   print $q; print "\n";
+?>
 --EXPECT--
 &#97;&#98;&#99;&#100;
 abcd
Index: php4/ext/iconv/tests/ob_iconv_handler.phpt
diff -u php4/ext/iconv/tests/ob_iconv_handler.phpt:1.1 
php4/ext/iconv/tests/ob_iconv_handler.phpt:1.2
--- php4/ext/iconv/tests/ob_iconv_handler.phpt:1.1      Sat Oct 26 04:45:49 2002
+++ php4/ext/iconv/tests/ob_iconv_handler.phpt  Mon Oct 28 12:15:21 2002
@@ -2,8 +2,11 @@
 ob_output_handler
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+error_reporting=2039
 --FILE--
 <?php
+include('test.inc');
 iconv_set_encoding('internal_encoding', 'EUC-JP');
 iconv_set_encoding('output_encoding', 'Shift_JIS');
 ob_start('ob_iconv_handler');
Index: php4/ext/iconv/tests/skipif.inc
diff -u php4/ext/iconv/tests/skipif.inc:1.1 php4/ext/iconv/tests/skipif.inc:1.2
--- php4/ext/iconv/tests/skipif.inc:1.1 Sat Feb  2 21:18:30 2002
+++ php4/ext/iconv/tests/skipif.inc     Mon Oct 28 12:15:21 2002
@@ -6,6 +6,6 @@
   @dl("iconv$dlext");
 }
 if (!extension_loaded("iconv")) {
-    die("skip\n");
+    die("skip iconv extension not available\n");
 }
 ?>
Index: php4/ext/iconv/tests/translit-failure.phpt
diff -u php4/ext/iconv/tests/translit-failure.phpt:1.6 
php4/ext/iconv/tests/translit-failure.phpt:1.7
--- php4/ext/iconv/tests/translit-failure.phpt:1.6      Mon Oct 21 06:35:02 2002
+++ php4/ext/iconv/tests/translit-failure.phpt  Mon Oct 28 12:15:21 2002
@@ -5,8 +5,11 @@
 include('skipif.inc');
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
+--INI--
+error_reporting=2039
 --FILE--
 <?php
+include('test.inc');
 // Should be ok.
 // Content from file is from libiconv testkit. Tested both
 // with a string as an implode, no difference.
Index: php4/ext/iconv/tests/translit-utf8.phpt
diff -u php4/ext/iconv/tests/translit-utf8.phpt:1.4 
php4/ext/iconv/tests/translit-utf8.phpt:1.5
--- php4/ext/iconv/tests/translit-utf8.phpt:1.4 Mon Oct 21 06:35:02 2002
+++ php4/ext/iconv/tests/translit-utf8.phpt     Mon Oct 28 12:15:21 2002
@@ -5,8 +5,17 @@
 include('skipif.inc');
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
+--INI--
+error_reporting=2047
 --FILE--
-<?php include('translit-utf8.inc'); ?>
+<?php // vim600: syn=php
+include('test.inc');
+//error_reporting(E_ALL);
+$utf = implode('', file('ext/iconv/tests/Quotes.UTF-8'));
+
+print(iconv("UTF-8", "ISO-8859-1//TRANSLIT", $utf));
+print(iconv("UTF-8", "ASCII//TRANSLIT", $utf));
+?>
 --EXPECT--
 "Hello"
 `Hello�

Index: php4/ext/iconv/tests/test.inc
+++ php4/ext/iconv/tests/test.inc
<?php
// This script prints "skip" if condition does not meet.

if (!extension_loaded("iconv") && ini_get("enable_dl")) {
  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
  @dl("iconv$dlext");
}
?>

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

Reply via email to