wharmby Tue Jan 20 14:19:32 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings vfprintf_basic5.phpt vfprintf_variation3.phpt vfprintf_variation19_64bit.phpt vfprintf_variation20.phpt vfprintf_variation4_64bit.phpt vfprintf_basic6.phpt vfprintf_basic7_64bit.phpt vfprintf_basic9.phpt vfprintf_variation7.phpt vfprintf_variation15.phpt vfprintf_variation19.phpt vfprintf_basic4.phpt vfprintf_variation16.phpt vfprintf_basic7.phpt vfprintf_variation17.phpt vfprintf_basic3.phpt vfprintf_variation12_64bit.phpt vfprintf_variation4.phpt vfprintf_variation13.phpt vfprintf_variation11_64bit.phpt vfprintf_variation5.phpt vfprintf_variation15_64bit.phpt vfprintf_basic2.phpt vfprintf_variation13_64bit.phpt vfprintf_variation14_64bit.phpt vfprintf_variation6.phpt vfprintf_variation10.phpt vfprintf_variation14.phpt vfprintf_basic8.phpt vfprintf_variation9.phpt vfprintf_basic1.phpt vfprintf_variation16_64bit.phpt vfprintf_variation8.phpt vfprintf_variation21.phpt vfprintf_variation11.phpt vfprintf_variation12.phpt vfprintf_variation18.phpt
Modified files: /php-src/ext/standard/tests/strings sprintf_variation36.phpt sprintf_variation48.phpt vsprintf_variation8.phpt sprintf_variation23.phpt vsprintf_variation15.phpt Log: New vfprintf() tests. Tested on Window, Linux and Linux 64 bit
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation36.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u Index: php-src/ext/standard/tests/strings/sprintf_variation36.phpt diff -u php-src/ext/standard/tests/strings/sprintf_variation36.phpt:1.2.2.2 php-src/ext/standard/tests/strings/sprintf_variation36.phpt:1.2.2.3 --- php-src/ext/standard/tests/strings/sprintf_variation36.phpt:1.2.2.2 Sat Sep 29 16:54:56 2007 +++ php-src/ext/standard/tests/strings/sprintf_variation36.phpt Tue Jan 20 14:19:31 2009 @@ -37,38 +37,42 @@ $count++; }; -echo "Done"; +// closing the resources +fclose($fp); +closedir($dfp); + ?> +===DONE=== --EXPECTF-- *** Testing sprintf() : hexa formats with resource values *** -- Iteration 1 -- -string(%d) "%d" -string(%d) "%dx" -string(%d) "%d" +string(%d) "%a" +string(%d) "%ax" +string(%d) "%a" string(1) "x" -string(%d) " %d" -string(%d) "%d " -string(%d) " %d" +string(%d) " %a" +string(%d) "%a " +string(%d) " %a" string(%d) " -%d" -string(%d) " %d" -string(%d) " %d" +%a" +string(4) "%a" +string(30) "%a" string(10) "0-9A-Fa-f]" string(1) "x" -- Iteration 2 -- -string(%d) "%d" -string(%d) "%dx" -string(%d) "%d" +string(%d) "%a" +string(%d) "%ax" +string(%d) "%a" string(1) "x" -string(%d) " %d" -string(%d) "%d " -string(%d) " %d" +string(%d) " %a" +string(%d) "%a " +string(%d) " %a" string(%d) " -%d" -string(%d) " %d" -string(%d) " %d" +%a" +string(4) "%a" +string(30) "%a" string(10) "0-9A-Fa-f]" string(1) "x" -Done +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation48.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u Index: php-src/ext/standard/tests/strings/sprintf_variation48.phpt diff -u php-src/ext/standard/tests/strings/sprintf_variation48.phpt:1.2.2.3 php-src/ext/standard/tests/strings/sprintf_variation48.phpt:1.2.2.4 --- php-src/ext/standard/tests/strings/sprintf_variation48.phpt:1.2.2.3 Mon Dec 24 04:27:55 2007 +++ php-src/ext/standard/tests/strings/sprintf_variation48.phpt Tue Jan 20 14:19:31 2009 @@ -41,9 +41,8 @@ fclose($fp); closedir($dfp); - -echo "Done"; ?> +===DONE=== --EXPECTF-- *** Testing sprintf() : scientific formats with resource values *** @@ -58,8 +57,8 @@ string(%d) " %f" string(%d) "%f" -string(%d) "%s%f" -string(4) "0-1]" +string(30) "%s%f" +string(%d) "0-1]" string(1) "e" -- Iteration 2 -- @@ -74,6 +73,6 @@ %f" string(%d) "%f" string(30) "%s%f" -string(4) "0-1]" +string(%d) "0-1]" string(1) "e" -Done +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation8.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u Index: php-src/ext/standard/tests/strings/vsprintf_variation8.phpt diff -u php-src/ext/standard/tests/strings/vsprintf_variation8.phpt:1.1.4.4 php-src/ext/standard/tests/strings/vsprintf_variation8.phpt:1.1.4.5 --- php-src/ext/standard/tests/strings/vsprintf_variation8.phpt:1.1.4.4 Thu Feb 7 13:44:50 2008 +++ php-src/ext/standard/tests/strings/vsprintf_variation8.phpt Tue Jan 20 14:19:31 2009 @@ -1,7 +1,5 @@ --TEST-- Test vsprintf() function : usage variations - string formats with non-string values ---INI-- -precision=14 --FILE-- <?php /* Prototype : string vsprintf(string format, array args) @@ -14,12 +12,14 @@ * the '$format' and '$args' arguments of the function */ +error_reporting(E_ALL & ~E_NOTICE); + echo "*** Testing vsprintf() : string formats and non-string values ***\n"; // defining array of string formats $formats = '%s %+s %-s - %ls %Ls %4s %-4s + %ls %4s %-4s %10.4s %-10.4s %04s %04.4s %\'#2s %\'2s %\'$2s %\'_2s %3$s %4$s %1$s %2$s'; @@ -30,14 +30,14 @@ // array of float values array(2.2, .2, 10.2, - 123456.234, 123456.234, -1234.6789, +1234.6789, - 2e10, +2e12, -4e11, 22e+12, + 123456.234, -1234.6789, +1234.6789, + 2.1234567e10, +2.7654321e10, -2.7654321e10, 2.1234567e10, 12345.780, 12.000000011111, -12.00000111111, -123456.234, 3.33, +4.44, 1.11,-2.22 ), - + // array of int values array(2, -2, +2, - 123456, 123456234, -12346789, +12346789, + 123456, -12346789, +12346789, 123200, +20000, -40000, 22212, 12345780, 1211111, -12111111, -12345634, 3, +4, 1,-2 ), @@ -45,14 +45,14 @@ // different arrays array( array(0), array(1, 2), array(-1, -1), - array("123"), array('123'), array('-123'), array("-123"), + array("123"), array('-123'), array("-123"), array(true), array(false), array(TRUE), array(FALSE), array("123hello"), array("1", "2"), array('123hello'), array(12=>"12twelve"), array("3"), array("4"), array("1"), array("2") ), // array of boolean data array( true, TRUE, false, - TRUE, 0, FALSE, 1, + TRUE, FALSE, 1, true, false, TRUE, FALSE, 0, 1, 1, 0, 1, TRUE, 0, FALSE), @@ -68,36 +68,36 @@ $counter++; } -echo "Done"; ?> ---EXPECTF-- +===DONE=== +--EXPECT-- *** Testing vsprintf() : string formats and non-string values *** -- Iteration 1 -- -string(177) "2.2 0.2 10.2 - 123456.234 s -1234.6789 1234.6789 - 2000 2000 -400000000000 2200 +string(174) "2.2 0.2 10.2 + 123456.234 -1234.6789 1234.6789 + 2123 2765 -27654321000 2123 12345.78 12.000000011111 -12.00000111111 -123456.234 10.2 123456.234 2.2 0.2" -- Iteration 2 -- -string(132) "2 -2 2 - 123456 s -12346789 12346789 +string(130) "2 -2 2 + 123456 -12346789 12346789 1232 2000 -40000 2221 12345780 1211111 -12111111 -12345634 2 123456 2 -2" -- Iteration 3 -- -string(131) "Array Array Array - Array s Array Array +string(129) "Array Array Array + Array Array Array Arra Arra Array Arra Array Array Array Array Array Array Array Array" -- Iteration 4 -- -string(81) "1 1 - 1 s 1 +string(79) "1 1 + 1 1 1 0001 0000 #0 1 $1 _0 1 1 1" -Done +===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation23.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u Index: php-src/ext/standard/tests/strings/sprintf_variation23.phpt diff -u php-src/ext/standard/tests/strings/sprintf_variation23.phpt:1.2.2.3 php-src/ext/standard/tests/strings/sprintf_variation23.phpt:1.2.2.4 --- php-src/ext/standard/tests/strings/sprintf_variation23.phpt:1.2.2.3 Wed Jul 23 09:29:21 2008 +++ php-src/ext/standard/tests/strings/sprintf_variation23.phpt Tue Jan 20 14:19:31 2009 @@ -39,42 +39,40 @@ // closing the resources fclose($fp); -fclose($dfp); +closedir($dfp); -echo "Done"; ?> +===DONE=== --EXPECTF-- *** Testing sprintf() : char formats with resource values *** -- Iteration 1 -- -string(1) "" +string(1) "%a" string(1) "c" -string(1) "" +string(1) "%a" string(1) "c" -string(2) " " -string(2) " " -string(2) " " +string(2) " %a" +string(2) "%a " +string(2) " %a" string(2) " -" -string(1) "" -string(1) "" +%a" +string(1) "%a" +string(1) "%a" string(11) "a-b...@#$&]" string(1) "c" -- Iteration 2 -- -string(1) "" -string(1) "c" -string(1) "" -string(1) "c" -string(2) " " -string(2) " " -string(2) " " +string(1) "%a" +string(1) "%a" +string(1) "%a" +string(1) "c" +string(2) " %a" +string(2) "%a " +string(2) " %a" string(2) " -" -string(1) "" -string(1) "" +%a" +string(1) "%a" +string(1) "%a" string(11) "a-b...@#$&]" string(1) "c" - -Warning: fclose(): %d is not a valid stream resource in %s on line %d -Done +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation15.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u Index: php-src/ext/standard/tests/strings/vsprintf_variation15.phpt diff -u php-src/ext/standard/tests/strings/vsprintf_variation15.phpt:1.1.4.4 php-src/ext/standard/tests/strings/vsprintf_variation15.phpt:1.1.4.5 --- php-src/ext/standard/tests/strings/vsprintf_variation15.phpt:1.1.4.4 Mon Dec 17 10:02:13 2007 +++ php-src/ext/standard/tests/strings/vsprintf_variation15.phpt Tue Jan 20 14:19:31 2009 @@ -32,7 +32,7 @@ $args_array = array( array(1234567, 01234567, 0 ), array(12345678900, 12345678900, 1234, 12345), - array("1234000", 10e20, 1.2e2), + array("1234000", 10.1234567e5, 1.2e2), array(1, 0, 00, "10_"), array(3, 4, 1, 2) ); @@ -46,9 +46,9 @@ $counter++; } -echo "Done"; ?> ---EXPECTF-- +===Done=== +--EXPECT-- *** Testing vsprintf() : unsigned formats and unsigned values *** -- Iteration 1 -- @@ -58,11 +58,11 @@ string(23) "2147483647 u 1234 12345" -- Iteration 3 -- -string(25) " 1234000 2147483647 120" +string(25) " 1234000 1012345 120" -- Iteration 4 -- string(10) "#1 0 $0 10" -- Iteration 5 -- string(7) "1 2 3 4" -Done +===Done=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_basic5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_basic5.phpt +++ php-src/ext/standard/tests/strings/vfprintf_basic5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation3.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation20.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation20.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation20.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_basic6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_basic6.phpt +++ php-src/ext/standard/tests/strings/vfprintf_basic6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt +++ php-src/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_basic9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_basic9.phpt +++ php-src/ext/standard/tests/strings/vfprintf_basic9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation7.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation15.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation15.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation15.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation19.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation19.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation19.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_basic4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_basic4.phpt +++ php-src/ext/standard/tests/strings/vfprintf_basic4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation16.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation16.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation16.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_basic7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_basic7.phpt +++ php-src/ext/standard/tests/strings/vfprintf_basic7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation17.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation17.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation17.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_basic3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_basic3.phpt +++ php-src/ext/standard/tests/strings/vfprintf_basic3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation4.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation13.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation13.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation13.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation5.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_basic2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_basic2.phpt +++ php-src/ext/standard/tests/strings/vfprintf_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation6.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation10.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation10.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation10.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation14.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation14.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation14.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_basic8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_basic8.phpt +++ php-src/ext/standard/tests/strings/vfprintf_basic8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation9.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_basic1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_basic1.phpt +++ php-src/ext/standard/tests/strings/vfprintf_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation8.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation21.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation21.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation21.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation11.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation11.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation11.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation12.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation12.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation12.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vfprintf_variation18.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/vfprintf_variation18.phpt +++ php-src/ext/standard/tests/strings/vfprintf_variation18.phpt
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php