lbarnaud Sun Sep 14 14:57:26 2008 UTC
Modified files:
/php-src/ext/standard/tests/strings stripos_variation11.phpt
stripos_variation12.phpt
stripos_variation1.phpt
stripos_variation2.phpt
Log:
MFB / fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation11.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/stripos_variation11.phpt
diff -u php-src/ext/standard/tests/strings/stripos_variation11.phpt:1.3
php-src/ext/standard/tests/strings/stripos_variation11.phpt:1.4
--- php-src/ext/standard/tests/strings/stripos_variation11.phpt:1.3 Tue May
27 10:50:47 2008
+++ php-src/ext/standard/tests/strings/stripos_variation11.phpt Sun Sep 14
14:57:26 2008
@@ -92,7 +92,7 @@
*** Testing stripos() function with unexpected values for haystack and needle
***
-- Iteration 1 --
bool(false)
-int(1)
+bool(false)
-- Iteration 2 --
bool(false)
bool(false)
@@ -125,17 +125,17 @@
bool(false)
-- Iteration 8 --
bool(false)
-int(7)
+bool(false)
-- Iteration 9 --
bool(false)
-int(3)
+bool(false)
-- Iteration 10 --
Notice: Array to string conversion in %s on line %d
bool(false)
Notice: Array to string conversion in %s on line %d
-int(5)
+bool(false)
-- Iteration 11 --
Notice: Array to string conversion in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation12.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/stripos_variation12.phpt
diff -u php-src/ext/standard/tests/strings/stripos_variation12.phpt:1.3
php-src/ext/standard/tests/strings/stripos_variation12.phpt:1.4
--- php-src/ext/standard/tests/strings/stripos_variation12.phpt:1.3 Tue May
27 10:50:47 2008
+++ php-src/ext/standard/tests/strings/stripos_variation12.phpt Sun Sep 14
14:57:26 2008
@@ -31,15 +31,15 @@
int(5)
int(5)
int(0)
-int(12)
+bool(false)
int(11)
int(11)
int(0)
-int(3)
+bool(false)
int(5)
int(5)
int(0)
-int(6)
+bool(false)
int(5)
-int(6)
+bool(false)
*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation1.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/stripos_variation1.phpt
diff -u php-src/ext/standard/tests/strings/stripos_variation1.phpt:1.3
php-src/ext/standard/tests/strings/stripos_variation1.phpt:1.4
--- php-src/ext/standard/tests/strings/stripos_variation1.phpt:1.3 Tue May
27 10:50:46 2008
+++ php-src/ext/standard/tests/strings/stripos_variation1.phpt Sun Sep 14
14:57:26 2008
@@ -7,10 +7,10 @@
* Source code: ext/standard/string.c
*/
-/* Test stripos() function by passing double quoted strings to 'haystack' &
'needle' arguments */
+/* Test stripos() function by passing double quoted strings for 'haystack' &
'needle' arguments */
echo "*** Testing stripos() function: with double quoted strings ***\n";
-$haystack = "Hello,\t\n\0\n $&!#%\o,()*+-./:;<=>[EMAIL PROTECTED] \x234 \101";
+$haystack = "Hello,\t\n\0\n $&!#%\o,()*+-./:;<=>[EMAIL PROTECTED] \x234 \101
";
$needle = array(
//regular strings
"l",
@@ -50,6 +50,7 @@
"()",
"*+",
"+",
+ "-",
".",
".;",
":;",
@@ -57,6 +58,8 @@
"<=>",
">",
"=>",
+ "?",
+ "@",
"@hEllo",
"12345", //decimal numeric string
@@ -68,7 +71,7 @@
$haystack //haystack as needle
);
-/* loop through 'needle' array to get the position of the needle in haystack
string */
+/* loop through to get the position of the needle in haystack string */
$count = 1;
for($index=0; $index<count($needle); $index++) {
echo "-- Iteration $count --\n";
@@ -78,7 +81,7 @@
}
echo "*** Done ***";
?>
---EXPECT--
+--EXPECTF--
*** Testing stripos() function: with double quoted strings ***
-- Iteration 1 --
int(2)
@@ -112,19 +115,19 @@
int(9)
-- Iteration 11 --
int(8)
-int(52)
+bool(false)
-- Iteration 12 --
int(8)
-int(52)
+bool(false)
-- Iteration 13 --
int(8)
-int(52)
+bool(false)
-- Iteration 14 --
int(8)
-int(52)
+bool(false)
-- Iteration 15 --
int(8)
-int(52)
+bool(false)
-- Iteration 16 --
bool(false)
bool(false)
@@ -159,48 +162,57 @@
int(23)
bool(false)
-- Iteration 27 --
-int(25)
+int(24)
bool(false)
-- Iteration 28 --
-bool(false)
+int(25)
bool(false)
-- Iteration 29 --
-int(27)
+bool(false)
bool(false)
-- Iteration 30 --
-int(28)
+int(27)
bool(false)
-- Iteration 31 --
-int(29)
+int(28)
bool(false)
-- Iteration 32 --
-int(31)
-int(31)
+int(29)
+bool(false)
-- Iteration 33 --
-int(30)
+int(31)
bool(false)
-- Iteration 34 --
+int(30)
+bool(false)
+-- Iteration 35 --
+int(32)
+bool(false)
+-- Iteration 36 --
int(33)
+bool(false)
+-- Iteration 37 --
int(33)
--- Iteration 35 --
+bool(false)
+-- Iteration 38 --
int(39)
int(39)
--- Iteration 36 --
+-- Iteration 39 --
int(15)
int(48)
--- Iteration 37 --
+-- Iteration 40 --
int(15)
int(48)
--- Iteration 38 --
+-- Iteration 41 --
int(51)
int(51)
--- Iteration 39 --
+-- Iteration 42 --
int(51)
int(51)
--- Iteration 40 --
+-- Iteration 43 --
bool(false)
bool(false)
--- Iteration 41 --
+-- Iteration 44 --
int(0)
bool(false)
*** Done ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripos_variation2.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/stripos_variation2.phpt
diff -u php-src/ext/standard/tests/strings/stripos_variation2.phpt:1.3
php-src/ext/standard/tests/strings/stripos_variation2.phpt:1.4
--- php-src/ext/standard/tests/strings/stripos_variation2.phpt:1.3 Tue May
27 10:50:47 2008
+++ php-src/ext/standard/tests/strings/stripos_variation2.phpt Sun Sep 14
14:57:26 2008
@@ -119,16 +119,16 @@
int(10)
-- Iteration 12 --
bool(false)
-int(63)
+bool(false)
-- Iteration 13 --
bool(false)
-int(63)
+bool(false)
-- Iteration 14 --
bool(false)
-int(63)
+bool(false)
-- Iteration 15 --
bool(false)
-int(63)
+bool(false)
-- Iteration 16 --
bool(false)
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
