hnangelo Sat Jun 7 20:38:38 2008 UTC
Modified files:
/php-src/ext/exif/tests bug34704.phpt exif001.phpt exif004.phpt
exif005.phpt
Log:
Update exif tests to conform with the unicode functions
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/tests/bug34704.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/exif/tests/bug34704.phpt
diff -u php-src/ext/exif/tests/bug34704.phpt:1.5
php-src/ext/exif/tests/bug34704.phpt:1.6
--- php-src/ext/exif/tests/bug34704.phpt:1.5 Fri Jun 2 22:22:42 2006
+++ php-src/ext/exif/tests/bug34704.phpt Sat Jun 7 20:38:38 2008
@@ -13,51 +13,22 @@
===DONE===
--EXPECTF--
array(7) {
- ["FileName"]=>
- string(12) "bug34704.jpg"
- ["FileDateTime"]=>
- int(%d)
- ["FileSize"]=>
- int(9976)
- ["FileType"]=>
- int(2)
- ["MimeType"]=>
- string(10) "image/jpeg"
- ["SectionsFound"]=>
- string(4) "IFD0"
- ["COMPUTED"]=>
- array(5) {
- ["html"]=>
- string(24) "width="386" height="488""
- ["Height"]=>
- int(488)
- ["Width"]=>
- int(386)
- ["IsColor"]=>
- int(1)
- ["ByteOrderMotorola"]=>
- int(0)
- }
-}
-===DONE===
---UEXPECTF--
-array(7) {
[u"FileName"]=>
- string(12) "bug34704.jpg"
+ unicode(12) "bug34704.jpg"
[u"FileDateTime"]=>
- int(1128867104)
+ int(%d)
[u"FileSize"]=>
int(9976)
[u"FileType"]=>
int(2)
[u"MimeType"]=>
- string(10) "image/jpeg"
+ unicode(10) "image/jpeg"
[u"SectionsFound"]=>
- string(4) "IFD0"
+ unicode(4) "IFD0"
[u"COMPUTED"]=>
array(5) {
[u"html"]=>
- string(24) "width="386" height="488""
+ unicode(24) "width="386" height="488""
[u"Height"]=>
int(488)
[u"Width"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/tests/exif001.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/exif/tests/exif001.phpt
diff -u php-src/ext/exif/tests/exif001.phpt:1.6
php-src/ext/exif/tests/exif001.phpt:1.7
--- php-src/ext/exif/tests/exif001.phpt:1.6 Tue May 27 18:16:00 2008
+++ php-src/ext/exif/tests/exif001.phpt Sat Jun 7 20:38:38 2008
@@ -19,7 +19,7 @@
[u"FILE"]=>
array(6) {
[u"FileName"]=>
- string(9) "test2.jpg"
+ unicode(9) "test2.jpg"
[u"FileDateTime"]=>
int(%d)
[u"FileSize"]=>
@@ -27,14 +27,14 @@
[u"FileType"]=>
int(2)
[u"MimeType"]=>
- string(10) "image/jpeg"
+ unicode(10) "image/jpeg"
[u"SectionsFound"]=>
- string(33) "ANY_TAG, IFD0, THUMBNAIL, COMMENT"
+ unicode(33) "ANY_TAG, IFD0, THUMBNAIL, COMMENT"
}
[u"COMPUTED"]=>
array(12) {
[u"html"]=>
- string(20) "width="1" height="1""
+ unicode(20) "width="1" height="1""
[u"Height"]=>
int(1)
[u"Width"]=>
@@ -44,26 +44,26 @@
[u"ByteOrderMotorola"]=>
int(1)
[u"UserComment"]=>
- string(16) "Exif test image."
+ unicode(16) "Exif test image."
[u"UserCommentEncoding"]=>
- string(5) "ASCII"
+ unicode(5) "ASCII"
[u"Copyright"]=>
- string(41) "Photo (c) M.Boerger, Edited by M.Boerger."
+ unicode(41) "Photo (c) M.Boerger, Edited by M.Boerger."
[u"Copyright.Photographer"]=>
- string(19) "Photo (c) M.Boerger"
+ unicode(19) "Photo (c) M.Boerger"
[u"Copyright.Editor"]=>
- string(20) "Edited by M.Boerger."
+ unicode(20) "Edited by M.Boerger."
[u"Thumbnail.FileType"]=>
int(2)
[u"Thumbnail.MimeType"]=>
- string(10) "image/jpeg"
+ unicode(10) "image/jpeg"
}
[u"IFD0"]=>
array(2) {
[u"Copyright"]=>
- string(19) "Photo (c) M.Boerger"
+ unicode(19) "Photo (c) M.Boerger"
[u"UserComment"]=>
- string(5) "ASCII"
+ unicode(5) "ASCII"
}
[u"THUMBNAIL"]=>
array(2) {
@@ -75,10 +75,10 @@
[u"COMMENT"]=>
array(3) {
[0]=>
- string(11) "Comment #1."
+ unicode(11) "Comment #1."
[1]=>
- string(11) "Comment #2."
+ unicode(11) "Comment #2."
[2]=>
- string(13) "Comment #3end"
+ unicode(13) "Comment #3end"
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/tests/exif004.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/exif/tests/exif004.phpt
diff -u php-src/ext/exif/tests/exif004.phpt:1.5
php-src/ext/exif/tests/exif004.phpt:1.6
--- php-src/ext/exif/tests/exif004.phpt:1.5 Sat Jan 4 19:19:59 2003
+++ php-src/ext/exif/tests/exif004.phpt Sat Jun 7 20:38:38 2008
@@ -22,17 +22,17 @@
?>
--EXPECT--
array(5) {
- ["Subject"]=>
- string(10) "Subject..."
- ["Keywords"]=>
- string(11) "Keywords..."
- ["Author"]=>
- string(9) "Rui Carmo"
- ["Comments"]=>
- string(29) "Comments
+ [u"Subject"]=>
+ unicode(10) "Subject..."
+ [u"Keywords"]=>
+ unicode(11) "Keywords..."
+ [u"Author"]=>
+ unicode(9) "Rui Carmo"
+ [u"Comments"]=>
+ unicode(29) "Comments
Line2
Line3
Line4"
- ["Title"]=>
- string(8) "Title..."
+ [u"Title"]=>
+ unicode(8) "Title..."
}
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/tests/exif005.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/exif/tests/exif005.phpt
diff -u php-src/ext/exif/tests/exif005.phpt:1.8
php-src/ext/exif/tests/exif005.phpt:1.9
--- php-src/ext/exif/tests/exif005.phpt:1.8 Tue May 27 18:16:00 2008
+++ php-src/ext/exif/tests/exif005.phpt Sat Jun 7 20:38:38 2008
@@ -16,7 +16,7 @@
--EXPECT--
array(2) {
[u"ImageDescription"]=>
- string(11) "Ifd00000009"
+ unicode(11) "Ifd00000009"
[u"DateTime"]=>
- string(19) "2002:10:18 20:06:00"
+ unicode(19) "2002:10:18 20:06:00"
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
