felipe Sat Mar 22 14:58:30 2008 UTC
Modified files:
/php-src/ext/calendar/tests jdtojewish.phpt jdtomonthname.phpt
/php-src/ext/dba/tests bug38698.phpt
/php-src/ext/dbase/tests 001.phpt
/php-src/ext/gettext/tests gettext_basic.phpt gettext_basic_de.phpt
/php-src/ext/iconv/tests bug37773.phpt iconv_stream_filter.phpt
iconv_substr.phpt
/php-src/ext/json/tests bug42785.phpt
/php-src/ext/mysql/tests mysql_trace_mode.phpt
/php-src/ext/pcre/tests locales.phpt
/php-src/ext/pdo_mysql/tests bug_33689.phpt
/php-src/ext/simplexml/tests bug36611.phpt
Log:
- Added some UEXPECTs
- Fixed some tests
http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/jdtojewish.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/calendar/tests/jdtojewish.phpt
diff -u php-src/ext/calendar/tests/jdtojewish.phpt:1.3
php-src/ext/calendar/tests/jdtojewish.phpt:1.4
--- php-src/ext/calendar/tests/jdtojewish.phpt:1.3 Wed Dec 21 11:43:23 2005
+++ php-src/ext/calendar/tests/jdtojewish.phpt Sat Mar 22 14:58:29 2008
@@ -28,3 +28,15 @@
á' çùåï ä àìôéí úùñ"â
á' çùåï ä' àìôéí úùñ"â
"
+--UEXPECT--
+unicode(184) "2/22/5763
+ëá çùåï äúùñâ
+ëá çùåï ä'úùñâ
+ëá çùåï ä àìôéí úùñâ
+ëá çùåï ä' àìôéí úùñâ
+ë"á çùåï äúùñ"â
+á' çùåï äúùñ"â
+á' çùåï ä'úùñ"â
+á' çùåï ä àìôéí úùñ"â
+á' çùåï ä' àìôéí úùñ"â
+"
http://cvs.php.net/viewvc.cgi/php-src/ext/calendar/tests/jdtomonthname.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/calendar/tests/jdtomonthname.phpt
diff -u php-src/ext/calendar/tests/jdtomonthname.phpt:1.2
php-src/ext/calendar/tests/jdtomonthname.phpt:1.3
--- php-src/ext/calendar/tests/jdtomonthname.phpt:1.2 Thu Jul 27 08:14:51 2006
+++ php-src/ext/calendar/tests/jdtomonthname.phpt Sat Mar 22 14:58:29 2008
@@ -69,3 +69,47 @@
string(6) "Tishri"
string(0) ""
Done
+--UEXPECTF--
+unicode(3) "Jan"
+unicode(7) "January"
+unicode(3) "Jan"
+unicode(7) "January"
+unicode(6) "Shevat"
+unicode(0) ""
+unicode(3) "Jan"
+unicode(7) "January"
+unicode(3) "Dec"
+unicode(8) "December"
+unicode(5) "Tevet"
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+
+Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
+bool(false)
+
+Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
+bool(false)
+
+Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
+bool(false)
+
+Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
+bool(false)
+
+Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
+bool(false)
+
+Warning: jdmonthname() expects parameter 1 to be long, array given in %s on
line %d
+bool(false)
+unicode(3) "Dec"
+unicode(8) "December"
+unicode(3) "Jul"
+unicode(4) "July"
+unicode(6) "Tishri"
+unicode(0) ""
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/tests/bug38698.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dba/tests/bug38698.phpt
diff -u php-src/ext/dba/tests/bug38698.phpt:1.1
php-src/ext/dba/tests/bug38698.phpt:1.2
--- php-src/ext/dba/tests/bug38698.phpt:1.1 Wed Nov 1 00:11:49 2006
+++ php-src/ext/dba/tests/bug38698.phpt Sat Mar 22 14:58:29 2008
@@ -23,4 +23,6 @@
===DONE===
--EXPECTF--
string(32) "1f34b74bde3744265acfc21e0f30af95"
+--UEXPECTF--
+unicode(32) "1f34b74bde3744265acfc21e0f30af95"
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/tests/001.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/dbase/tests/001.phpt
diff -u php-src/ext/dbase/tests/001.phpt:1.3
php-src/ext/dbase/tests/001.phpt:1.4
--- php-src/ext/dbase/tests/001.phpt:1.3 Sun Feb 25 23:16:32 2007
+++ php-src/ext/dbase/tests/001.phpt Sat Mar 22 14:58:29 2008
@@ -64,3 +64,22 @@
string(50) "dbase_create(): Expected array as second parameter"
bool(false)
Done
+--UEXPECTF--
+int(%d)
+unicode(38) "dbase_create(): unknown field type 'E'"
+bool(false)
+unicode(38) "dbase_create(): unknown field type '-'"
+bool(false)
+int(%d)
+unicode(71) "dbase_create(): expected field name as first element of list in
field 0"
+bool(false)
+unicode(56) "dbase_create(): Unable to create database without fields"
+bool(false)
+unicode(67) "Argument 2 passed to dbase_create() must be an array, integer
given"
+unicode(50) "dbase_create(): Expected array as second parameter"
+bool(false)
+unicode(%d) "unlink(%s001.dbf): No such file or directory"
+unicode(66) "Argument 2 passed to dbase_create() must be an array, string
given"
+unicode(50) "dbase_create(): Expected array as second parameter"
+bool(false)
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/tests/gettext_basic.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/gettext/tests/gettext_basic.phpt
diff -u php-src/ext/gettext/tests/gettext_basic.phpt:1.3
php-src/ext/gettext/tests/gettext_basic.phpt:1.4
--- php-src/ext/gettext/tests/gettext_basic.phpt:1.3 Wed Nov 15 17:14:50 2006
+++ php-src/ext/gettext/tests/gettext_basic.phpt Sat Mar 22 14:58:29 2008
@@ -11,7 +11,7 @@
}
?>
--FILE--
-<?php // $Id: gettext_basic.phpt,v 1.3 2006/11/15 17:14:50 mike Exp $
+<?php // $Id: gettext_basic.phpt,v 1.4 2008/03/22 14:58:29 felipe Exp $
chdir(dirname(__FILE__));
putenv("LANGUAGE=fi");
@@ -25,3 +25,7 @@
--EXPECT--
Perustesti
Perustesti
+--UEXPECTF--
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale
functions in %s on line %d
+Perustesti
+Perustesti
http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/tests/gettext_basic_de.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/gettext/tests/gettext_basic_de.phpt
diff -u php-src/ext/gettext/tests/gettext_basic_de.phpt:1.1
php-src/ext/gettext/tests/gettext_basic_de.phpt:1.2
--- php-src/ext/gettext/tests/gettext_basic_de.phpt:1.1 Wed Nov 15 17:14:50 2006
+++ php-src/ext/gettext/tests/gettext_basic_de.phpt Sat Mar 22 14:58:29 2008
@@ -30,7 +30,8 @@
string(14) "Einfacher Test"
string(8) "messages"
string(8) "messages"
---UEXPECT--
+--UEXPECTF--
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale
functions in %s on line %d
string(14) "Einfacher Test"
string(14) "Einfacher Test"
unicode(8) "messages"
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/bug37773.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/iconv/tests/bug37773.phpt
diff -u php-src/ext/iconv/tests/bug37773.phpt:1.3
php-src/ext/iconv/tests/bug37773.phpt:1.4
--- php-src/ext/iconv/tests/bug37773.phpt:1.3 Wed Feb 21 19:53:48 2007
+++ php-src/ext/iconv/tests/bug37773.phpt Sat Mar 22 14:58:29 2008
@@ -16,3 +16,5 @@
?>
--EXPECT--
string(1) "x"
+--UEXPECT--
+unicode(1) "x"
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_stream_filter.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/iconv/tests/iconv_stream_filter.phpt
diff -u php-src/ext/iconv/tests/iconv_stream_filter.phpt:1.2
php-src/ext/iconv/tests/iconv_stream_filter.phpt:1.3
--- php-src/ext/iconv/tests/iconv_stream_filter.phpt:1.2 Fri Dec 5
18:39:04 2003
+++ php-src/ext/iconv/tests/iconv_stream_filter.phpt Sat Mar 22 14:58:29 2008
@@ -39,3 +39,15 @@
string(0) ""
string(0) ""
string(0) ""
+--UEXPECTF--
+unicode(20) "1b244224332473244b24"
+unicode(10) "41244f1b28"
+unicode(2) "42"
+unicode(20) "a4b3a4f3a4cba4c1a4cf"
+unicode(10) "69636f6e76"
+unicode(2) "0a"
+
+Warning: fread(): iconv stream filter ("ISO-2022-JP"=>"EUC-JP"): invalid
multibyte sequence in %s on line %d
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/iconv_substr.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/iconv/tests/iconv_substr.phpt
diff -u php-src/ext/iconv/tests/iconv_substr.phpt:1.3
php-src/ext/iconv/tests/iconv_substr.phpt:1.4
--- php-src/ext/iconv/tests/iconv_substr.phpt:1.3 Tue Sep 19 11:49:21 2006
+++ php-src/ext/iconv/tests/iconv_substr.phpt Sat Mar 22 14:58:29 2008
@@ -65,15 +65,15 @@
a6a4a8a4aaa4ab
a4aba4ada4afa4b1a4b3a4b5a4b7
bool(false)
-string(0) ""
+unicode(0) ""
+unicode(14) "This is a test"
unicode(14) "This is a test"
-string(14) "This is a test"
unicode(3) "est"
-string(3) "est"
+unicode(3) "est"
unicode(5) "This "
-string(5) "This "
+unicode(5) "This "
+unicode(0) ""
+unicode(0) ""
unicode(0) ""
-string(0) ""
unicode(0) ""
-string(0) ""
-string(10) "¤Á¤Ï ISO-2"
+unicode(10) "¤Á¤Ï ISO-2"
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug42785.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/json/tests/bug42785.phpt
diff -u php-src/ext/json/tests/bug42785.phpt:1.2
php-src/ext/json/tests/bug42785.phpt:1.3
--- php-src/ext/json/tests/bug42785.phpt:1.2 Mon Oct 1 15:33:29 2007
+++ php-src/ext/json/tests/bug42785.phpt Sat Mar 22 14:58:29 2008
@@ -24,3 +24,7 @@
--EXPECT--
string(13) "[100.1,"bar"]"
string(21) "{"a":100.1,"b":"foo"}"
+--UEXPECTF--
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale
functions in %s on line %d
+unicode(13) "[100.1,"bar"]"
+unicode(21) "{"a":100.1,"b":"foo"}"
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_trace_mode.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/tests/mysql_trace_mode.phpt
diff -u php-src/ext/mysql/tests/mysql_trace_mode.phpt:1.4
php-src/ext/mysql/tests/mysql_trace_mode.phpt:1.5
--- php-src/ext/mysql/tests/mysql_trace_mode.phpt:1.4 Sat Mar 8 23:14:16 2008
+++ php-src/ext/mysql/tests/mysql_trace_mode.phpt Sat Mar 22 14:58:29 2008
@@ -26,9 +26,9 @@
print "done!\n";
?>
--EXPECTF--
-Deprecated: mysql_db_query(): This function is deprecated; use mysql_query()
instead%sin %s on line %d
+Deprecated: mysql_db_query(): use mysql_query() instead in %s on line %d
-Deprecated: mysql_escape_string(): This function is deprecated; use
mysql_real_escape_string() instead. in %s on line %d
+Deprecated: mysql_escape_string(): use mysql_real_escape_string() instead. in
%s on line %d
I don\'t mind character sets, do I?\n
Warning: mysql_query(): You have an error in your SQL syntax; check the manual
that corresponds to your MySQL server version for the right syntax to use near
'BOGUS_SQL' at line 1 in %s on line %d
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/locales.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/pcre/tests/locales.phpt
diff -u php-src/ext/pcre/tests/locales.phpt:1.5
php-src/ext/pcre/tests/locales.phpt:1.6
--- php-src/ext/pcre/tests/locales.phpt:1.5 Mon Jul 3 14:55:49 2006
+++ php-src/ext/pcre/tests/locales.phpt Sat Mar 22 14:58:29 2008
@@ -25,3 +25,12 @@
int(0)
int(1)
int(0)
+--UEXPECTF--
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale
functions in %s on line %d
+int(0)
+
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale
functions in %s on line %d
+int(1)
+
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale
functions in %s on line %d
+int(0)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug_33689.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/pdo_mysql/tests/bug_33689.phpt
diff -u php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.4
php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.5
--- php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.4 Fri May 18 11:47:31 2007
+++ php-src/ext/pdo_mysql/tests/bug_33689.phpt Sat Mar 22 14:58:29 2008
@@ -51,3 +51,27 @@
[precision] => 0
[pdo_type] => 2
)
+--UEXPECTF--
+object(PDOStatement)#%d (1) {
+ [u"queryString"]=>
+ unicode(18) "SELECT * from test"
+}
+Array
+(
+ [bar] => 1
+ [0] => 1
+)
+Array
+(
+ [native_type] => LONG
+ [flags] => Array
+ (
+ [0] => not_null
+ )
+
+ [table] => test
+ [name] => bar
+ [len] => 11
+ [precision] => 0
+ [pdo_type] => 2
+)
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug36611.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/simplexml/tests/bug36611.phpt
diff -u php-src/ext/simplexml/tests/bug36611.phpt:1.4
php-src/ext/simplexml/tests/bug36611.phpt:1.5
--- php-src/ext/simplexml/tests/bug36611.phpt:1.4 Tue Aug 8 20:52:45 2006
+++ php-src/ext/simplexml/tests/bug36611.phpt Sat Mar 22 14:58:29 2008
@@ -28,3 +28,9 @@
int(1)
int(1)
Done
+--UEXPECTF--
+int(1)
+
+Strict Standards: Creating default object from empty value in %s on line %d
+int(1)
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
