dmitry Mon Jul 9 11:38:34 2007 UTC Modified files: /php-src/ext/standard/tests/math bug30695.phpt /php-src/ext/standard/tests/strings bug40704.phpt md5.phpt md5_file.phpt substr.phpt trim1.phpt Log: Fixed tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/bug30695.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/math/bug30695.phpt diff -u php-src/ext/standard/tests/math/bug30695.phpt:1.1 php-src/ext/standard/tests/math/bug30695.phpt:1.2 --- php-src/ext/standard/tests/math/bug30695.phpt:1.1 Mon Nov 29 10:15:03 2004 +++ php-src/ext/standard/tests/math/bug30695.phpt Mon Jul 9 11:38:34 2007 @@ -1,5 +1,7 @@ --TEST-- Bug #30695 (32 bit issues) +--INI-- +unicode.output_encoding=ISO-8859-1 --FILE-- <?php function toUTF8( $char_code ) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug40704.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/bug40704.phpt diff -u php-src/ext/standard/tests/strings/bug40704.phpt:1.2 php-src/ext/standard/tests/strings/bug40704.phpt:1.3 --- php-src/ext/standard/tests/strings/bug40704.phpt:1.2 Tue May 29 20:11:23 2007 +++ php-src/ext/standard/tests/strings/bug40704.phpt Mon Jul 9 11:38:34 2007 @@ -11,3 +11,6 @@ --EXPECT-- string(26) "Bug ' Trigger Missing Text" Done +--UEXPECT-- +unicode(26) "Bug ' Trigger Missing Text" +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/md5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/md5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/md5_file.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/md5_file.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/substr.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/substr.phpt diff -u php-src/ext/standard/tests/strings/substr.phpt:1.2 php-src/ext/standard/tests/strings/substr.phpt:1.3 --- php-src/ext/standard/tests/strings/substr.phpt:1.2 Sat May 12 12:12:26 2007 +++ php-src/ext/standard/tests/strings/substr.phpt Mon Jul 9 11:38:34 2007 @@ -1,5 +1,8 @@ --TEST-- Testing substr() function +--INI-- +unicode.script_encoding=ISO-8859-1 +unicode.output_encoding=ISO-8859-1 --FILE-- <?php @@ -216,3 +219,143 @@ string(26) "ñtërnâtiônà lizætiøn" Done +--UEXPECTF-- +*** Testing for error conditions *** + +Warning: substr() expects at least 2 parameters, 0 given in %s on line %d +NULL + +Warning: substr() expects at least 2 parameters, 1 given in %s on line %d +NULL + +Warning: substr() expects at least 2 parameters, 1 given in %s on line %d +NULL + +Warning: substr() expects at least 2 parameters, 1 given in %s on line %d +NULL + +Warning: substr() expects at most 3 parameters, 4 given in %s on line %d +NULL + +--- Iteration 1 --- + +-- Variations for two arguments -- +bool(false) +bool(false) +bool(false) + +-- Variations for three arguments -- +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) + +--- Iteration 2 --- + +-- Variations for two arguments -- +bool(false) +bool(false) +bool(false) + +-- Variations for three arguments -- +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) + +--- Iteration 3 --- + +-- Variations for two arguments -- +unicode(4) "2345" +unicode(5) "12345" +unicode(2) "45" + +-- Variations for three arguments -- +unicode(3) "234" +unicode(0) "" +unicode(1) "2" +unicode(3) "123" +unicode(0) "" +unicode(2) "12" +unicode(2) "45" +unicode(0) "" +unicode(0) "" + +--- Iteration 4 --- + +-- Variations for two arguments -- +unicode(5) "bcdef" +unicode(6) "abcdef" +unicode(2) "ef" + +-- Variations for three arguments -- +unicode(3) "bcd" +unicode(0) "" +unicode(2) "bc" +unicode(3) "abc" +unicode(0) "" +unicode(3) "abc" +unicode(2) "ef" +unicode(0) "" +unicode(0) "" + +--- Iteration 5 --- + +-- Variations for two arguments -- +unicode(5) "23abc" +unicode(6) "123abc" +unicode(2) "bc" + +-- Variations for three arguments -- +unicode(3) "23a" +unicode(0) "" +unicode(2) "23" +unicode(3) "123" +unicode(0) "" +unicode(3) "123" +unicode(2) "bc" +unicode(0) "" +unicode(0) "" + +--- Iteration 6 --- + +-- Variations for two arguments -- +unicode(6) "123abc" +unicode(7) "_123abc" +unicode(2) "bc" + +-- Variations for three arguments -- +unicode(3) "123" +unicode(0) "" +unicode(3) "123" +unicode(3) "_12" +unicode(0) "" +unicode(4) "_123" +unicode(2) "bc" +unicode(0) "" +unicode(0) "" + +*** Testing for variations of start and length to point to same element *** +unicode(1) "c" +unicode(1) "c" + +*** Testing for start > truncation *** +unicode(0) "" + +*** Testing for string with null characters *** +unicode(6) "c+ +*** Testing for string with international characters *** +unicode(26) "ñtërnâtiônà lizætiøn" + +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/trim1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/trim1.phpt
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php