kalle Sun Mar 8 06:19:40 2009 UTC
Modified files:
/php-src/ext/standard/tests/strings explode.phpt explode1.phpt
explode_variation5.phpt
explode_variation6.phpt
Log:
Fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode.phpt?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/standard/tests/strings/explode.phpt
diff -u php-src/ext/standard/tests/strings/explode.phpt:1.10
php-src/ext/standard/tests/strings/explode.phpt:1.11
--- php-src/ext/standard/tests/strings/explode.phpt:1.10 Sat Dec 27
05:13:30 2008
+++ php-src/ext/standard/tests/strings/explode.phpt Sun Mar 8 06:19:40 2009
@@ -65,7 +65,9 @@
[0]=>
unicode(11) "otherstring"
}
-array(0) {
+array(1) {
+ [0]=>
+ unicode(11) "otherstring"
}
array(7) {
[0]=>
@@ -131,19 +133,23 @@
[20]=>
unicode(1) "-"
}
-array(3) {
+array(4) {
[0]=>
unicode(10) "a lazy dog"
[1]=>
unicode(5) "jumps"
[2]=>
unicode(4) "over"
+ [3]=>
+ unicode(0) ""
}
-array(2) {
+array(3) {
[0]=>
unicode(10) "a lazy dog"
[1]=>
unicode(5) "jumps"
+ [2]=>
+ unicode(4) "over"
}
array(1) {
[0]=>
@@ -153,11 +159,13 @@
}
array(0) {
}
-array(2) {
+array(3) {
[0]=>
unicode(10) "a lazy dog"
[1]=>
unicode(11) "jumps::over"
+ [2]=>
+ unicode(0) ""
}
array(1) {
[0]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode1.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/strings/explode1.phpt
diff -u php-src/ext/standard/tests/strings/explode1.phpt:1.4
php-src/ext/standard/tests/strings/explode1.phpt:1.5
--- php-src/ext/standard/tests/strings/explode1.phpt:1.4 Tue May 27
10:50:45 2008
+++ php-src/ext/standard/tests/strings/explode1.phpt Sun Mar 8 06:19:40 2009
@@ -113,9 +113,11 @@
Warning: explode(): Empty delimiter in %s on line %d
bool(false)
-- Iteration 3 --
-array(1) {
+array(2) {
[0]=>
unicode(10) "1234NULL23"
+ [1]=>
+ unicode(43) "00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
array(1) {
[0]=>
@@ -132,7 +134,7 @@
unicode(43) "00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
-- Iteration 4 --
-array(5) {
+array(6) {
[0]=>
unicode(14) "1234NULL23abcd"
[1]=>
@@ -143,6 +145,8 @@
unicode(0) ""
[4]=>
unicode(0) ""
+ [5]=>
+ unicode(38) "TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
array(1) {
[0]=>
@@ -159,7 +163,7 @@
unicode(42) "0000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
-- Iteration 5 --
-array(5) {
+array(6) {
[0]=>
unicode(14) "1234NULL23abcd"
[1]=>
@@ -170,6 +174,8 @@
unicode(0) ""
[4]=>
unicode(0) ""
+ [5]=>
+ unicode(38) "TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
array(1) {
[0]=>
@@ -186,7 +192,7 @@
unicode(42) "0000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
-- Iteration 6 --
-array(5) {
+array(6) {
[0]=>
unicode(0) ""
[1]=>
@@ -197,6 +203,8 @@
unicode(12) ".234444true-"
[4]=>
unicode(0) ""
+ [5]=>
+ unicode(12) ".24%PHP%ZEND"
}
array(1) {
[0]=>
@@ -226,11 +234,13 @@
Warning: explode(): Empty delimiter in %s on line %d
bool(false)
-- Iteration 8 --
-array(2) {
+array(3) {
[0]=>
unicode(28) "1234NULL23abcd00000TRUEFALSE"
[1]=>
unicode(12) "1.234444true"
+ [2]=>
+ unicode(13) "1.24%PHP%ZEND"
}
array(1) {
[0]=>
@@ -247,9 +257,11 @@
unicode(27) "1.234444true-11.24%PHP%ZEND"
}
-- Iteration 9 --
-array(1) {
+array(2) {
[0]=>
unicode(28) "1234NULL23abcd00000TRUEFALSE"
+ [1]=>
+ unicode(23) "4444true-11.24%PHP%ZEND"
}
array(1) {
[0]=>
@@ -266,7 +278,7 @@
unicode(23) "4444true-11.24%PHP%ZEND"
}
-- Iteration 10 --
-array(6) {
+array(7) {
[0]=>
unicode(3) "123"
[1]=>
@@ -279,6 +291,8 @@
unicode(0) ""
[5]=>
unicode(9) "true-11.2"
+ [6]=>
+ unicode(9) "%PHP%ZEND"
}
array(1) {
[0]=>
@@ -295,11 +309,13 @@
unicode(53) "NULL23abcd00000TRUEFALSE-11.234444true-11.24%PHP%ZEND"
}
-- Iteration 11 --
-array(2) {
+array(3) {
[0]=>
unicode(48) "1234NULL23abcd00000TRUEFALSE-11.234444true-11.24"
[1]=>
unicode(3) "PHP"
+ [2]=>
+ unicode(4) "ZEND"
}
array(1) {
[0]=>
@@ -337,7 +353,7 @@
}
*** Testing explode() for maximum limit of string with Limit = -1 ***
-array(51) {
+array(52) {
[0]=>
unicode(1) "1"
[1]=>
@@ -440,6 +456,8 @@
unicode(2) "55"
[50]=>
unicode(1) "1"
+ [51]=>
+ unicode(1) "1"
}
*** Testing explode() with string variations as input argument ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_variation5.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/explode_variation5.phpt
diff -u php-src/ext/standard/tests/strings/explode_variation5.phpt:1.1
php-src/ext/standard/tests/strings/explode_variation5.phpt:1.2
--- php-src/ext/standard/tests/strings/explode_variation5.phpt:1.1 Sun Jan
18 14:34:15 2009
+++ php-src/ext/standard/tests/strings/explode_variation5.phpt Sun Mar 8
06:19:40 2009
@@ -33,13 +33,15 @@
}
-- negative limit (since PHP 5.1) --
-array(3) {
+array(4) {
[0]=>
unicode(3) "one"
[1]=>
unicode(3) "two"
[2]=>
unicode(5) "three"
+ [3]=>
+ unicode(4) "four"
}
-- negative limit (since PHP 5.1) with null string --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/explode_variation6.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/explode_variation6.phpt
diff -u php-src/ext/standard/tests/strings/explode_variation6.phpt:1.1
php-src/ext/standard/tests/strings/explode_variation6.phpt:1.2
--- php-src/ext/standard/tests/strings/explode_variation6.phpt:1.1 Sun Jan
18 14:34:15 2009
+++ php-src/ext/standard/tests/strings/explode_variation6.phpt Sun Mar 8
06:19:40 2009
@@ -61,6 +61,7 @@
unicode(6) "6f6e65"
unicode(6) "74776f"
unicode(10) "7468726565"
+unicode(8) "666f7572"
-- large limit = -100 --
unicode(6) "6f6e65"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
