6 files changed, 159 insertions, 2 deletions
diff --git a/ext/date/tests/bug37616.phpt b/ext/date/tests/bug37616.phpt
index 7652501765..6572d42601 100644
--- a/ext/date/tests/bug37616.phpt
+++ b/ext/date/tests/bug37616.phpt
@@ -7,3 +7,5 @@ Bug #37616 (DATE_RFC822 does not product RFC 822 dates)
 ?>
 --EXPECT--
 string(29) "Sat, 01 Jul 06 14:27:30 +0200"
+--UEXPECT--
+unicode(29) "Sat, 01 Jul 06 14:27:30 +0200"
diff --git a/ext/date/tests/date_constants.phpt b/ext/date/tests/date_constants.phpt
index bf11d0bb77..466bec1098 100644
--- a/ext/date/tests/date_constants.phpt
+++ b/ext/date/tests/date_constants.phpt
@@ -42,3 +42,24 @@ string(31) "Sat, 01 Jul 2006 14:27:30 +0200"
 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"
diff --git a/ext/exif/tests/bug34704.phpt b/ext/exif/tests/bug34704.phpt
index 7688ce861a..41eb42400a 100755
--- a/ext/exif/tests/bug34704.phpt
+++ b/ext/exif/tests/bug34704.phpt
@@ -40,3 +40,32 @@ array(7) {
   }
 }
 ===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===
diff --git a/ext/exif/tests/exif001.phpt b/ext/exif/tests/exif001.phpt
index 8fac4286ca..ad4719831c 100644
--- a/ext/exif/tests/exif001.phpt
+++ b/ext/exif/tests/exif001.phpt
@@ -81,4 +81,72 @@ array(5) {
     [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"
+  }
+}
diff --git a/ext/exif/tests/exif005.phpt b/ext/exif/tests/exif005.phpt
index e34e3a0421..9edba0a618 100644
--- a/ext/exif/tests/exif005.phpt
+++ b/ext/exif/tests/exif005.phpt
@@ -19,4 +19,11 @@ array(2) {
   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"
+}
diff --git a/tests/classes/serialize_001.phpt b/tests/classes/serialize_001.phpt
index 44d7bafadb..3b93973a5e 100755
--- a/tests/classes/serialize_001.phpt
+++ b/tests/classes/serialize_001.phpt
@@ -107,3 +107,33 @@ Test::__construct()
 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===