Update exif tests to conform with the unicode functions

diff --git a/ext/exif/tests/bug34704.phpt b/ext/exif/tests/bug34704.phpt
index 41eb42400a148bb75464f85ad686c69748a03527..8b8874b9963490a1f4796805b5fbed858c5353af 100755 (executable)
--- a/ext/exif/tests/bug34704.phpt
+++ b/ext/exif/tests/bug34704.phpt
@@ -12,52 +12,23 @@ var_dump(exif_read_data($infile));
 ?>
 ===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"]=>

diff --git a/ext/exif/tests/exif001.phpt b/ext/exif/tests/exif001.phpt
index 92a36b331215f06c901bb69cb7c59a8968876660..1e4da2ab87176338ec36de3243251e8c813bb857 100644 (file)
--- a/ext/exif/tests/exif001.phpt
+++ b/ext/exif/tests/exif001.phpt
@@ -19,7 +19,7 @@ array(5) {
   [u"FILE"]=>
   array(6) {
     [u"FileName"]=>
-    string(9) "test2.jpg"
+    unicode(9) "test2.jpg"
     [u"FileDateTime"]=>
     int(%d)
     [u"FileSize"]=>
@@ -27,14 +27,14 @@ array(5) {
     [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 @@ array(5) {
     [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 @@ array(5) {
   [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"
   }
 }

diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt
index 229f49e1459b8f29399bae398fa34bb038b8bd85..04f0f2e27927f85bbecb4b75658ac3bdc7b2780d 100644 (file)
--- a/ext/exif/tests/exif004.phpt
+++ b/ext/exif/tests/exif004.phpt
@@ -22,17 +22,17 @@ echo var_dump($image['WINXP']);
 ?>
 --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..."
 }

diff --git a/ext/exif/tests/exif005.phpt b/ext/exif/tests/exif005.phpt
index 4b5e7c9e27002fd6bcce3da05f4b87369e7d1a84..477a075c77764ccc02539f043c2422f32ffe5831 100644 (file)
--- a/ext/exif/tests/exif005.phpt
+++ b/ext/exif/tests/exif005.phpt
@@ -16,7 +16,7 @@ var_dump($image['IFD0']);
 --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"
 }