cvs: php-src(PHP_5_2) /ext/standard/tests/strings str_replace.phpt stripos_variation10.phpt strpos.phpt strrchr_variation10.phpt
strrchr_variation11.phpt strrpos_variation10.phpt strstr.phpt

kraghuba Fri Nov 9 12:00:57 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings strrpos_variation10.phpt str_replace.phpt strstr.phpt strrchr_variation10.phpt strpos.phpt stripos_variation10.phpt strrchr_variation11.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation10.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/strrpos_variation10.phpt diff -u php-src/ext/standard/tests/strings/strrpos_variation10.phpt:1.1.2.1 php-src/ext/standard/tests/strings/strrpos_variation10.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/strrpos_variation10.phpt:1.1.2.1 Fri Oct 5 18:31:50 2007 +++ php-src/ext/standard/tests/strings/strrpos_variation10.phpt Fri Nov 9 12:00:57 2007 @@ -41,8 +41,8 @@ // float values 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array values @@ -142,7 +142,7 @@ -- Iteration 23 -- bool(false) -- Iteration 24 -- -bool(false) +%s -- Iteration 25 -- bool(false) -- Iteration 26 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_replace.phpt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: php-src/ext/standard/tests/strings/str_replace.phpt diff -u php-src/ext/standard/tests/strings/str_replace.phpt:1.1.2.6 php-src/ext/standard/tests/strings/str_replace.phpt:1.1.2.7 --- php-src/ext/standard/tests/strings/str_replace.phpt:1.1.2.6 Fri May 18 11:29:55 2007 +++ php-src/ext/standard/tests/strings/str_replace.phpt Fri Nov 9 12:00:57 2007 @@ -27,8 +27,10 @@ var_dump( $count ); $fp = fopen( __FILE__, "r" ); -var_dump( str_replace($fp, $fp, $fp, $fp) ); -var_dump( $fp ); +$fp_copy = $fp; +var_dump( str_replace($fp_copy, $fp_copy, $fp_copy, $fp_copy) ); +var_dump( $fp_copy ); +fclose($fp); echo "\n*** Testing str_replace() with various search values ***"; $search_arr = array( TRUE, FALSE, 1, 0, -1, "1", "0", "-1", NULL, @@ -230,12 +232,9 @@ var_dump( str_replace(1, 2) ); var_dump( str_replace(1,2,3,$var,5) ); -echo "Done\n"; - ---CLEAN-- -fclose($fp); fclose($resource1); closedir($resource2); +echo "Done\n"; ?> --EXPECTF-- @@ -248,7 +247,7 @@ int(1) string(0) "" int(0) -string(14) "Resource id #5" +string(%d) "Resource id #%d" int(1) *** Testing str_replace() with various search values *** @@ -910,9 +909,9 @@ int(1) -- Testing Resources -- -string(14) "Resource id #6" +string(%d) "Resource id #%d" int(0) -string(14) "Resource id #7" +string(%d) "Resource id #%d" int(0) -- Testing a longer and heredoc string -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strstr.phpt?r1=1.2.6.2&r2=1.2.6.3&diff_format=u Index: php-src/ext/standard/tests/strings/strstr.phpt diff -u php-src/ext/standard/tests/strings/strstr.phpt:1.2.6.2 php-src/ext/standard/tests/strings/strstr.phpt:1.2.6.3 --- php-src/ext/standard/tests/strings/strstr.phpt:1.2.6.2 Thu Oct 4 13:31:11 2007 +++ php-src/ext/standard/tests/strings/strstr.phpt Fri Nov 9 12:00:57 2007 @@ -337,8 +337,8 @@ string(20) "!$%**()%**[][[[&@#~!" -- passing Resources as string and needle -- -bool(false) -bool(false) +%s +%s -- Posiibilities with null -- bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrchr_variation10.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/strrchr_variation10.phpt diff -u php-src/ext/standard/tests/strings/strrchr_variation10.phpt:1.1.2.1 php-src/ext/standard/tests/strings/strrchr_variation10.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/strrchr_variation10.phpt:1.1.2.1 Sat Sep 29 09:18:07 2007 +++ php-src/ext/standard/tests/strings/strrchr_variation10.phpt Fri Nov 9 12:00:57 2007 @@ -79,8 +79,8 @@ // float values 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array values @@ -180,7 +180,7 @@ -- Iteration 23 -- bool(false) -- Iteration 24 -- -bool(false) +%s -- Iteration 25 -- bool(false) -- Iteration 26 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strpos.phpt?r1=1.2.6.3&r2=1.2.6.4&diff_format=u Index: php-src/ext/standard/tests/strings/strpos.phpt diff -u php-src/ext/standard/tests/strings/strpos.phpt:1.2.6.3 php-src/ext/standard/tests/strings/strpos.phpt:1.2.6.4 --- php-src/ext/standard/tests/strings/strpos.phpt:1.2.6.3 Thu Oct 4 13:31:11 2007 +++ php-src/ext/standard/tests/strings/strpos.phpt Fri Nov 9 12:00:57 2007 @@ -196,7 +196,6 @@ echo "\nDone"; ---CLEAN-- fclose($resource1); closedir($resource2); ?> @@ -275,8 +274,8 @@ int(12) -- Passing Resources as string and needle -- -bool(false) -bool(false) +%s +%s -- Posiibilities with null -- bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation10.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/strings/stripos_variation10.phpt diff -u php-src/ext/standard/tests/strings/stripos_variation10.phpt:1.1.2.2 php-src/ext/standard/tests/strings/stripos_variation10.phpt:1.1.2.3 --- php-src/ext/standard/tests/strings/stripos_variation10.phpt:1.1.2.2 Thu Oct 4 13:31:11 2007 +++ php-src/ext/standard/tests/strings/stripos_variation10.phpt Fri Nov 9 12:00:57 2007 @@ -41,8 +41,8 @@ // float values 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array values @@ -182,7 +182,7 @@ -- Iteration 24 -- Warning: stripos(): needle is not a string or an integer in %s on line %d -bool(false) +%s -- Iteration 25 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrchr_variation11.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/strings/strrchr_variation11.phpt diff -u php-src/ext/standard/tests/strings/strrchr_variation11.phpt:1.1.2.1 php-src/ext/standard/tests/strings/strrchr_variation11.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/strrchr_variation11.phpt:1.1.2.1 Sat Sep 29 09:18:07 2007 +++ php-src/ext/standard/tests/strings/strrchr_variation11.phpt Fri Nov 9 12:00:57 2007 @@ -37,8 +37,8 @@ // float values 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array values @@ -80,8 +80,6 @@ $counter = 1; for($index = 0; $index < count($values); $index ++) { echo "-- Iteration $counter --\n"; - $haystack = $values[$index]; - var_dump( strrchr($values[$index], $values[$index]) ); $counter ++; } @@ -151,7 +149,7 @@ -- Iteration 23 -- bool(false) -- Iteration 24 -- -bool(false) +%s -- Iteration 25 -- bool(false) -- Iteration 26 --