From bce3d0cf7d7ae42bb9da887e8a946b92e6266702 Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Mon, 21 Oct 2002 19:19:05 +0000
Subject: [PATCH] Renamed the test cases.

---
 ext/mbstring/tests/002.phpt                   | 28 --------
 ext/mbstring/tests/003.phpt                   | 20 ------
 ext/mbstring/tests/004.phpt                   | 32 ---------
 ext/mbstring/tests/005.phpt                   | 21 ------
 ext/mbstring/tests/006.phpt                   | 19 -----
 ext/mbstring/tests/007.phpt                   | 10 ---
 ext/mbstring/tests/008.phpt                   | 22 ------
 ext/mbstring/tests/009.inc                    | 70 -------------------
 ext/mbstring/tests/009.phpt                   | 33 ---------
 ext/mbstring/tests/010.phpt                   | 67 ------------------
 ext/mbstring/tests/011.inc                    | 57 ---------------
 ext/mbstring/tests/011.phpt                   | 31 --------
 ext/mbstring/tests/012.phpt                   | 15 ----
 ext/mbstring/tests/013.phpt                   | 15 ----
 ext/mbstring/tests/014.phpt                   | 20 ------
 ext/mbstring/tests/015.phpt                   | 36 ----------
 ext/mbstring/tests/016.phpt                   | 35 ----------
 ext/mbstring/tests/017.phpt                   | 30 --------
 ext/mbstring/tests/018.phpt                   | 10 ---
 ext/mbstring/tests/019.phpt                   | 38 ----------
 ext/mbstring/tests/021.inc                    |  5 --
 ext/mbstring/tests/022.phpt                   | 20 ------
 ext/mbstring/tests/023.phpt                   | 22 ------
 ext/mbstring/tests/024.inc                    | 26 -------
 ext/mbstring/tests/025.inc                    |  7 --
 ext/mbstring/tests/026.inc                    |  4 --
 ext/mbstring/tests/027.inc                    |  6 --
 .../tests/{026.phpt => casefold.phpt}         |  6 +-
 ext/mbstring/tests/{020.phpt => htmlent.phpt} |  0
 .../{016.inc => mb_convert_encoding.phpt}     | 35 ++++++++++
 .../{015.inc => mb_convert_variables.phpt}    | 36 ++++++++++
 .../{017.inc => mb_detect_encoding.phpt}      | 30 ++++++++
 .../tests/{005.inc => mb_detect_order.phpt}   | 21 ++++++
 ext/mbstring/tests/{023.inc => mb_ereg.phpt}  | 22 ++++++
 .../tests/{021.phpt => mb_ereg_replace.phpt}  |  7 +-
 .../{024.phpt => mb_ereg_search_xxx.phpt}     | 28 +++++++-
 .../tests/{003.inc => mb_http_input.phpt}     | 18 +++++
 .../tests/{004.inc => mb_http_output.phpt}    | 32 +++++++++
 .../{002.inc => mb_internal_encoding.phpt}    | 28 ++++++++
 ...{007.inc => mb_output_handler_euc_jp.phpt} | 10 +++
 .../{008.inc => mb_preferred_mime_name.phpt}  | 22 ++++++
 .../{025.phpt => mb_regex_set_options.phpt}   |  9 ++-
 ext/mbstring/tests/{022.inc => mb_split.phpt} | 20 ++++++
 .../tests/{013.inc => mb_strcut.phpt}         | 15 ++++
 .../tests/{014.inc => mb_strimwidth.phpt}     | 20 ++++++
 .../tests/{019.inc => mb_strlen.phpt}         | 38 ++++++++++
 .../tests/{010.inc => mb_strpos.phpt}         | 67 ++++++++++++++++++
 .../tests/{018.inc => mb_strwidth.phpt}       | 10 +++
 .../{006.inc => mb_substitute_character.phpt} | 19 +++++
 .../tests/{012.inc => mb_substr.phpt}         | 15 ++++
 .../tests/{027.phpt => php_gr_jp_10830.phpt}  |  8 ++-
 .../tests/{001.phpt => simpletest.phpt}       |  0
 52 files changed, 511 insertions(+), 704 deletions(-)
 delete mode 100644 ext/mbstring/tests/002.phpt
 delete mode 100644 ext/mbstring/tests/003.phpt
 delete mode 100644 ext/mbstring/tests/004.phpt
 delete mode 100644 ext/mbstring/tests/005.phpt
 delete mode 100644 ext/mbstring/tests/006.phpt
 delete mode 100644 ext/mbstring/tests/007.phpt
 delete mode 100644 ext/mbstring/tests/008.phpt
 delete mode 100644 ext/mbstring/tests/009.inc
 delete mode 100644 ext/mbstring/tests/009.phpt
 delete mode 100644 ext/mbstring/tests/010.phpt
 delete mode 100644 ext/mbstring/tests/011.inc
 delete mode 100644 ext/mbstring/tests/011.phpt
 delete mode 100644 ext/mbstring/tests/012.phpt
 delete mode 100644 ext/mbstring/tests/013.phpt
 delete mode 100644 ext/mbstring/tests/014.phpt
 delete mode 100644 ext/mbstring/tests/015.phpt
 delete mode 100644 ext/mbstring/tests/016.phpt
 delete mode 100644 ext/mbstring/tests/017.phpt
 delete mode 100644 ext/mbstring/tests/018.phpt
 delete mode 100644 ext/mbstring/tests/019.phpt
 delete mode 100644 ext/mbstring/tests/021.inc
 delete mode 100644 ext/mbstring/tests/022.phpt
 delete mode 100644 ext/mbstring/tests/023.phpt
 delete mode 100644 ext/mbstring/tests/024.inc
 delete mode 100644 ext/mbstring/tests/025.inc
 delete mode 100644 ext/mbstring/tests/026.inc
 delete mode 100644 ext/mbstring/tests/027.inc
 rename ext/mbstring/tests/{026.phpt => casefold.phpt} (62%)
 rename ext/mbstring/tests/{020.phpt => htmlent.phpt} (100%)
 rename ext/mbstring/tests/{016.inc => mb_convert_encoding.phpt} (71%)
 rename ext/mbstring/tests/{015.inc => mb_convert_variables.phpt} (69%)
 rename ext/mbstring/tests/{017.inc => mb_detect_encoding.phpt} (83%)
 rename ext/mbstring/tests/{005.inc => mb_detect_order.phpt} (76%)
 rename ext/mbstring/tests/{023.inc => mb_ereg.phpt} (51%)
 rename ext/mbstring/tests/{021.phpt => mb_ereg_replace.phpt} (54%)
 rename ext/mbstring/tests/{024.phpt => mb_ereg_search_xxx.phpt} (52%)
 rename ext/mbstring/tests/{003.inc => mb_http_input.phpt} (61%)
 rename ext/mbstring/tests/{004.inc => mb_http_output.phpt} (81%)
 rename ext/mbstring/tests/{002.inc => mb_internal_encoding.phpt} (78%)
 rename ext/mbstring/tests/{007.inc => mb_output_handler_euc_jp.phpt} (58%)
 rename ext/mbstring/tests/{008.inc => mb_preferred_mime_name.phpt} (76%)
 rename ext/mbstring/tests/{025.phpt => mb_regex_set_options.phpt} (52%)
 rename ext/mbstring/tests/{022.inc => mb_split.phpt} (78%)
 rename ext/mbstring/tests/{013.inc => mb_strcut.phpt} (71%)
 rename ext/mbstring/tests/{014.inc => mb_strimwidth.phpt} (72%)
 rename ext/mbstring/tests/{019.inc => mb_strlen.phpt} (84%)
 rename ext/mbstring/tests/{010.inc => mb_strpos.phpt} (85%)
 rename ext/mbstring/tests/{018.inc => mb_strwidth.phpt} (86%)
 rename ext/mbstring/tests/{006.inc => mb_substitute_character.phpt} (81%)
 rename ext/mbstring/tests/{012.inc => mb_substr.phpt} (70%)
 rename ext/mbstring/tests/{027.phpt => php_gr_jp_10830.phpt} (66%)
 rename ext/mbstring/tests/{001.phpt => simpletest.phpt} (100%)

diff --git a/ext/mbstring/tests/002.phpt b/ext/mbstring/tests/002.phpt
deleted file mode 100644
index a0c8c2555c..0000000000
--- a/ext/mbstring/tests/002.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-mb_internal_encoding() test 
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('002.inc'); ?>
---EXPECT--
-OK_EUC-JP_SET
-EUC-JP
-OK_UTF-8_SET
-UTF-8
-OK_ASCII_SET
-ASCII
-== INVALID PARAMETER ==
-ERR: Warning
-OK_BAD_SET
-ASCII
-ERR: Notice
-ERR: Warning
-OK_BAD_ARY_SET
-ASCII
-ERR: Notice
-ERR: Warning
-OK_BAD_OBJ_SET
-ASCII
-
diff --git a/ext/mbstring/tests/003.phpt b/ext/mbstring/tests/003.phpt
deleted file mode 100644
index ea1710ec17..0000000000
--- a/ext/mbstring/tests/003.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-mb_http_input() 
---SKIPIF--
-<?php
-	include('skipif.inc');
-	if(php_sapi_name()!='cgi') {
-		die("skip\n");
-	}
-?>
---POST--
-a=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
---GET--
-b=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
---FILE--
-<?php include('003.inc'); ?>
---EXPECT--
-ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
-ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
-OK
-
diff --git a/ext/mbstring/tests/004.phpt b/ext/mbstring/tests/004.phpt
deleted file mode 100644
index 31ccd4a1e9..0000000000
--- a/ext/mbstring/tests/004.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-mb_http_output()  
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('004.inc'); ?>
---EXPECT--
-OK_ASCII_SET
-ASCII
-OK_SJIS_SET
-SJIS
-OK_JIS_SET
-JIS
-OK_UTF-8_SET
-UTF-8
-OK_EUC-JP_SET
-EUC-JP
-== INVALID PARAMETER ==
-ERR: Warning
-OK_BAD_SET
-EUC-JP
-ERR: Notice
-ERR: Warning
-OK_BAD_ARY_SET
-EUC-JP
-ERR: Notice
-ERR: Warning
-OK_BAD_OBJ_SET
-EUC-JP
-
diff --git a/ext/mbstring/tests/005.phpt b/ext/mbstring/tests/005.phpt
deleted file mode 100644
index 7c0dd7ab66..0000000000
--- a/ext/mbstring/tests/005.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-mb_detect_order()  
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('005.inc'); ?>
---EXPECT--
-OK_AUTO
-ASCII, JIS, UTF-8, EUC-JP, SJIS
-OK_STR
-SJIS, EUC-JP, JIS, UTF-8
-OK_ARRAY
-ASCII, JIS, EUC-JP, UTF-8
-== INVALID PARAMETER ==
-OK_BAD_STR
-ASCII, JIS, EUC-JP, UTF-8
-OK_BAD_ARRAY
-ASCII, JIS, EUC-JP, UTF-8
-
diff --git a/ext/mbstring/tests/006.phpt b/ext/mbstring/tests/006.phpt
deleted file mode 100644
index 22b3e4a4fd..0000000000
--- a/ext/mbstring/tests/006.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-mb_substitute_character()  
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('006.inc'); ?>
---EXPECT--
-OK_UTF
-12307
-OK_LONG
-long
-OK_NONE
-none
-== INVALID PARAMETER ==
-ERR: Warning
-OK_BAD_NAME
-
diff --git a/ext/mbstring/tests/007.phpt b/ext/mbstring/tests/007.phpt
deleted file mode 100644
index 35bd34f8e0..0000000000
--- a/ext/mbstring/tests/007.phpt
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-mb_output_handler() (EUC-JP)
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('007.inc'); ?>
---EXPECT--
-string(73) "¥Æ¥¹¥ÈÍÑÆüËܸìʸ»úÎ󡣤³¤Î¥â¥¸¥å¡¼¥ë¤ÏPHP¤Ë¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤òÄ󶡤·¤Þ¤¹¡£"
diff --git a/ext/mbstring/tests/008.phpt b/ext/mbstring/tests/008.phpt
deleted file mode 100644
index b84a027b0a..0000000000
--- a/ext/mbstring/tests/008.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-mb_preferred_mime_name()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('008.inc'); ?>
---EXPECT--
-Shift_JIS
-Shift_JIS
-EUC-JP
-UTF-8
-ISO-2022-JP
-ISO-2022-JP
-ISO-8859-1
-UCS-2
-UCS-4
-== INVALID PARAMETER ==
-ERR: Warning
-OK_BAD_NAME
-
diff --git a/ext/mbstring/tests/009.inc b/ext/mbstring/tests/009.inc
deleted file mode 100644
index 2eb2f9d1c8..0000000000
--- a/ext/mbstring/tests/009.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-// TODO: Add more encodings
-
-//$debug=true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-// restore detect_order to 'auto'
-mb_detect_order('auto');
-
-// Test string
-$euc_jp = '0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£0123ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£';
-$ascii  = 'abcdefghijklmnopqrstuvwxyz;]=#0123456789';
-
-// ASCII
-echo "== ASCII ==\n";
-print  mb_strlen($ascii,'ASCII') . "\n";
-print  mb_strlen($ascii) . "\n";
-
-// EUC-JP
-echo "== EUC-JP ==\n";
-print  mb_strlen($euc_jp,'EUC-JP') . "\n";
-mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n");
-print  mb_strlen($euc_jp) . "\n";
-
-// SJIS
-echo "== SJIS ==\n";
-$sjis = mb_convert_encoding($euc_jp, 'SJIS');
-print  mb_strlen($sjis,'SJIS') . "\n";
-mb_internal_encoding('SJIS') or print("mb_internal_encoding() failed\n");
-print  mb_strlen($sjis) . "\n";
-
-// JIS
-// Note: either convert_encoding or strlen has problem
-echo "== JIS ==\n";
-mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n");
-$jis = mb_convert_encoding($euc_jp, 'JIS');
-print  mb_strlen($jis,'JIS') . "\n";
-mb_internal_encoding('JIS')  or print("mb_internal_encoding() failed\n");
-print  mb_strlen($jis) . "\n"; 
-
-// UTF-8
-// Note: either convert_encoding or strlen has problem
-echo "== UTF-8 ==\n";
-mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n");
-$utf8 = mb_convert_encoding($euc_jp, 'UTF-8');
-print  mb_strlen($utf8,'UTF-8') . "\n";
-mb_internal_encoding('UTF-8')  or print("mb_internal_encoding() failed\n");
-print  mb_strlen($utf8) . "\n";  
-
-
-// Wrong Parameters
-echo "== WRONG PARAMETERS ==\n";
-// Array
-// Note: PHP Notice, but returns some value
-$r = mb_strlen($t_ary);
-echo $r."\n";
-// Object
-// Note: PHP Notice, but returns some value
-$r = mb_strlen($t_obj);
-echo $r."\n";
-// Wrong encoding
-mb_internal_encoding('EUC-JP');
-$r = mb_strlen($euc_jp, 'BAD_NAME');
-echo $r."\n";
-
-
-
-
-?>
diff --git a/ext/mbstring/tests/009.phpt b/ext/mbstring/tests/009.phpt
deleted file mode 100644
index 5e1ae42330..0000000000
--- a/ext/mbstring/tests/009.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-mb_strlen()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('009.inc'); ?>
---EXPECT--
-== ASCII ==
-40
-40
-== EUC-JP ==
-43
-43
-== SJIS ==
-43
-43
-== JIS ==
-43
-43
-== UTF-8 ==
-43
-43
-== WRONG PARAMETERS ==
-ERR: Notice
-
-ERR: Notice
-
-ERR: Warning
-
-
-
diff --git a/ext/mbstring/tests/010.phpt b/ext/mbstring/tests/010.phpt
deleted file mode 100644
index 8b3a81f8ce..0000000000
--- a/ext/mbstring/tests/010.phpt
+++ /dev/null
@@ -1,67 +0,0 @@
---TEST--
-mb_strpos() 
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('010.inc'); ?>
---EXPECT--
-== POSITIVE OFFSET ==
-10
-0
-3
-0
-34
-30
-33
-30
-== NEGATIVE OFFSET ==
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-== OUT OF RANGE ==
-OK_OUT_RANGE
-OK_OUT_RANGE
-OK_OUT_RANGE
-OK_OUT_RANGE
-== NON-EXISTENT ==
-OK_STR
-OK_NEWLINE
-== NO ENCODING PARAMETER ==
-10
-0
-3
-0
-OK_STR
-OK_NEWLINE
-== NO OFFSET AND ENCODING PARAMETER ==
-10
-0
-3
-0
-OK_STR
-OK_NEWLINE
-== INVALID PARAMETER TEST ==
-ERR: Warning
-OK_NULL
-ERR: Notice
-OK_ARRAY
-ERR: Notice
-OK_OBJECT
-ERR: Notice
-OK_BAD_ENCODING
-
diff --git a/ext/mbstring/tests/011.inc b/ext/mbstring/tests/011.inc
deleted file mode 100644
index 43ebf82dbe..0000000000
--- a/ext/mbstring/tests/011.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-// TODO: Add more encodings
-
-//$debug=true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-
-// Test string
-$euc_jp = '0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£0123ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£';
-
-// EUC-JP - With encoding parameter
-mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n");
-
-echo "== WITH ENCODING PARAMETER ==\n";
-
-print  mb_strrpos($euc_jp,'ÆüËܸì', 'EUC-JP') . "\n";
-print  mb_strrpos($euc_jp, '0',     'EUC-JP') . "\n";
-print  mb_strrpos($euc_jp, 3,       'EUC-JP') . "\n";
-print  mb_strrpos($euc_jp, 0,       'EUC-JP') . "\n";
-
-
-$r = mb_strrpos($euc_jp, '´Ú¹ñ¸ì', 'EUC-JP');
-($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
-$r = mb_strrpos($euc_jp, "\n",     'EUC-JP');
-($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
-
-
-// EUC-JP - No encoding parameter
-echo "== NO ENCODING PARAMETER ==\n";
-mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
-
-print  mb_strrpos($euc_jp,'ÆüËܸì') . "\n";
-print  mb_strrpos($euc_jp, '0') . "\n";
-print  mb_strrpos($euc_jp, 3) . "\n";
-print  mb_strrpos($euc_jp, 0) . "\n";
-
-$r = mb_strrpos($euc_jp,'´Ú¹ñ¸ì');
-($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
-$r = mb_strrpos($euc_jp,"\n");
-($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
-
-
-// Invalid Parameters
-echo "== INVALID PARAMETER TEST ==\n";
-
-$r = mb_strrpos($euc_jp,'','EUC-JP');
-($r === FALSE) ? print("OK_NULL\n") : print("NG_NULL\n");
-$r = mb_strrpos($euc_jp, $t_ary, 'EUC-JP');
-($r === FALSE) ? print("OK_ARRAY\n") : print("NG_ARRAY\n");
-$r = mb_strrpos($euc_jp, $t_obj, 'EUC-JP');
-($r === FALSE) ? print("OK_OBJECT\n") : print("NG_OBJECT\n");
-
-//Note: Notice msg for NULL string might be better.
-
-
-?>
diff --git a/ext/mbstring/tests/011.phpt b/ext/mbstring/tests/011.phpt
deleted file mode 100644
index e6ef9c68bf..0000000000
--- a/ext/mbstring/tests/011.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-mb_strrpos()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('011.inc'); ?>
---EXPECT--
-== WITH ENCODING PARAMETER ==
-34
-30
-33
-30
-OK_STR
-OK_NEWLINE
-== NO ENCODING PARAMETER ==
-34
-30
-33
-30
-OK_STR
-OK_NEWLINE
-== INVALID PARAMETER TEST ==
-ERR: Warning
-OK_NULL
-ERR: Notice
-OK_ARRAY
-ERR: Notice
-OK_OBJECT
-
diff --git a/ext/mbstring/tests/012.phpt b/ext/mbstring/tests/012.phpt
deleted file mode 100644
index 250e4a0ec4..0000000000
--- a/ext/mbstring/tests/012.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_substr()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('012.inc'); ?>
---EXPECT--
-1: ÆüËܸì¤Ç¤¹¡£EUC-
-2: 0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
-3 OK
-4 OK: 0123¤³¤Îʸ»úÎó¤Ï
-
-
diff --git a/ext/mbstring/tests/013.phpt b/ext/mbstring/tests/013.phpt
deleted file mode 100644
index 6c3624ee1b..0000000000
--- a/ext/mbstring/tests/013.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_strcut()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('013.inc'); ?>
---EXPECT--
-¤Îʸ
-0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
-OK
-OK: 0123¤³¤Îʸ
-
-
diff --git a/ext/mbstring/tests/014.phpt b/ext/mbstring/tests/014.phpt
deleted file mode 100644
index db37e9f8bc..0000000000
--- a/ext/mbstring/tests/014.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-mb_strimwidth()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('014.inc'); ?>
---EXPECT--
-1: 0123¤³¤Îʸ»ú...
-2: 0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
-3: ¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
-ERR: Warning
-4 OK
-ERR: Warning
-5 OK
-ERR: Warning
-6 OK
-
-
diff --git a/ext/mbstring/tests/015.phpt b/ext/mbstring/tests/015.phpt
deleted file mode 100644
index cc7b228688..0000000000
--- a/ext/mbstring/tests/015.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-mb_convert_variables()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('015.inc'); ?>
---EXPECT--
-== SCALER TEST ==
-SJIS
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-JIS
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-EUC-JP
-k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
-EUC-JP
-GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-== ARRAY TEST ==
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-== OBJECT TEST ==
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-== SCALER, ARRAY AND OBJECT TEST ==
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-
diff --git a/ext/mbstring/tests/016.phpt b/ext/mbstring/tests/016.phpt
deleted file mode 100644
index a3908031a6..0000000000
--- a/ext/mbstring/tests/016.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-mb_convert_encoding()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('016.inc'); ?>
---EXPECT--
-== BASIC TEST ==
-EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
-JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
-== STRING ENCODING LIST ==
-EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
-JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
-== ARRAY ENCODING LIST ==
-EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
-JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
-== DETECT ORDER ==
-EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
-JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
-== INVALID PARAMETER ==
-INT: 1234
-EUC-JP: 
-ERR: Warning
-BAD: 
-ERR: Warning
-MP: 
-
-
diff --git a/ext/mbstring/tests/017.phpt b/ext/mbstring/tests/017.phpt
deleted file mode 100644
index 5f8528e5f7..0000000000
--- a/ext/mbstring/tests/017.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-mb_detect_encoding()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('017.inc'); ?>
---EXPECT--
-== BASIC TEST ==
-SJIS: SJIS
-JIS: JIS
-EUC-JP: EUC-JP
-EUC-JP: EUC-JP
-== ARRAY ENCODING LIST ==
-JIS: UTF-8
-EUC-JP: EUC-JP
-SJIS: SJIS
-== DETECT ORDER ==
-JIS: JIS
-EUC-JP: EUC-JP
-SJIS: SJIS
-== INVALID PARAMETER ==
-INT: EUC-JP
-EUC-JP: EUC-JP
-ERR: Warning
-BAD: EUC-JP
-ERR: Warning
-MP: 
-
diff --git a/ext/mbstring/tests/018.phpt b/ext/mbstring/tests/018.phpt
deleted file mode 100644
index b212b84934..0000000000
--- a/ext/mbstring/tests/018.phpt
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-mb_strwidth()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('018.inc'); ?>
---EXPECT--
-1: 68
diff --git a/ext/mbstring/tests/019.phpt b/ext/mbstring/tests/019.phpt
deleted file mode 100644
index 31eb4e3474..0000000000
--- a/ext/mbstring/tests/019.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-mb_strlen()
---SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
---FILE--
-<?php include('019.inc'); ?>
---EXPECT--
-== ASCII ==
-ERR: Warning
-
-40
-== EUC-JP ==
-ERR: Warning
-
-72
-== SJIS ==
-ERR: Warning
-
-72
-== JIS ==
-ERR: Warning
-
-121
-== UTF-8 ==
-ERR: Warning
-
-174
-== WRONG PARAMETERS ==
-ERR: Notice
-5
-ERR: Notice
-6
-ERR: Warning
-
-
-
diff --git a/ext/mbstring/tests/021.inc b/ext/mbstring/tests/021.inc
deleted file mode 100644
index 77131b56c2..0000000000
--- a/ext/mbstring/tests/021.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-	mb_regex_set_options( '' );
-	print mb_ereg_replace( ' ', '-', 'a b c d e' )."\n";
-	print mb_ereg_replace( '([a-z]+)','[\\1]', 'abc def ghi' );
-?>
diff --git a/ext/mbstring/tests/022.phpt b/ext/mbstring/tests/022.phpt
deleted file mode 100644
index 955eb7ac3c..0000000000
--- a/ext/mbstring/tests/022.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-mb_split()
---SKIPIF--
-<?php include('skipif.inc'); ?>
-function_exists('mb_split') or die("SKIP");
---POST--
---GET--
---FILE--
-<?php include('022.inc'); ?>
---EXPECT--
-bool(true)
-ok
-ok
-ok
-ok
-ok
-ok
-2-2
-3-3
-4-4
diff --git a/ext/mbstring/tests/023.phpt b/ext/mbstring/tests/023.phpt
deleted file mode 100644
index c4c9d4138e..0000000000
--- a/ext/mbstring/tests/023.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-mb_ereg()
---SKIPIF--
-<?php include('skipif.inc'); ?>
-function_exists('mb_ereg') or die("SKIP");
---POST--
---GET--
---FILE--
-<?php include('023.inc'); ?>
---EXPECT--
-(15)abc def ghi jkl def ghi jkl
-(27)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
-(27)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
-(15)abc def ghi jkl def ghi jkl
-(27)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
-(27)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
-(15)abc def ghi jkl def ghi jkl
-(27)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
-(27)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
-(15)abc def ghi jkl def ghi jkl
-(39)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
-(39)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
diff --git a/ext/mbstring/tests/024.inc b/ext/mbstring/tests/024.inc
deleted file mode 100644
index d84cd613f3..0000000000
--- a/ext/mbstring/tests/024.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-	mb_regex_set_options( '' );
-
-	$encs = array( 'EUC-JP', 'Shift_JIS', 'SJIS', 'UTF-8' );
-
-	function test_search( $test_enc, $str, $look_for, $opt, $in_enc = 'EUC-JP' ) {
-		mb_regex_encoding( $test_enc );
-		$str = mb_convert_encoding( $str, $test_enc, $in_enc );
-		$look_for = mb_convert_encoding( $look_for, $test_enc, $in_enc );
-		mb_ereg_search_init( $str, $look_for, $opt );
-		while ( mb_ereg_search_pos() ) {
-			$regs = mb_ereg_search_getregs();
-			array_shift( $regs );
-			printf( "(%s) (%d) %s\n", $test_enc, mb_ereg_search_getpos(), mb_convert_encoding( ( is_array( $regs ) ? implode( '-', $regs ): '' ), $in_enc, $test_enc ) );
-		}
-	}	
-	function do_tests( $enc, $opt ) {
-		test_search( $enc, "¢Ï¡¦ ¡¦¢Ï\n", ' (¡¦?¢Ï¡¦?)[[:space:]]', $opt );
-		test_search( $enc, 'abcde abdeabcf anvfabc odu abcd ', '(ab[a-z]+)', $opt );
-	}
-
-	foreach( $encs as $enc ) {
-		do_tests( $enc, '' );
-		do_tests( $enc, 'x' );
-	}
-?>
diff --git a/ext/mbstring/tests/025.inc b/ext/mbstring/tests/025.inc
deleted file mode 100644
index 89a05494b4..0000000000
--- a/ext/mbstring/tests/025.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-	mb_regex_set_options( 'x' );
-	print mb_ereg_replace(' -', '+', '- - - - -' );
-
-	mb_regex_set_options( '' );
-	print mb_ereg_replace(' -', '+', '- - - - -' );
-?>
diff --git a/ext/mbstring/tests/026.inc b/ext/mbstring/tests/026.inc
deleted file mode 100644
index 5649b5f96e..0000000000
--- a/ext/mbstring/tests/026.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-	print mb_strtolower( "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n" );
-	print mb_strtoupper( mb_strtolower( "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n" ) );
-?>
diff --git a/ext/mbstring/tests/027.inc b/ext/mbstring/tests/027.inc
deleted file mode 100644
index f9f004fb7d..0000000000
--- a/ext/mbstring/tests/027.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$a="aaa\n<>";
-
-var_dump( mb_ereg("^[^><]+$",$a) );
-var_dump( ereg("^[^><]+$",$a) );
-?>
diff --git a/ext/mbstring/tests/026.phpt b/ext/mbstring/tests/casefold.phpt
similarity index 62%
rename from ext/mbstring/tests/026.phpt
rename to ext/mbstring/tests/casefold.phpt
index 3ee5e3a564..ece6e22475 100644
--- a/ext/mbstring/tests/026.phpt
+++ b/ext/mbstring/tests/casefold.phpt
@@ -6,7 +6,11 @@ function_exists('mb_strtolower') or die("SKIP");
 --POST--
 --GET--
 --FILE--
-<?php include('026.inc'); ?>
+<?php
+	print mb_strtolower( "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n" );
+	print mb_strtoupper( mb_strtolower( "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n" ) );
+?>
+
 --EXPECT--
 abcdefghijklmnopqrstuvwxyz
 ABCDEFGHIJKLMNOPQRSTUVWXYZ
diff --git a/ext/mbstring/tests/020.phpt b/ext/mbstring/tests/htmlent.phpt
similarity index 100%
rename from ext/mbstring/tests/020.phpt
rename to ext/mbstring/tests/htmlent.phpt
diff --git a/ext/mbstring/tests/016.inc b/ext/mbstring/tests/mb_convert_encoding.phpt
similarity index 71%
rename from ext/mbstring/tests/016.inc
rename to ext/mbstring/tests/mb_convert_encoding.phpt
index d661fefb96..6779e14ad5 100644
--- a/ext/mbstring/tests/016.inc
+++ b/ext/mbstring/tests/mb_convert_encoding.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_convert_encoding()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Add more tests
 //$debug = true; // Uncomment this line to view error/warning/notice message in *.out file
@@ -100,3 +107,31 @@ print("MP: $s\n"); // Missing parameter
 
 
 ?>
+
+--EXPECT--
+== BASIC TEST ==
+EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
+JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
+== STRING ENCODING LIST ==
+EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
+JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
+== ARRAY ENCODING LIST ==
+EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
+JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
+== DETECT ORDER ==
+EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
+JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
+== INVALID PARAMETER ==
+INT: 1234
+EUC-JP: 
+ERR: Warning
+BAD: 
+ERR: Warning
+MP: 
+
+
diff --git a/ext/mbstring/tests/015.inc b/ext/mbstring/tests/mb_convert_variables.phpt
similarity index 69%
rename from ext/mbstring/tests/015.inc
rename to ext/mbstring/tests/mb_convert_variables.phpt
index ca7f9dedd3..a77243ff86 100644
--- a/ext/mbstring/tests/015.inc
+++ b/ext/mbstring/tests/mb_convert_variables.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_convert_variables()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Add more tests
 //$debug = true; // Uncomment this line to view error/warning/notice message in *.out file
@@ -125,3 +132,32 @@ print("{$oo->s1}{$oo->s2}{$oo->s3}\n"); // Converted to EUC-JP
 
 
 ?>
+
+--EXPECT--
+== SCALER TEST ==
+SJIS
+ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+JIS
+ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+EUC-JP
+k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
+EUC-JP
+GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
+EUC-JP
+ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+== ARRAY TEST ==
+EUC-JP
+ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+EUC-JP
+ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+== OBJECT TEST ==
+EUC-JP
+ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+EUC-JP
+ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+== SCALER, ARRAY AND OBJECT TEST ==
+EUC-JP
+ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
+
diff --git a/ext/mbstring/tests/017.inc b/ext/mbstring/tests/mb_detect_encoding.phpt
similarity index 83%
rename from ext/mbstring/tests/017.inc
rename to ext/mbstring/tests/mb_detect_encoding.phpt
index fd4f5b2d08..f05844a838 100644
--- a/ext/mbstring/tests/017.inc
+++ b/ext/mbstring/tests/mb_detect_encoding.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_detect_encoding()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Add more tests
 //$debug = true; // Uncomment this line to view error/warning/notice message in *.out file
@@ -89,3 +96,26 @@ print("MP: $s\n"); // Missing parameter
 
 
 ?>
+
+--EXPECT--
+== BASIC TEST ==
+SJIS: SJIS
+JIS: JIS
+EUC-JP: EUC-JP
+EUC-JP: EUC-JP
+== ARRAY ENCODING LIST ==
+JIS: UTF-8
+EUC-JP: EUC-JP
+SJIS: SJIS
+== DETECT ORDER ==
+JIS: JIS
+EUC-JP: EUC-JP
+SJIS: SJIS
+== INVALID PARAMETER ==
+INT: EUC-JP
+EUC-JP: EUC-JP
+ERR: Warning
+BAD: EUC-JP
+ERR: Warning
+MP: 
+
diff --git a/ext/mbstring/tests/005.inc b/ext/mbstring/tests/mb_detect_order.phpt
similarity index 76%
rename from ext/mbstring/tests/005.inc
rename to ext/mbstring/tests/mb_detect_order.phpt
index 1ffcafd011..a84849f2fb 100644
--- a/ext/mbstring/tests/005.inc
+++ b/ext/mbstring/tests/mb_detect_order.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_detect_order()  
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 //$debug = true;
 ini_set('include_path','.');
@@ -38,3 +45,17 @@ $r = mb_detect_order($a);
 print implode(', ', mb_detect_order()) . "\n";
 
 ?>
+
+--EXPECT--
+OK_AUTO
+ASCII, JIS, UTF-8, EUC-JP, SJIS
+OK_STR
+SJIS, EUC-JP, JIS, UTF-8
+OK_ARRAY
+ASCII, JIS, EUC-JP, UTF-8
+== INVALID PARAMETER ==
+OK_BAD_STR
+ASCII, JIS, EUC-JP, UTF-8
+OK_BAD_ARRAY
+ASCII, JIS, EUC-JP, UTF-8
+
diff --git a/ext/mbstring/tests/023.inc b/ext/mbstring/tests/mb_ereg.phpt
similarity index 51%
rename from ext/mbstring/tests/023.inc
rename to ext/mbstring/tests/mb_ereg.phpt
index 923312efb8..2fe791f371 100644
--- a/ext/mbstring/tests/023.inc
+++ b/ext/mbstring/tests/mb_ereg.phpt
@@ -1,3 +1,11 @@
+--TEST--
+mb_ereg()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+function_exists('mb_ereg') or die("SKIP");
+--POST--
+--GET--
+--FILE--
 <?php
 	mb_regex_set_options( '' );
 
@@ -21,3 +29,17 @@
 		do_tests( $enc );
 	}
 ?>
+
+--EXPECT--
+(15)abc def ghi jkl def ghi jkl
+(27)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
+(27)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
+(15)abc def ghi jkl def ghi jkl
+(27)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
+(27)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
+(15)abc def ghi jkl def ghi jkl
+(27)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
+(27)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
+(15)abc def ghi jkl def ghi jkl
+(39)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
+(39)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
diff --git a/ext/mbstring/tests/021.phpt b/ext/mbstring/tests/mb_ereg_replace.phpt
similarity index 54%
rename from ext/mbstring/tests/021.phpt
rename to ext/mbstring/tests/mb_ereg_replace.phpt
index ba882574fa..da7f0336c6 100644
--- a/ext/mbstring/tests/021.phpt
+++ b/ext/mbstring/tests/mb_ereg_replace.phpt
@@ -6,7 +6,12 @@ function_exists('mb_ereg_replace') or die("SKIP");
 --POST--
 --GET--
 --FILE--
-<?php include('021.inc'); ?>
+<?php
+	mb_regex_set_options( '' );
+	print mb_ereg_replace( ' ', '-', 'a b c d e' )."\n";
+	print mb_ereg_replace( '([a-z]+)','[\\1]', 'abc def ghi' );
+?>
+
 --EXPECT--
 a-b-c-d-e
 [abc] [def] [ghi]
diff --git a/ext/mbstring/tests/024.phpt b/ext/mbstring/tests/mb_ereg_search_xxx.phpt
similarity index 52%
rename from ext/mbstring/tests/024.phpt
rename to ext/mbstring/tests/mb_ereg_search_xxx.phpt
index 2637e2df48..98b42c3b25 100644
--- a/ext/mbstring/tests/024.phpt
+++ b/ext/mbstring/tests/mb_ereg_search_xxx.phpt
@@ -6,7 +6,33 @@ function_exists('mb_ereg_search') or die("SKIP");
 --POST--
 --GET--
 --FILE--
-<?php include('024.inc'); ?>
+<?php
+	mb_regex_set_options( '' );
+
+	$encs = array( 'EUC-JP', 'Shift_JIS', 'SJIS', 'UTF-8' );
+
+	function test_search( $test_enc, $str, $look_for, $opt, $in_enc = 'EUC-JP' ) {
+		mb_regex_encoding( $test_enc );
+		$str = mb_convert_encoding( $str, $test_enc, $in_enc );
+		$look_for = mb_convert_encoding( $look_for, $test_enc, $in_enc );
+		mb_ereg_search_init( $str, $look_for, $opt );
+		while ( mb_ereg_search_pos() ) {
+			$regs = mb_ereg_search_getregs();
+			array_shift( $regs );
+			printf( "(%s) (%d) %s\n", $test_enc, mb_ereg_search_getpos(), mb_convert_encoding( ( is_array( $regs ) ? implode( '-', $regs ): '' ), $in_enc, $test_enc ) );
+		}
+	}	
+	function do_tests( $enc, $opt ) {
+		test_search( $enc, "¢Ï¡¦ ¡¦¢Ï\n", ' (¡¦?¢Ï¡¦?)[[:space:]]', $opt );
+		test_search( $enc, 'abcde abdeabcf anvfabc odu abcd ', '(ab[a-z]+)', $opt );
+	}
+
+	foreach( $encs as $enc ) {
+		do_tests( $enc, '' );
+		do_tests( $enc, 'x' );
+	}
+?>
+
 --EXPECT--
 (EUC-JP) (10) ¡¦¢Ï
 (EUC-JP) (5) abcde
diff --git a/ext/mbstring/tests/003.inc b/ext/mbstring/tests/mb_http_input.phpt
similarity index 61%
rename from ext/mbstring/tests/003.inc
rename to ext/mbstring/tests/mb_http_input.phpt
index b6a6d3e9a4..642c514bf7 100644
--- a/ext/mbstring/tests/003.inc
+++ b/ext/mbstring/tests/mb_http_input.phpt
@@ -1,3 +1,15 @@
+--TEST--
+mb_http_input() 
+--SKIPIF--
+<?php
+include('skipif.inc');
+(php_sapi_name()=='cgi') or die("skip sapi is not a cgi version");
+?>
+--POST--
+a=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
+--GET--
+b=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
+--FILE--
 <?php
 // TODO: This is not a real test.... Need to change so that it does real testing
 //$debug = true;
@@ -30,3 +42,9 @@ else {
 }
 
 ?>
+
+--EXPECT--
+ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
+ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
+OK
+
diff --git a/ext/mbstring/tests/004.inc b/ext/mbstring/tests/mb_http_output.phpt
similarity index 81%
rename from ext/mbstring/tests/004.inc
rename to ext/mbstring/tests/mb_http_output.phpt
index 421bb5a681..237947a70c 100644
--- a/ext/mbstring/tests/004.inc
+++ b/ext/mbstring/tests/mb_http_output.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_http_output()  
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 //TODO: Add more encoding. Wrong paramter type test.
 //$debug = true;
@@ -54,3 +61,28 @@ $enc = mb_http_output();
 print "$enc\n";
 
 ?>
+
+--EXPECT--
+OK_ASCII_SET
+ASCII
+OK_SJIS_SET
+SJIS
+OK_JIS_SET
+JIS
+OK_UTF-8_SET
+UTF-8
+OK_EUC-JP_SET
+EUC-JP
+== INVALID PARAMETER ==
+ERR: Warning
+OK_BAD_SET
+EUC-JP
+ERR: Notice
+ERR: Warning
+OK_BAD_ARY_SET
+EUC-JP
+ERR: Notice
+ERR: Warning
+OK_BAD_OBJ_SET
+EUC-JP
+
diff --git a/ext/mbstring/tests/002.inc b/ext/mbstring/tests/mb_internal_encoding.phpt
similarity index 78%
rename from ext/mbstring/tests/002.inc
rename to ext/mbstring/tests/mb_internal_encoding.phpt
index 6b16ca8d46..647025fe8a 100644
--- a/ext/mbstring/tests/002.inc
+++ b/ext/mbstring/tests/mb_internal_encoding.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_internal_encoding()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: 
 //$debug = true;
@@ -42,3 +49,24 @@ $enc = mb_internal_encoding();
 print "$enc\n";
 
 ?>
+
+--EXPECT--
+OK_EUC-JP_SET
+EUC-JP
+OK_UTF-8_SET
+UTF-8
+OK_ASCII_SET
+ASCII
+== INVALID PARAMETER ==
+ERR: Warning
+OK_BAD_SET
+ASCII
+ERR: Notice
+ERR: Warning
+OK_BAD_ARY_SET
+ASCII
+ERR: Notice
+ERR: Warning
+OK_BAD_OBJ_SET
+ASCII
+
diff --git a/ext/mbstring/tests/007.inc b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
similarity index 58%
rename from ext/mbstring/tests/007.inc
rename to ext/mbstring/tests/mb_output_handler_euc_jp.phpt
index 5436bae09f..eb09a11ae7 100644
--- a/ext/mbstring/tests/007.inc
+++ b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_output_handler() (EUC-JP)
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Do real test
 
@@ -11,3 +18,6 @@ $output = ob_get_clean();
 var_dump( $output );
 
 ?>
+
+--EXPECT--
+string(73) "¥Æ¥¹¥ÈÍÑÆüËܸìʸ»úÎ󡣤³¤Î¥â¥¸¥å¡¼¥ë¤ÏPHP¤Ë¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤òÄ󶡤·¤Þ¤¹¡£"
diff --git a/ext/mbstring/tests/008.inc b/ext/mbstring/tests/mb_preferred_mime_name.phpt
similarity index 76%
rename from ext/mbstring/tests/008.inc
rename to ext/mbstring/tests/mb_preferred_mime_name.phpt
index 035f459d6c..7bb05cb7c8 100644
--- a/ext/mbstring/tests/008.inc
+++ b/ext/mbstring/tests/mb_preferred_mime_name.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_preferred_mime_name()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Add more encoding names
 
@@ -39,3 +46,18 @@ $r = mb_preferred_mime_name('BAD_NAME');
 ($r === FALSE) ? print("OK_BAD_NAME\n") : print("NG_BAD_NAME\n");
 
 ?>
+
+--EXPECT--
+Shift_JIS
+Shift_JIS
+EUC-JP
+UTF-8
+ISO-2022-JP
+ISO-2022-JP
+ISO-8859-1
+UCS-2
+UCS-4
+== INVALID PARAMETER ==
+ERR: Warning
+OK_BAD_NAME
+
diff --git a/ext/mbstring/tests/025.phpt b/ext/mbstring/tests/mb_regex_set_options.phpt
similarity index 52%
rename from ext/mbstring/tests/025.phpt
rename to ext/mbstring/tests/mb_regex_set_options.phpt
index 1377f4a2b2..ec1f3910e2 100644
--- a/ext/mbstring/tests/025.phpt
+++ b/ext/mbstring/tests/mb_regex_set_options.phpt
@@ -6,6 +6,13 @@ function_exists('mb_regex_set_options') or die("SKIP");
 --POST--
 --GET--
 --FILE--
-<?php include('025.inc'); ?>
+<?php
+	mb_regex_set_options( 'x' );
+	print mb_ereg_replace(' -', '+', '- - - - -' );
+
+	mb_regex_set_options( '' );
+	print mb_ereg_replace(' -', '+', '- - - - -' );
+?>
+
 --EXPECT--
 + + + + +-++++
diff --git a/ext/mbstring/tests/022.inc b/ext/mbstring/tests/mb_split.phpt
similarity index 78%
rename from ext/mbstring/tests/022.inc
rename to ext/mbstring/tests/mb_split.phpt
index e12fc0e53e..4ffcdeb109 100644
--- a/ext/mbstring/tests/022.inc
+++ b/ext/mbstring/tests/mb_split.phpt
@@ -1,3 +1,11 @@
+--TEST--
+mb_split()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+function_exists('mb_split') or die("SKIP");
+--POST--
+--GET--
+--FILE--
 <?php
 	mb_regex_set_options( '' );
 	mb_regex_encoding( 'EUC-JP' );
@@ -24,3 +32,15 @@
 		verify_split( "\xa1\xa1+", "\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1", $i );
 	}
 ?>
+
+--EXPECT--
+bool(true)
+ok
+ok
+ok
+ok
+ok
+ok
+2-2
+3-3
+4-4
diff --git a/ext/mbstring/tests/013.inc b/ext/mbstring/tests/mb_strcut.phpt
similarity index 71%
rename from ext/mbstring/tests/013.inc
rename to ext/mbstring/tests/mb_strcut.phpt
index 97da70c7dc..5afc67dab6 100644
--- a/ext/mbstring/tests/013.inc
+++ b/ext/mbstring/tests/mb_strcut.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_strcut()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Add more encodings
 ini_set('include_path','.');
@@ -17,3 +24,11 @@ $str = mb_strcut($euc_jp, -100, 10,'EUC-JP');
 
 
 ?>
+
+--EXPECT--
+¤Îʸ
+0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
+OK
+OK: 0123¤³¤Îʸ
+
+
diff --git a/ext/mbstring/tests/014.inc b/ext/mbstring/tests/mb_strimwidth.phpt
similarity index 72%
rename from ext/mbstring/tests/014.inc
rename to ext/mbstring/tests/mb_strimwidth.phpt
index 0e714e7abf..61afe243b0 100644
--- a/ext/mbstring/tests/014.inc
+++ b/ext/mbstring/tests/mb_strimwidth.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_strimwidth()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Add more encoding
 //$debug = true;
@@ -21,3 +28,16 @@ $str = mb_strimwidth($euc_jp, -100, 10,'...','EUC-JP');
 ($str === FALSE) ? print "6 OK\n" : print "NG: $str\n";
 
 ?>
+
+--EXPECT--
+1: 0123¤³¤Îʸ»ú...
+2: 0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
+3: ¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
+ERR: Warning
+4 OK
+ERR: Warning
+5 OK
+ERR: Warning
+6 OK
+
+
diff --git a/ext/mbstring/tests/019.inc b/ext/mbstring/tests/mb_strlen.phpt
similarity index 84%
rename from ext/mbstring/tests/019.inc
rename to ext/mbstring/tests/mb_strlen.phpt
index 8de98f4778..5ce999ac7d 100644
--- a/ext/mbstring/tests/019.inc
+++ b/ext/mbstring/tests/mb_strlen.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_strlen()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Add more encodings
 
@@ -66,3 +73,34 @@ echo $r."\n";
 
 
 ?>
+
+--EXPECT--
+== ASCII ==
+ERR: Warning
+
+40
+== EUC-JP ==
+ERR: Warning
+
+72
+== SJIS ==
+ERR: Warning
+
+72
+== JIS ==
+ERR: Warning
+
+121
+== UTF-8 ==
+ERR: Warning
+
+174
+== WRONG PARAMETERS ==
+ERR: Notice
+5
+ERR: Notice
+6
+ERR: Warning
+
+
+
diff --git a/ext/mbstring/tests/010.inc b/ext/mbstring/tests/mb_strpos.phpt
similarity index 85%
rename from ext/mbstring/tests/010.inc
rename to ext/mbstring/tests/mb_strpos.phpt
index dc50d3fcff..99a2751f0a 100644
--- a/ext/mbstring/tests/010.inc
+++ b/ext/mbstring/tests/mb_strpos.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_strpos() 
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Add more encodings
 
@@ -108,3 +115,63 @@ $r = mb_strpos($euc_jp, $t_obj, 'BAD_ENCODING');
 
 
 ?>
+
+--EXPECT--
+== POSITIVE OFFSET ==
+10
+0
+3
+0
+34
+30
+33
+30
+== NEGATIVE OFFSET ==
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+ERR: Warning
+OK_NEGATIVE_OFFSET
+== OUT OF RANGE ==
+OK_OUT_RANGE
+OK_OUT_RANGE
+OK_OUT_RANGE
+OK_OUT_RANGE
+== NON-EXISTENT ==
+OK_STR
+OK_NEWLINE
+== NO ENCODING PARAMETER ==
+10
+0
+3
+0
+OK_STR
+OK_NEWLINE
+== NO OFFSET AND ENCODING PARAMETER ==
+10
+0
+3
+0
+OK_STR
+OK_NEWLINE
+== INVALID PARAMETER TEST ==
+ERR: Warning
+OK_NULL
+ERR: Notice
+OK_ARRAY
+ERR: Notice
+OK_OBJECT
+ERR: Notice
+OK_BAD_ENCODING
+
diff --git a/ext/mbstring/tests/018.inc b/ext/mbstring/tests/mb_strwidth.phpt
similarity index 86%
rename from ext/mbstring/tests/018.inc
rename to ext/mbstring/tests/mb_strwidth.phpt
index 3d9acfe383..5d8aa62b47 100644
--- a/ext/mbstring/tests/018.inc
+++ b/ext/mbstring/tests/mb_strwidth.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_strwidth()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Add more encoding, strings.....
 //$debug = true;
@@ -22,3 +29,6 @@ $str = mb_strwidth($euc_jp, -100, 10,'...','EUC-JP');
 ($str !== "") ?	print "6 OK: $str\n" : print "NG: $str\n";
 */
 ?>
+
+--EXPECT--
+1: 68
diff --git a/ext/mbstring/tests/006.inc b/ext/mbstring/tests/mb_substitute_character.phpt
similarity index 81%
rename from ext/mbstring/tests/006.inc
rename to ext/mbstring/tests/mb_substitute_character.phpt
index 80422d0a6c..14f6eee135 100644
--- a/ext/mbstring/tests/006.inc
+++ b/ext/mbstring/tests/mb_substitute_character.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_substitute_character()  
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 //$debug = true;
 ini_set('include_path','.');
@@ -30,3 +37,15 @@ $r = mb_substitute_character('BAD_NAME');
 ($r === FALSE) ? print "OK_BAD_NAME\n" : print("NG_BAD_NAME: ".gettype($r)." $r\n");
 
 ?>
+
+--EXPECT--
+OK_UTF
+12307
+OK_LONG
+long
+OK_NONE
+none
+== INVALID PARAMETER ==
+ERR: Warning
+OK_BAD_NAME
+
diff --git a/ext/mbstring/tests/012.inc b/ext/mbstring/tests/mb_substr.phpt
similarity index 70%
rename from ext/mbstring/tests/012.inc
rename to ext/mbstring/tests/mb_substr.phpt
index d6dad9a903..8a45b22be0 100644
--- a/ext/mbstring/tests/012.inc
+++ b/ext/mbstring/tests/mb_substr.phpt
@@ -1,3 +1,10 @@
+--TEST--
+mb_substr()
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--POST--
+--GET--
+--FILE--
 <?php
 // TODO: Add more encodings
 ini_set('include_path','.');
@@ -17,3 +24,11 @@ $str = mb_substr($euc_jp, -100, 10,'EUC-JP');
 ($str !== "") ? print "4 OK: $str\n" : print "NG: $str\n";
 
 ?>
+
+--EXPECT--
+1: ÆüËܸì¤Ç¤¹¡£EUC-
+2: 0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
+3 OK
+4 OK: 0123¤³¤Îʸ»úÎó¤Ï
+
+
diff --git a/ext/mbstring/tests/027.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt
similarity index 66%
rename from ext/mbstring/tests/027.phpt
rename to ext/mbstring/tests/php_gr_jp_10830.phpt
index d426e9ad94..bf94de0c58 100644
--- a/ext/mbstring/tests/027.phpt
+++ b/ext/mbstring/tests/php_gr_jp_10830.phpt
@@ -6,7 +6,13 @@ function_exists('mb_ereg') or die("SKIP");
 --POST--
 --GET--
 --FILE--
-<?php include('027.inc'); ?>
+<?php
+$a="aaa\n<>";
+
+var_dump( mb_ereg("^[^><]+$",$a) );
+var_dump( ereg("^[^><]+$",$a) );
+?>
+
 --EXPECT--
 bool(false)
 bool(false)
diff --git a/ext/mbstring/tests/001.phpt b/ext/mbstring/tests/simpletest.phpt
similarity index 100%
rename from ext/mbstring/tests/001.phpt
rename to ext/mbstring/tests/simpletest.phpt
-- 
2.50.1