kraghuba Mon Dec 24 04:29:26 2007 UTC Modified files: /php-src/ext/standard/tests/strings sprintf_variation5.phpt sprintf_variation48.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation5.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/sprintf_variation5.phpt diff -u php-src/ext/standard/tests/strings/sprintf_variation5.phpt:1.2 php-src/ext/standard/tests/strings/sprintf_variation5.phpt:1.3 --- php-src/ext/standard/tests/strings/sprintf_variation5.phpt:1.2 Sat Sep 29 14:15:53 2007 +++ php-src/ext/standard/tests/strings/sprintf_variation5.phpt Mon Dec 24 04:29:26 2007 @@ -12,11 +12,14 @@ // resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( dirname(__FILE__) ); + +$fp_copy = $fp; +$dfp_copy = $dfp; // array of resource types $resource_types = array ( - $fp, - $dfp + $fp_copy, + $dfp_copy ); // various integer formats @@ -38,7 +41,7 @@ // closing the resources fclose($fp); -fclose($dfp); +closedir($dfp); echo "Done"; @@ -53,8 +56,8 @@ string(%d) " %d" string(%d) " %d" -string(%d) " %d" -string(4) "0-9]" +string(%d) "%s%d" +string(%d) "0-9]" string(1) "d" -- Iteration 2 -- @@ -64,11 +67,10 @@ string(%d) " %d" string(%d) " %d" -string(%d) " %d" -string(4) "0-9]" +string(%d) "%s%d" +string(%d) "0-9]" string(1) "d" Done - --UEXPECTF-- *** Testing sprintf() : integer formats with resource values *** @@ -79,8 +81,8 @@ unicode(%d) " %d" unicode(%d) " %d" -unicode(%d) " %d" -unicode(4) "0-9]" +unicode(%d) "%s%d" +unicode(%d) "0-9]" unicode(1) "d" -- Iteration 2 -- @@ -90,7 +92,7 @@ unicode(%d) " %d" unicode(%d) " %d" -unicode(%d) " %d" -unicode(4) "0-9]" +unicode(%d) "%s%d" +unicode(%d) "0-9]" unicode(1) "d" Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation48.phpt?r1=1.2&r2=1.3&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 php-src/ext/standard/tests/strings/sprintf_variation48.phpt:1.3 --- php-src/ext/standard/tests/strings/sprintf_variation48.phpt:1.2 Sat Sep 29 14:15:53 2007 +++ php-src/ext/standard/tests/strings/sprintf_variation48.phpt Mon Dec 24 04:29:26 2007 @@ -39,7 +39,7 @@ // closing the resources fclose($fp); -fclose($dfp); +closedir($dfp); echo "Done"; @@ -48,66 +48,65 @@ *** Testing sprintf() : scientific formats with resource values *** -- Iteration 1 -- -string(%d) "%d.000000e+0" +string(%d) "%f" string(1) "e" -string(%d) "%d.000000e+0" +string(%d) "%f" string(1) "e" -string(%d) " %d.000000e+0" -string(%d) "%d.000000e+0 " -string(%d) " %d.000000e+0" +string(%d) " %f" +string(%d) "%f " +string(%d) " %f" string(%d) " -%d.000000e+0" -string(%d) "%d.000000e+0" -string(%d) " %d.000000e+0" -string(4) "0-1]" +%f" +string(%d) "%f" +string(%d) "%s%f" +string(%d) "0-1]" string(1) "e" -- Iteration 2 -- -string(%d) "%d.000000e+0" +string(%d) "%f" string(1) "e" -string(%d) "%d.000000e+0" +string(%d) "%f" string(1) "e" -string(%d) " %d.000000e+0" -string(%d) "%d.000000e+0 " -string(%d) " %d.000000e+0" +string(%d) " %f" +string(%d) "%f " +string(%d) " %f" string(%d) " -%d.000000e+0" -string(%d) "%d.000000e+0" -string(%d) " %d.000000e+0" -string(4) "0-1]" +%f" +string(%d) "%f" +string(%d) "%s%f" +string(%d) "0-1]" string(1) "e" Done - --UEXPECTF-- *** Testing sprintf() : scientific formats with resource values *** -- Iteration 1 -- -unicode(%d) "%d.000000e+0" +unicode(%d) "%f" unicode(1) "e" -unicode(%d) "%d.000000e+0" +unicode(%d) "%f" unicode(1) "e" -unicode(%d) " %d.000000e+0" -unicode(%d) "%d.000000e+0 " -unicode(%d) " %d.000000e+0" +unicode(%d) " %f" +unicode(%d) "%f " +unicode(%d) " %f" unicode(%d) " -%d.000000e+0" -unicode(%d) "%d.000000e+0" -unicode(%d) " %d.000000e+0" -unicode(4) "0-1]" +%f" +unicode(%d) "%f" +unicode(%d) "%s%f" +unicode(%d) "0-1]" unicode(1) "e" -- Iteration 2 -- -unicode(%d) "%d.000000e+0" +unicode(%d) "%f" unicode(1) "e" -unicode(%d) "%d.000000e+0" +unicode(%d) "%f" unicode(1) "e" -unicode(%d) " %d.000000e+0" -unicode(%d) "%d.000000e+0 " -unicode(%d) " %d.000000e+0" +unicode(%d) " %f" +unicode(%d) "%f " +unicode(%d) " %f" unicode(%d) " -%d.000000e+0" -unicode(%d) "%d.000000e+0" -unicode(%d) " %d.000000e+0" -unicode(4) "0-1]" +%f" +unicode(%d) "%f" +unicode(%d) "%s%f" +unicode(%d) "0-1]" unicode(1) "e" Done
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php