tony2001 Fri Jun 2 22:22:43 2006 UTC
Modified files:
/php-src/ext/date/tests bug37616.phpt date_constants.phpt
/php-src/ext/exif/tests bug34704.phpt exif001.phpt exif005.phpt
/php-src/tests/classes serialize_001.phpt
Log:
fix tests in unicode mode
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/tests/bug37616.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/date/tests/bug37616.phpt
diff -u php-src/ext/date/tests/bug37616.phpt:1.2
php-src/ext/date/tests/bug37616.phpt:1.3
--- php-src/ext/date/tests/bug37616.phpt:1.2 Tue May 30 13:15:10 2006
+++ php-src/ext/date/tests/bug37616.phpt Fri Jun 2 22:22:40 2006
@@ -7,3 +7,5 @@
?>
--EXPECT--
string(29) "Sat, 01 Jul 06 14:27:30 +0200"
+--UEXPECT--
+unicode(29) "Sat, 01 Jul 06 14:27:30 +0200"
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/tests/date_constants.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/date/tests/date_constants.phpt
diff -u php-src/ext/date/tests/date_constants.phpt:1.4
php-src/ext/date/tests/date_constants.phpt:1.5
--- php-src/ext/date/tests/date_constants.phpt:1.4 Tue May 30 15:13:36 2006
+++ php-src/ext/date/tests/date_constants.phpt Fri Jun 2 22:22:40 2006
@@ -42,3 +42,24 @@
string(31) "Tue, 30 May 2006 14:32:13 +0200"
string(25) "2006-07-01T14:27:30+02:00"
string(25) "2006-05-30T14:32:13+02:00"
+--UEXPECT--
+unicode(25) "2006-07-01T14:27:30+02:00"
+unicode(25) "2006-05-30T14:32:13+02:00"
+unicode(33) "Saturday, 01-Jul-06 14:27:30 CEST"
+unicode(32) "Tuesday, 30-May-06 14:32:13 CEST"
+unicode(24) "2006-07-01T14:27:30+0200"
+unicode(24) "2006-05-30T14:32:13+0200"
+unicode(29) "Sat, 01 Jul 06 14:27:30 +0200"
+unicode(29) "Tue, 30 May 06 14:32:13 +0200"
+unicode(33) "Saturday, 01-Jul-06 14:27:30 CEST"
+unicode(32) "Tuesday, 30-May-06 14:32:13 CEST"
+unicode(29) "Sat, 01 Jul 06 14:27:30 +0200"
+unicode(29) "Tue, 30 May 06 14:32:13 +0200"
+unicode(31) "Sat, 01 Jul 2006 14:27:30 +0200"
+unicode(31) "Tue, 30 May 2006 14:32:13 +0200"
+unicode(31) "Sat, 01 Jul 2006 14:27:30 +0200"
+unicode(31) "Tue, 30 May 2006 14:32:13 +0200"
+unicode(31) "Sat, 01 Jul 2006 14:27:30 +0200"
+unicode(31) "Tue, 30 May 2006 14:32:13 +0200"
+unicode(25) "2006-07-01T14:27:30+02:00"
+unicode(25) "2006-05-30T14:32:13+02:00"
http://cvs.php.net/viewcvs.cgi/php-src/ext/exif/tests/bug34704.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/exif/tests/bug34704.phpt
diff -u php-src/ext/exif/tests/bug34704.phpt:1.4
php-src/ext/exif/tests/bug34704.phpt:1.5
--- php-src/ext/exif/tests/bug34704.phpt:1.4 Wed Mar 8 00:43:27 2006
+++ php-src/ext/exif/tests/bug34704.phpt Fri Jun 2 22:22:42 2006
@@ -40,3 +40,32 @@
}
}
===DONE===
+--UEXPECTF--
+array(7) {
+ [u"FileName"]=>
+ string(12) "bug34704.jpg"
+ [u"FileDateTime"]=>
+ int(1128867104)
+ [u"FileSize"]=>
+ int(9976)
+ [u"FileType"]=>
+ int(2)
+ [u"MimeType"]=>
+ string(10) "image/jpeg"
+ [u"SectionsFound"]=>
+ string(4) "IFD0"
+ [u"COMPUTED"]=>
+ array(5) {
+ [u"html"]=>
+ string(24) "width="386" height="488""
+ [u"Height"]=>
+ int(488)
+ [u"Width"]=>
+ int(386)
+ [u"IsColor"]=>
+ int(1)
+ [u"ByteOrderMotorola"]=>
+ int(0)
+ }
+}
+===DONE===
http://cvs.php.net/viewcvs.cgi/php-src/ext/exif/tests/exif001.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/exif/tests/exif001.phpt
diff -u php-src/ext/exif/tests/exif001.phpt:1.2
php-src/ext/exif/tests/exif001.phpt:1.3
--- php-src/ext/exif/tests/exif001.phpt:1.2 Thu Nov 14 21:45:01 2002
+++ php-src/ext/exif/tests/exif001.phpt Fri Jun 2 22:22:42 2006
@@ -81,4 +81,72 @@
[2]=>
string(13) "Comment #3end"
}
-}
\ No newline at end of file
+}
+--UEXPECT--
+array(5) {
+ [u"FILE"]=>
+ array(6) {
+ [u"FileName"]=>
+ string(9) "test2.jpg"
+ [u"FileDateTime"]=>
+ int(1115993416)
+ [u"FileSize"]=>
+ int(1240)
+ [u"FileType"]=>
+ int(2)
+ [u"MimeType"]=>
+ string(10) "image/jpeg"
+ [u"SectionsFound"]=>
+ string(33) "ANY_TAG, IFD0, THUMBNAIL, COMMENT"
+ }
+ [u"COMPUTED"]=>
+ array(12) {
+ [u"html"]=>
+ string(20) "width="1" height="1""
+ [u"Height"]=>
+ int(1)
+ [u"Width"]=>
+ int(1)
+ [u"IsColor"]=>
+ int(1)
+ [u"ByteOrderMotorola"]=>
+ int(1)
+ [u"UserComment"]=>
+ string(16) "Exif test image."
+ [u"UserCommentEncoding"]=>
+ string(5) "ASCII"
+ [u"Copyright"]=>
+ string(41) "Photo (c) M.Boerger, Edited by M.Boerger."
+ [u"Copyright.Photographer"]=>
+ string(19) "Photo (c) M.Boerger"
+ [u"Copyright.Editor"]=>
+ string(20) "Edited by M.Boerger."
+ [u"Thumbnail.FileType"]=>
+ int(2)
+ [u"Thumbnail.MimeType"]=>
+ string(10) "image/jpeg"
+ }
+ [u"IFD0"]=>
+ array(2) {
+ [u"Copyright"]=>
+ string(19) "Photo (c) M.Boerger"
+ [u"UserComment"]=>
+ string(5) "ASCII"
+ }
+ [u"THUMBNAIL"]=>
+ array(2) {
+ [u"JPEGInterchangeFormat"]=>
+ int(134)
+ [u"JPEGInterchangeFormatLength"]=>
+ int(523)
+ }
+ [u"COMMENT"]=>
+ array(3) {
+ [0]=>
+ string(11) "Comment #1."
+ [1]=>
+ string(11) "Comment #2."
+ [2]=>
+ string(13) "Comment #3end"
+ }
+}
http://cvs.php.net/viewcvs.cgi/php-src/ext/exif/tests/exif005.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/exif/tests/exif005.phpt
diff -u php-src/ext/exif/tests/exif005.phpt:1.6
php-src/ext/exif/tests/exif005.phpt:1.7
--- php-src/ext/exif/tests/exif005.phpt:1.6 Mon Dec 22 23:45:52 2003
+++ php-src/ext/exif/tests/exif005.phpt Fri Jun 2 22:22:42 2006
@@ -19,4 +19,11 @@
string(11) "Ifd00000009"
["DateTime"]=>
string(19) "2002:10:18 20:06:00"
-}
\ No newline at end of file
+}
+--UEXPECTF--
+array(2) {
+ [u"ImageDescription"]=>
+ string(11) "Ifd00000009"
+ [u"DateTime"]=>
+ string(19) "2002:10:18 20:06:00"
+}
http://cvs.php.net/viewcvs.cgi/php-src/tests/classes/serialize_001.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/tests/classes/serialize_001.phpt
diff -u php-src/tests/classes/serialize_001.phpt:1.3
php-src/tests/classes/serialize_001.phpt:1.4
--- php-src/tests/classes/serialize_001.phpt:1.3 Mon Mar 27 09:42:15 2006
+++ php-src/tests/classes/serialize_001.phpt Fri Jun 2 22:22:43 2006
@@ -107,3 +107,33 @@
Test::serialize()
Exception: Test::serialize() must return a string or NULL
===DONE===
+--UEXPECT--
+==========
+unicode(6) "String"
+Test::__construct(String)
+Test::serialize(String)
+Test::unserialize(String)
+object(Test)#1 (1) {
+ [u"data"]=>
+ string(6) "String"
+}
+object(Test)#1 (1) {
+ [u"data"]=>
+ string(6) "String"
+}
+==========
+NULL
+Test::__construct()
+Test::serialize()
+NULL
+==========
+int(42)
+Test::__construct(42)
+Test::serialize(42)
+Exception: Test::serialize() must return a string or NULL
+==========
+bool(false)
+Test::__construct()
+Test::serialize()
+Exception: Test::serialize() must return a string or NULL
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
