Fixed tests in unicode mode

diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt
index f3bf7975ea06c0989386da5c53b9f6e8e5202ba2..47d66a98980f925ae52d8ab844f5d1c3a379e064 100644 (file)
--- a/ext/dba/tests/dba_cdb.phpt
+++ b/ext/dba/tests/dba_cdb.phpt
@@ -45,3 +45,36 @@ array(5) {
   string(23) "The last content string"
 }
 ===DONE===
+--UEXPECT--
+database handler: cdb
+5YYYYY
+Content String 2
+array(5) {
+  [u"key1"]=>
+  string(16) "Content String 1"
+  [u"key2"]=>
+  string(16) "Content String 2"
+  [u"key3"]=>
+  string(20) "Third Content String"
+  [u"key4"]=>
+  string(22) "Another Content String"
+  [u"key5"]=>
+  string(23) "The last content string"
+}
+--NO-LOCK--
+5YYYYY
+Content String 2
+array(5) {
+  [u"key1"]=>
+  string(16) "Content String 1"
+  [u"key2"]=>
+  string(16) "Content String 2"
+  [u"key3"]=>
+  string(20) "Third Content String"
+  [u"key4"]=>
+  string(22) "Another Content String"
+  [u"key5"]=>
+  string(23) "The last content string"
+}
+===DONE===
+

diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt
index 4f4b74746025bbe3a26f2cc0d36a5d8e614ac42e..49c8bd28c3d25e1bdbe44a9811858ed04f5f9be1 100644 (file)
--- a/ext/dba/tests/dba_cdb_make.phpt
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -34,3 +34,8 @@ DBA CDB_MAKE handler test
 database handler: cdb_make
 string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
 string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
+--UEXPECT--
+database handler: cdb_make
+unicode(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
+unicode(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
+

diff --git a/ext/dba/tests/dba_flatfile.phpt b/ext/dba/tests/dba_flatfile.phpt
index 2e32b8a3278152d5907fc71517a0e0f2568e7ce0..ed1f7373028fba56c70bd97bdd1979e572c31e33 100644 (file)
--- a/ext/dba/tests/dba_flatfile.phpt
+++ b/ext/dba/tests/dba_flatfile.phpt
@@ -44,3 +44,36 @@ array(3) {
   string(23) "The last content string"
 }
 ===DONE===
+--UEXPECT--
+database handler: flatfile
+3NYNYY
+Content String 2
+Content 2 replaced
+Read during write: not allowed
+Content 2 replaced 2nd time
+The 6th value
+array(3) {
+  [u"key number 6"]=>
+  string(13) "The 6th value"
+  [u"key2"]=>
+  string(27) "Content 2 replaced 2nd time"
+  [u"key5"]=>
+  string(23) "The last content string"
+}
+--NO-LOCK--
+3NYNYY
+Content String 2
+Content 2 replaced
+Read during write: not allowed
+Content 2 replaced 2nd time
+The 6th value
+array(3) {
+  [u"key number 6"]=>
+  string(13) "The 6th value"
+  [u"key2"]=>
+  string(27) "Content 2 replaced 2nd time"
+  [u"key5"]=>
+  string(23) "The last content string"
+}
+===DONE===
+

diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt
index 9511a8bb49b5f8f1a524e1919db6da72ba271e12..c043210c967c4820b0d2fd2199a0cae46171f2dd 100644 (file)
--- a/ext/dba/tests/dba_inifile.phpt
+++ b/ext/dba/tests/dba_inifile.phpt
@@ -44,3 +44,36 @@ array(3) {
   string(23) "The last content string"
 }
 ===DONE===
+--UEXPECT--
+database handler: inifile
+3NYNYY
+Content String 2
+Content 2 replaced
+Read during write: not allowed
+Content 2 replaced 2nd time
+The 6th value
+array(3) {
+  [u"key number 6"]=>
+  string(13) "The 6th value"
+  [u"key2"]=>
+  string(27) "Content 2 replaced 2nd time"
+  [u"key5"]=>
+  string(23) "The last content string"
+}
+--NO-LOCK--
+3NYNYY
+Content String 2
+Content 2 replaced
+Read during write: not allowed
+Content 2 replaced 2nd time
+The 6th value
+array(3) {
+  [u"key number 6"]=>
+  string(13) "The 6th value"
+  [u"key2"]=>
+  string(27) "Content 2 replaced 2nd time"
+  [u"key5"]=>
+  string(23) "The last content string"
+}
+===DONE===
+