fix tests

diff --git a/ext/standard/tests/strings/strcspn_variation10.phpt b/ext/standard/tests/strings/strcspn_variation10.phpt
index bc3763770bd71fa5f7153f8b952a20d955e349a9..2465f70bf4bde38fa738d0aa988f7d801b4941d5 100644 (file)
--- a/ext/standard/tests/strings/strcspn_variation10.phpt
+++ b/ext/standard/tests/strings/strcspn_variation10.phpt
@@ -54,7 +54,7 @@ $mask_array = array(
 // loop through each element of the array for mask argument
 $count = 1;
 foreach($strings as $str) {
-  echo "\n-- Itearation $count --\n";
+  echo "\n-- Iteration $count --\n";
   foreach($mask_array as $mask) {
       var_dump( strcspn($str,$mask) );
   }
@@ -66,7 +66,7 @@ echo "Done"
 --EXPECTF--
 *** Testing strcspn() : with different mask strings and default start and len arguments ***
 
--- Itearation 1 --
+-- Iteration 1 --
 int(0)
 int(0)
 int(0)
@@ -78,7 +78,7 @@ int(0)
 int(0)
 int(0)
 
--- Itearation 2 --
+-- Iteration 2 --
 int(0)
 int(0)
 int(0)
@@ -90,7 +90,7 @@ int(0)
 int(0)
 int(0)
 
--- Itearation 3 --
+-- Iteration 3 --
 int(1)
 int(1)
 int(0)
@@ -102,7 +102,7 @@ int(1)
 int(1)
 int(0)
 
--- Itearation 4 --
+-- Iteration 4 --
 int(2)
 int(2)
 int(0)
@@ -114,7 +114,7 @@ int(0)
 int(2)
 int(0)
 
--- Itearation 5 --
+-- Iteration 5 --
 int(24)
 int(24)
 int(2)
@@ -126,7 +126,7 @@ int(5)
 int(5)
 int(5)
 
--- Itearation 6 --
+-- Iteration 6 --
 int(28)
 int(28)
 int(2)
@@ -138,7 +138,7 @@ int(5)
 int(28)
 int(5)
 
--- Itearation 7 --
+-- Iteration 7 --
 int(20)
 int(20)
 int(6)
@@ -150,7 +150,7 @@ int(16)
 int(16)
 int(16)
 
--- Itearation 8 --
+-- Iteration 8 --
 int(21)
 int(21)
 int(6)
@@ -162,7 +162,7 @@ int(16)
 int(21)
 int(16)
 
--- Itearation 9 --
+-- Iteration 9 --
 int(5)
 int(5)
 int(2)
@@ -174,7 +174,7 @@ int(12)
 int(12)
 int(11)
 
--- Itearation 10 --
+-- Iteration 10 --
 int(16)
 int(16)
 int(2)
@@ -186,7 +186,7 @@ int(5)
 int(16)
 int(5)
 
--- Itearation 11 --
+-- Iteration 11 --
 int(0)
 int(0)
 int(2)
@@ -198,7 +198,7 @@ int(2)
 int(2)
 int(2)
 
--- Itearation 12 --
+-- Iteration 12 --
 int(0)
 int(0)
 int(3)
@@ -210,7 +210,7 @@ int(13)
 int(13)
 int(13)
 
--- Itearation 13 --
+-- Iteration 13 --
 int(0)
 int(0)
 int(3)
@@ -222,7 +222,7 @@ int(6)
 int(14)
 int(6)
 
--- Itearation 14 --
+-- Iteration 14 --
 int(5)
 int(5)
 int(2)
@@ -234,7 +234,7 @@ int(11)
 int(11)
 int(11)
 
--- Itearation 15 --
+-- Iteration 15 --
 int(5)
 int(5)
 int(2)
@@ -246,7 +246,7 @@ int(11)
 int(11)
 int(11)
 
--- Itearation 16 --
+-- Iteration 16 --
 int(5)
 int(5)
 int(2)
@@ -258,215 +258,7 @@ int(14)
 int(14)
 int(6)
 
--- Itearation 17 --
-int(21)
-int(21)
-int(2)
-int(2)
-int(21)
-int(5)
-int(5)
-int(5)
-int(21)
-int(5)
-Done
-
---UEXPECTF--
-*** Testing strcspn() : with different mask strings and default start and len arguments ***
-
--- Itearation 1 --
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-
--- Itearation 2 --
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-int(0)
-
--- Itearation 3 --
-int(1)
-int(1)
-int(0)
-int(1)
-int(1)
-int(1)
-int(1)
-int(1)
-int(1)
-int(0)
-
--- Itearation 4 --
-int(2)
-int(2)
-int(0)
-int(0)
-int(2)
-int(0)
-int(0)
-int(0)
-int(2)
-int(0)
-
--- Itearation 5 --
-int(24)
-int(24)
-int(2)
-int(2)
-int(5)
-int(24)
-int(24)
-int(5)
-int(5)
-int(5)
-
--- Itearation 6 --
-int(28)
-int(28)
-int(2)
-int(2)
-int(28)
-int(5)
-int(5)
-int(5)
-int(28)
-int(5)
-
--- Itearation 7 --
-int(20)
-int(20)
-int(6)
-int(6)
-int(16)
-int(20)
-int(20)
-int(16)
-int(16)
-int(16)
-
--- Itearation 8 --
-int(21)
-int(21)
-int(6)
-int(6)
-int(21)
-int(16)
-int(16)
-int(16)
-int(21)
-int(16)
-
--- Itearation 9 --
-int(5)
-int(5)
-int(2)
-int(2)
-int(12)
-int(12)
-int(12)
-int(12)
-int(12)
-int(11)
-
--- Itearation 10 --
-int(16)
-int(16)
-int(2)
-int(2)
-int(16)
-int(5)
-int(5)
-int(5)
-int(16)
-int(5)
-
--- Itearation 11 --
-int(0)
-int(0)
-int(2)
-int(2)
-int(2)
-int(2)
-int(2)
-int(2)
-int(2)
-int(2)
-
--- Itearation 12 --
-int(0)
-int(0)
-int(3)
-int(3)
-int(13)
-int(13)
-int(13)
-int(13)
-int(13)
-int(13)
-
--- Itearation 13 --
-int(0)
-int(0)
-int(3)
-int(3)
-int(14)
-int(6)
-int(6)
-int(6)
-int(14)
-int(6)
-
--- Itearation 14 --
-int(5)
-int(5)
-int(2)
-int(2)
-int(11)
-int(11)
-int(11)
-int(11)
-int(11)
-int(11)
-
--- Itearation 15 --
-int(5)
-int(5)
-int(2)
-int(2)
-int(11)
-int(11)
-int(11)
-int(11)
-int(11)
-int(11)
-
--- Itearation 16 --
-int(5)
-int(5)
-int(2)
-int(2)
-int(14)
-int(14)
-int(14)
-int(14)
-int(14)
-int(6)
-
--- Itearation 17 --
+-- Iteration 17 --
 int(21)
 int(21)
 int(2)

diff --git a/ext/standard/tests/strings/strcspn_variation2.phpt b/ext/standard/tests/strings/strcspn_variation2.phpt
index 57e07a6882e39b5df9c0e5b2ab7cf7cd0feff3ba..c98907edc90d43762f31b0cabfef56697e488ad6 100644 (file)
--- a/ext/standard/tests/strings/strcspn_variation2.phpt
+++ b/ext/standard/tests/strings/strcspn_variation2.phpt
@@ -282,187 +282,3 @@ NULL
 Warning: strcspn() expects parameter 2 to be string (Unicode or binary), resource given in %s on line %d
 NULL
 Done
-
---UEXPECTF--
-*** Testing strcspn() : with diferent unexpected values of mask argument ***
-
-Notice: Undefined variable: undefined_var in %s on line %d
-
-Notice: Undefined variable: unset_var in %s on line %d
-
--- Iteration with mask value as "0" -- 
-int(10)
-int(9)
-int(9)
-
--- Iteration with mask value as "1" -- 
-int(10)
-int(9)
-int(9)
-
--- Iteration with mask value as "12345" -- 
-int(10)
-int(9)
-int(9)
-
--- Iteration with mask value as "-2345" -- 
-int(10)
-int(9)
-int(9)
-
--- Iteration with mask value as "10.5" -- 
-int(10)
-int(9)
-int(9)
-
--- Iteration with mask value as "-10.5" -- 
-int(10)
-int(9)
-int(9)
-
--- Iteration with mask value as "105000000000" -- 
-int(10)
-int(9)
-int(9)
-
--- Iteration with mask value as "1.06E-9" -- 
-int(10)
-int(9)
-int(9)
-
--- Iteration with mask value as "0.5" -- 
-int(10)
-int(9)
-int(9)
-
-Notice: Array to string conversion in %s on line %d
-
--- Iteration with mask value as "Array" -- 
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Notice: Array to string conversion in %s on line %d
-
--- Iteration with mask value as "Array" -- 
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Notice: Array to string conversion in %s on line %d
-
--- Iteration with mask value as "Array" -- 
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Notice: Array to string conversion in %s on line %d
-
--- Iteration with mask value as "Array" -- 
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Notice: Array to string conversion in %s on line %d
-
--- Iteration with mask value as "Array" -- 
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d
-NULL
-
--- Iteration with mask value as "" -- 
-int(0)
-int(0)
-int(0)
-
--- Iteration with mask value as "" -- 
-int(0)
-int(0)
-int(0)
-
--- Iteration with mask value as "1" -- 
-int(10)
-int(9)
-int(9)
-
--- Iteration with mask value as "" -- 
-int(0)
-int(0)
-int(0)
-
--- Iteration with mask value as "1" -- 
-int(10)
-int(9)
-int(9)
-
--- Iteration with mask value as "" -- 
-int(0)
-int(0)
-int(0)
-
--- Iteration with mask value as "" -- 
-int(0)
-int(0)
-int(0)
-
--- Iteration with mask value as "" -- 
-int(0)
-int(0)
-int(0)
-
--- Iteration with mask value as "object" -- 
-int(1)
-int(0)
-int(0)
-
--- Iteration with mask value as "" -- 
-int(0)
-int(0)
-int(0)
-
--- Iteration with mask value as "" -- 
-int(0)
-int(0)
-int(0)
-
--- Iteration with mask value as "Resource id #%d" -- 
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), resource given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), resource given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 2 to be string (Unicode or binary), resource given in %s on line %d
-NULL
-Done