felipe Thu Feb 7 12:45:54 2008 UTC
Modified files:
/php-src/ext/standard/tests/strings wordwrap_variation2.phpt
substr_count_variation_001.phpt
str_split_basic.phpt
Log:
Fixed some tests (UEXPECT)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/wordwrap_variation2.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/wordwrap_variation2.phpt
diff -u php-src/ext/standard/tests/strings/wordwrap_variation2.phpt:1.2
php-src/ext/standard/tests/strings/wordwrap_variation2.phpt:1.3
--- php-src/ext/standard/tests/strings/wordwrap_variation2.phpt:1.2 Fri Sep
14 19:09:11 2007
+++ php-src/ext/standard/tests/strings/wordwrap_variation2.phpt Thu Feb 7
12:45:54 2008
@@ -338,3 +338,242 @@
Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
bool(false)
Done
+--UEXPECTF--
+*** Testing wordwrap() : usage variations ***
+
+--- Testing wordwrap() by supplying different values for 'width' argument ---
+-- Iteration 1 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+
+Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
+bool(false)
+-- Iteration 2 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(223) "<br />\nt<br />\ne<br />\ns<br />\nt<br />\ni<br />\nn<br
/>\ng<br />\n<br />\nw<br />\no<br />\nr<br />\nd<br />\nw<br />\nr<br />\na<br
/>\np<br />\n<br />\nf<br />\nu<br />\nn<br />\nc<br />\nt<br />\ni<br />\no<br
/>\nn"
+-- Iteration 3 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(223) "<br />\nt<br />\ne<br />\ns<br />\nt<br />\ni<br />\nn<br
/>\ng<br />\n<br />\nw<br />\no<br />\nr<br />\nd<br />\nw<br />\nr<br />\na<br
/>\np<br />\n<br />\nf<br />\nu<br />\nn<br />\nc<br />\nt<br />\ni<br />\no<br
/>\nn"
+-- Iteration 4 --
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+-- Iteration 5 --
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+-- Iteration 6 --
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+-- Iteration 7 --
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+-- Iteration 8 --
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, array given in %s on line
%d
+NULL
+-- Iteration 9 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(199) "t<br />\ne<br />\ns<br />\nt<br />\ni<br />\nn<br />\ng<br
/>\nw<br />\no<br />\nr<br />\nd<br />\nw<br />\nr<br />\na<br />\np<br
/>\nf<br />\nu<br />\nn<br />\nc<br />\nt<br />\ni<br />\no<br />\nn"
+-- Iteration 10 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+
+Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
+bool(false)
+-- Iteration 11 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(199) "t<br />\ne<br />\ns<br />\nt<br />\ni<br />\nn<br />\ng<br
/>\nw<br />\no<br />\nr<br />\nd<br />\nw<br />\nr<br />\na<br />\np<br
/>\nf<br />\nu<br />\nn<br />\nc<br />\nt<br />\ni<br />\no<br />\nn"
+-- Iteration 12 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+
+Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
+bool(false)
+-- Iteration 13 --
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+-- Iteration 14 --
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+-- Iteration 15 --
+
+Warning: wordwrap() expects parameter 2 to be long, object given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, object given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, object given in %s on line
%d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, object given in %s on line
%d
+NULL
+-- Iteration 16 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+
+Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
+bool(false)
+-- Iteration 17 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+
+Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
+bool(false)
+-- Iteration 18 --
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+-- Iteration 19 --
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, Unicode string given in %s
on line %d
+NULL
+-- Iteration 20 --
+
+Warning: wordwrap() expects parameter 2 to be long, resource given in %s on
line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, resource given in %s on
line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, resource given in %s on
line %d
+NULL
+
+Warning: wordwrap() expects parameter 2 to be long, resource given in %s on
line %d
+NULL
+-- Iteration 21 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+
+Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
+bool(false)
+-- Iteration 22 --
+string(25) "testing
+wordwrap
+function"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+string(39) "testing<br />\nwordwrap<br />\nfunction"
+
+Warning: wordwrap(): Can't force cut when width is zero in %s on line %d
+bool(false)
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/substr_count_variation_001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/substr_count_variation_001.phpt
diff -u php-src/ext/standard/tests/strings/substr_count_variation_001.phpt:1.1
php-src/ext/standard/tests/strings/substr_count_variation_001.phpt:1.2
--- php-src/ext/standard/tests/strings/substr_count_variation_001.phpt:1.1
Mon Jul 16 10:59:07 2007
+++ php-src/ext/standard/tests/strings/substr_count_variation_001.phpt Thu Feb
7 12:45:54 2008
@@ -113,13 +113,13 @@
-- 3rd or 4th arg as NULL --
-Warning: substr_count() expects parameter 3 to be long, string given in %s on
line %d
+Warning: substr_count() expects parameter 3 to be long, Unicode string given
in %s on line %d
NULL
-Warning: substr_count() expects parameter 3 to be long, string given in %s on
line %d
+Warning: substr_count() expects parameter 3 to be long, Unicode string given
in %s on line %d
NULL
-Warning: substr_count() expects parameter 3 to be long, string given in %s on
line %d
+Warning: substr_count() expects parameter 3 to be long, Unicode string given
in %s on line %d
NULL
int(0)
int(2)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_basic.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/str_split_basic.phpt
diff -u php-src/ext/standard/tests/strings/str_split_basic.phpt:1.2
php-src/ext/standard/tests/strings/str_split_basic.phpt:1.3
--- php-src/ext/standard/tests/strings/str_split_basic.phpt:1.2 Fri Oct 5
18:20:57 2007
+++ php-src/ext/standard/tests/strings/str_split_basic.phpt Thu Feb 7
12:45:54 2008
@@ -102,7 +102,7 @@
[3]=>
unicode(5) "estca"
[4]=>
- string(2) "se"
+ unicode(2) "se"
}
-- With split_length as default argument --
array(22) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
