kraghuba Thu Dec 20 17:28:36 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings sprintf_variation16.phpt
sprintf_variation17.phpt
sprintf_variation18.phpt
sprintf_variation30.phpt
sprintf_variation1.phpt
sprintf_variation42.phpt
sprintf_variation2.phpt
sprintf_variation11.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation16.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation16.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation16.phpt:1.1.2.1
php-src/ext/standard/tests/strings/sprintf_variation16.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/sprintf_variation16.phpt:1.1.2.1 Sat Sep
29 14:13:53 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation16.phpt Thu Dec 20
17:28:36 2007
@@ -20,12 +20,12 @@
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(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(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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation17.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation17.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation17.phpt:1.1.2.1
php-src/ext/standard/tests/strings/sprintf_variation17.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/sprintf_variation17.phpt:1.1.2.1 Sat Sep
29 14:13:53 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation17.phpt Thu Dec 20
17:28:36 2007
@@ -39,7 +39,7 @@
// closing the resources
fclose($fp);
-fclose($dfp);
+closedir($dfp);
echo "Done";
?>
@@ -57,8 +57,8 @@
string(%d) "
Resource id #%d"
string(%d) "Resource id #%d"
-string(%d) " Resource id #%d"
-string(10) "a-zA-Z0-9]"
+string(%d) "%sResource id #%d"
+string(%d) "a-zA-Z0-9]"
string(1) "s"
-- Iteration 2 --
@@ -72,7 +72,7 @@
string(%d) "
Resource id #%d"
string(%d) "Resource id #%d"
-string(%d) " Resource id #%d"
-string(10) "a-zA-Z0-9]"
+string(%d) "%sResource id #%d"
+string(%d) "a-zA-Z0-9]"
string(1) "s"
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation18.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation18.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation18.phpt:1.1.2.1
php-src/ext/standard/tests/strings/sprintf_variation18.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/sprintf_variation18.phpt:1.1.2.1 Sat Sep
29 14:13:53 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation18.phpt Thu Dec 20
17:28:36 2007
@@ -7,6 +7,8 @@
* 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
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation30.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation30.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation30.phpt:1.1.2.1
php-src/ext/standard/tests/strings/sprintf_variation30.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/sprintf_variation30.phpt:1.1.2.1 Sat Sep
29 14:13:53 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation30.phpt Thu Dec 20
17:28:36 2007
@@ -39,7 +39,7 @@
// closing the resources
fclose($fp);
-fclose($dfp);
+closedir($dfp);
echo "Done";
?>
@@ -56,9 +56,9 @@
string(%d) " %d"
string(%d) "
%d"
-string(%d) " %d"
-string(%d) " %d"
-string(4) "0-7]"
+string(%d) "%s%d"
+string(%d) "%s%d"
+string(%d) "0-7]"
string(1) "o"
-- Iteration 2 --
@@ -71,8 +71,8 @@
string(%d) " %d"
string(%d) "
%d"
-string(%d) " %d"
-string(%d) " %d"
-string(4) "0-7]"
+string(%d) "%s%d"
+string(%d) "%s%d"
+string(%d) "0-7]"
string(1) "o"
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation1.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation1.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation1.phpt:1.1.2.3
php-src/ext/standard/tests/strings/sprintf_variation1.phpt:1.1.2.4
--- php-src/ext/standard/tests/strings/sprintf_variation1.phpt:1.1.2.3 Tue Oct
9 10:56:45 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation1.phpt Thu Dec 20
17:28:36 2007
@@ -44,8 +44,8 @@
// 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"
-- 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(%d) "Resource id #%d"
string(%d) "Resource id #%d"
string(%d) "Resource id #%d"
-Done
+Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation42.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation42.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation42.phpt:1.1.2.1
php-src/ext/standard/tests/strings/sprintf_variation42.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/sprintf_variation42.phpt:1.1.2.1 Sat Sep
29 14:13:53 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation42.phpt Thu Dec 20
17:28:36 2007
@@ -40,7 +40,7 @@
// closing the resources
fclose($fp);
-fclose($dfp);
+closedir($dfp);
echo "Done";
?>
@@ -57,9 +57,9 @@
string(%d) " %d"
string(%d) "
%d"
-string(%d) " %d"
-string(%d) " %d"
-string(4) "0-9]"
+string(%d) "%s%d"
+string(%d) "%s%d"
+string(%d) "0-9]"
string(1) "u"
-- Iteration 2 --
@@ -72,8 +72,8 @@
string(%d) " %d"
string(%d) "
%d"
-string(%d) " %d"
-string(%d) " %d"
-string(4) "0-9]"
+string(%d) "%s%d"
+string(%d) "%s%d"
+string(%d) "0-9]"
string(1) "u"
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation2.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation2.phpt:1.1.2.2
php-src/ext/standard/tests/strings/sprintf_variation2.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/sprintf_variation2.phpt:1.1.2.2 Tue Oct
9 10:56:45 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation2.phpt Thu Dec 20
17:28:36 2007
@@ -7,6 +7,8 @@
* 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 @@
// 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"
-- 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 @@
-- Iteration 28 --
string(%d) "Resource id #%d"
string(%d) "Resource id #%d"
-Done
+Done
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation11.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation11.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation11.phpt:1.1.2.1
php-src/ext/standard/tests/strings/sprintf_variation11.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/sprintf_variation11.phpt:1.1.2.1 Sat Sep
29 14:13:53 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation11.phpt Thu Dec 20
17:28:36 2007
@@ -40,7 +40,7 @@
// closing the resources
fclose($fp);
-fclose($dfp);
+closedir($dfp);
echo "Done";
?>
@@ -58,8 +58,8 @@
string(%d) "
%d.000000"
string(%d) "%d.000000"
-string(%d) " %d.000000"
-string(4) "0-9]"
+string(%d) "%s%d.000000"
+string(%d) "0-9]"
string(1) "f"
-- Iteration 2 --
@@ -73,7 +73,7 @@
string(%d) "
%d.000000"
string(%d) "%d.000000"
-string(%d) " %d.000000"
-string(4) "0-9]"
+string(%d) "%s%d.000000"
+string(%d) "0-9]"
string(1) "f"
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
