From: Raghubansh Kumar Date: Thu, 20 Dec 2007 17:27:13 +0000 (+0000) Subject: fix tests X-Git-Tag: RELEASE_1_3_1~479 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e15fb3853aa30ecb6071927dd4b1ca5163e355d0;p=php fix tests --- diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt index a226bba7ed..2a5bdfdec9 100644 --- a/ext/standard/tests/strings/sprintf_variation1.phpt +++ b/ext/standard/tests/strings/sprintf_variation1.phpt @@ -44,8 +44,8 @@ $values = array( // float data 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array data @@ -139,14 +139,14 @@ string(5) "-10.5" string(5) "-10.5" -- Iteration 7 -- -string(12) "105000000000" -string(12) "105000000000" -string(12) "105000000000" +string(12) "101234567000" +string(12) "101234567000" +string(12) "101234567000" -- Iteration 8 -- -string(7) "1.06E-9" -string(7) "1.06E-9" -string(7) "1.06E-9" +string(13) "1.07654321E-9" +string(13) "1.07654321E-9" +string(13) "1.07654321E-9" -- Iteration 9 -- string(3) "0.5" @@ -267,4 +267,4 @@ string(0) "" string(%d) "Resource id #%d" string(%d) "Resource id #%d" string(%d) "Resource id #%d" -Done +Done \ No newline at end of file diff --git a/ext/standard/tests/strings/sprintf_variation11.phpt b/ext/standard/tests/strings/sprintf_variation11.phpt index d15928dd9f..21e01883a6 100644 --- a/ext/standard/tests/strings/sprintf_variation11.phpt +++ b/ext/standard/tests/strings/sprintf_variation11.phpt @@ -40,7 +40,7 @@ foreach($resource_values as $resource_value) { // closing the resources fclose($fp); -fclose($dfp); +closedir($dfp); echo "Done"; ?> @@ -58,7 +58,7 @@ string(%d) " %d.000000" string(%d) " %d.000000" string(%d) "%d.000000" -string(%d) " %d.000000" +string(30) "%s%d.000000" string(4) "0-9]" string(1) "f" @@ -73,7 +73,7 @@ string(%d) " %d.000000" string(%d) " %d.000000" string(%d) "%d.000000" -string(%d) " %d.000000" +string(30) "%s%d.000000" string(4) "0-9]" string(1) "f" Done diff --git a/ext/standard/tests/strings/sprintf_variation16.phpt b/ext/standard/tests/strings/sprintf_variation16.phpt index 523eb5fb9d..57965315ee 100644 --- a/ext/standard/tests/strings/sprintf_variation16.phpt +++ b/ext/standard/tests/strings/sprintf_variation16.phpt @@ -20,12 +20,12 @@ $float_values = array( 0.0, -0.1, 1.0, - 1e5, - -1e6, - 1E8, - -1E9, + 1e3, + -1e2, + 1.23456E8, + -1.234567E9, 10.0000000000000000005, - 10.5e+5 + 10.123e+5 ); // array of string formats @@ -187,62 +187,62 @@ string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 10 -- -string(6) "100000" +string(4) "1000" string(1) "s" -string(6) "100000" +string(4) "1000" string(1) "s" -string(7) " 100000" -string(7) "100000 " -string(7) " 100000" -string(7) " -100000" -string(6) "100000" -string(30) " 100000" +string(5) " 1000" +string(5) "1000 " +string(5) " 1000" +string(5) " +1000" +string(4) "1000" +string(30) " 1000" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 11 -- -string(8) "-1000000" +string(4) "-100" string(1) "s" -string(8) "-1000000" +string(4) "-100" string(1) "s" -string(9) " -1000000" -string(9) "-1000000 " -string(9) " -1000000" -string(9) " --1000000" -string(8) "-1000000" -string(30) " -1000000" +string(5) " -100" +string(5) "-100 " +string(5) " -100" +string(5) " +-100" +string(4) "-100" +string(30) " -100" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 12 -- -string(9) "100000000" +string(9) "123456000" string(1) "s" -string(9) "100000000" +string(9) "123456000" string(1) "s" -string(10) " 100000000" -string(10) "100000000 " -string(10) " 100000000" +string(10) " 123456000" +string(10) "123456000 " +string(10) " 123456000" string(10) " -100000000" -string(9) "100000000" -string(30) " 100000000" +123456000" +string(9) "123456000" +string(30) " 123456000" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 13 -- -string(11) "-1000000000" +string(11) "-1234567000" string(1) "s" -string(11) "-1000000000" +string(11) "-1234567000" string(1) "s" -string(12) " -1000000000" -string(12) "-1000000000 " -string(12) " -1000000000" +string(12) " -1234567000" +string(12) "-1234567000 " +string(12) " -1234567000" string(12) " --1000000000" -string(11) "-1000000000" -string(30) " -1000000000" +-1234567000" +string(11) "-1234567000" +string(30) " -1234567000" string(10) "a-zA-Z0-9]" string(1) "s" @@ -262,17 +262,17 @@ string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 15 -- -string(7) "1050000" +string(7) "1012300" string(1) "s" -string(7) "1050000" +string(7) "1012300" string(1) "s" -string(8) " 1050000" -string(8) "1050000 " -string(8) " 1050000" +string(8) " 1012300" +string(8) "1012300 " +string(8) " 1012300" string(8) " -1050000" -string(7) "1050000" -string(30) " 1050000" +1012300" +string(7) "1012300" +string(30) " 1012300" string(10) "a-zA-Z0-9]" string(1) "s" -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation17.phpt b/ext/standard/tests/strings/sprintf_variation17.phpt index 08028f8fe1..8ba55070e8 100644 --- a/ext/standard/tests/strings/sprintf_variation17.phpt +++ b/ext/standard/tests/strings/sprintf_variation17.phpt @@ -39,7 +39,7 @@ foreach($resource_values as $resource_value) { // closing the resources fclose($fp); -fclose($dfp); +closedir($dfp); echo "Done"; ?> @@ -57,7 +57,7 @@ string(%d) " Resource id #%d" string(%d) " Resource id #%d" string(%d) "Resource id #%d" -string(%d) " Resource id #%d" +string(30) "%sResource id #%d" string(10) "a-zA-Z0-9]" string(1) "s" @@ -72,7 +72,7 @@ string(%d) " Resource id #%d" string(%d) " Resource id #%d" string(%d) "Resource id #%d" -string(%d) " Resource id #%d" +string(30) "%sResource id #%d" string(10) "a-zA-Z0-9]" string(1) "s" Done diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index b0013a4e9d..960bcd0e78 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -7,6 +7,8 @@ Test sprintf() function : usage variations - string formats with array values * Source code: ext/standard/formatted_print.c */ +error_reporting(E_ALL & ~E_NOTICE); + echo "*** Testing sprintf() : string formats with array values ***\n"; // different arrays used to test he function diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt index fcd3f21239..a663df4444 100644 --- a/ext/standard/tests/strings/sprintf_variation2.phpt +++ b/ext/standard/tests/strings/sprintf_variation2.phpt @@ -7,6 +7,8 @@ Test sprintf() function : usage variations - with all types of values for arg1 a * Source code: ext/standard/formatted_print.c */ +error_reporting(E_ALL & ~E_NOTICE); + echo "*** Testing sprintf() : with different types of values passed for arg1 argument ***\n"; // initialing required variables @@ -40,8 +42,8 @@ $values = array( // float data 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array data @@ -130,12 +132,12 @@ string(5) "-10.5" string(5) "-10.5" -- Iteration 7 -- -string(12) "105000000000" -string(12) "105000000000" +string(12) "101234567000" +string(12) "101234567000" -- Iteration 8 -- -string(7) "1.06E-9" -string(7) "1.06E-9" +string(13) "1.07654321E-9" +string(13) "1.07654321E-9" -- Iteration 9 -- string(3) "0.5" @@ -216,4 +218,4 @@ string(0) "" -- Iteration 28 -- string(%d) "Resource id #%d" string(%d) "Resource id #%d" -Done +Done \ No newline at end of file diff --git a/ext/standard/tests/strings/sprintf_variation30.phpt b/ext/standard/tests/strings/sprintf_variation30.phpt index 57c5abbd86..78d8e133bf 100644 --- a/ext/standard/tests/strings/sprintf_variation30.phpt +++ b/ext/standard/tests/strings/sprintf_variation30.phpt @@ -39,7 +39,7 @@ foreach($resource_values as $resource_value) { // closing the resources fclose($fp); -fclose($dfp); +closedir($dfp); echo "Done"; ?> @@ -56,8 +56,8 @@ string(%d) "%d " string(%d) " %d" string(%d) " %d" -string(%d) " %d" -string(%d) " %d" +string(4) "%s%d" +string(30) "%s%d" string(4) "0-7]" string(1) "o" @@ -71,8 +71,8 @@ string(%d) "%d " string(%d) " %d" string(%d) " %d" -string(%d) " %d" -string(%d) " %d" +string(4) "%s%d" +string(30) "%s%d" string(4) "0-7]" string(1) "o" Done diff --git a/ext/standard/tests/strings/sprintf_variation42.phpt b/ext/standard/tests/strings/sprintf_variation42.phpt index a1c01ff6b3..f9f7dd631d 100644 --- a/ext/standard/tests/strings/sprintf_variation42.phpt +++ b/ext/standard/tests/strings/sprintf_variation42.phpt @@ -40,7 +40,7 @@ foreach($resource_values as $resource_value) { // closing the resources fclose($fp); -fclose($dfp); +closedir($dfp); echo "Done"; ?> @@ -57,8 +57,8 @@ string(%d) "%d " string(%d) " %d" string(%d) " %d" -string(%d) " %d" -string(%d) " %d" +string(4) "%s%d" +string(30) "%s%d" string(4) "0-9]" string(1) "u" @@ -72,8 +72,8 @@ string(%d) "%d " string(%d) " %d" string(%d) " %d" -string(%d) " %d" -string(%d) " %d" +string(4) "%s%d" +string(30) "%s%d" string(4) "0-9]" string(1) "u" Done