cvs: php-src /ext/standard/tests/strings bug21338.phpt bug25671.phpt bug25707.phpt bug33076.phpt str_replace.phpt

tony2001 Thu Nov 9 01:16:48 2006 UTC Modified files: /php-src/ext/standard/tests/strings bug21338.phpt bug25671.phpt bug25707.phpt bug33076.phpt str_replace.phpt Log: fix more tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug21338.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/strings/bug21338.phpt diff -u php-src/ext/standard/tests/strings/bug21338.phpt:1.1 php-src/ext/standard/tests/strings/bug21338.phpt:1.2 --- php-src/ext/standard/tests/strings/bug21338.phpt:1.1 Thu Jan 2 19:49:29 2003 +++ php-src/ext/standard/tests/strings/bug21338.phpt Thu Nov 9 01:16:48 2006 @@ -8,3 +8,6 @@ --EXPECT-- string(0) "" string(0) "" +--UEXPECT-- +unicode(0) "" +unicode(0) "" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug25671.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/bug25671.phpt diff -u php-src/ext/standard/tests/strings/bug25671.phpt:1.2 php-src/ext/standard/tests/strings/bug25671.phpt:1.3 --- php-src/ext/standard/tests/strings/bug25671.phpt:1.2 Tue Jun 20 19:49:44 2006 +++ php-src/ext/standard/tests/strings/bug25671.phpt Thu Nov 9 01:16:48 2006 @@ -21,7 +21,7 @@ a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";} a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;s:23:"This is another string.";i:1;s:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";} --UEXPECT-- -a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;s:22:"This is a last strung.";} -a:4:{i:0;s:19:"This is strung one.";i:1;s:19:"This is strung two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;s:22:"This is a last strung.";} -a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";} -a:4:{i:0;s:16:"Thisisstringone.";i:1;s:16:"Thisisstringtwo.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;s:18:"Thisisalaststring.";} +a:4:{i:0;U:19:"This is strung one.";i:1;U:19:"This is strung two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;U:22:"This is a last strung.";} +a:4:{i:0;U:19:"This is strung one.";i:1;U:19:"This is strung two.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;U:22:"This is a last strung.";} +a:4:{i:0;U:16:"Thisisstringone.";i:1;U:16:"Thisisstringtwo.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;U:18:"Thisisalaststring.";} +a:4:{i:0;U:16:"Thisisstringone.";i:1;U:16:"Thisisstringtwo.";i:2;a:2:{i:0;U:23:"This is another string.";i:1;U:22:"This is a last string.";}i:3;U:18:"Thisisalaststring.";} http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug25707.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/strings/bug25707.phpt diff -u php-src/ext/standard/tests/strings/bug25707.phpt:1.1 php-src/ext/standard/tests/strings/bug25707.phpt:1.2 --- php-src/ext/standard/tests/strings/bug25707.phpt:1.1 Thu Oct 2 06:57:21 2003 +++ php-src/ext/standard/tests/strings/bug25707.phpt Thu Nov 9 01:16:48 2006 @@ -10,3 +10,7 @@ string(4) "<" string(5) "&" string(8) "<" +--UEXPECT-- +unicode(4) "<" +unicode(5) "&" +unicode(8) "<" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug33076.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/strings/bug33076.phpt diff -u php-src/ext/standard/tests/strings/bug33076.phpt:1.1 php-src/ext/standard/tests/strings/bug33076.phpt:1.2 --- php-src/ext/standard/tests/strings/bug33076.phpt:1.1 Fri May 20 14:23:42 2005 +++ php-src/ext/standard/tests/strings/bug33076.phpt Thu Nov 9 01:16:48 2006 @@ -12,3 +12,6 @@ --EXPECT-- string(6) "bzexbz" Done +--UEXPECT-- +unicode(6) "bzexbz" +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_replace.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/strings/str_replace.phpt diff -u php-src/ext/standard/tests/strings/str_replace.phpt:1.1 php-src/ext/standard/tests/strings/str_replace.phpt:1.2 --- php-src/ext/standard/tests/strings/str_replace.phpt:1.1 Thu Oct 5 19:49:20 2006 +++ php-src/ext/standard/tests/strings/str_replace.phpt Thu Nov 9 01:16:48 2006 @@ -106,3 +106,57 @@ string(%d) "Resource id #%d" int(1) Done +--UEXPECTF-- +unicode(0) "" +unicode(4) "tbst" +unicode(0) "" +int(0) +unicode(1) "q" +int(1) +unicode(0) "" +int(0) +unicode(0) "" +int(0) +unicode(1) "a" +int(1) +unicode(3) "aaa" +int(0) +unicode(15) "multimultimulti" +int(3) +unicode(15) "multimultimulti" +int(3) +unicode(3) "qqq" +int(3) +array(2) { + [0]=> + unicode(3) "qqq" + [1]=> + unicode(3) "ccc" +} +int(6) + +Notice: Array to string conversion in %s on line %d +array(2) { + [0]=> + unicode(15) "ArrayArrayArray" + [1]=> + unicode(3) "bbb" +} +int(3) +array(2) { + [0]=> + unicode(3) "111" + [1]=> + unicode(3) "bbb" +} +int(3) +array(2) { + [0]=> + unicode(4) "aaa3" + [1]=> + unicode(4) "2bbb" +} +int(1) +unicode(%d) "Resource id #%d" +int(1) +Done