From 36002f16c3baa2b0beb9719e5e3910e72410f8c5 Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 22 Feb 2006 12:22:07 +0000
Subject: [PATCH] Fixed test file
---
ext/pdo/tests/pdo_011.phpt | 24 +-
ext/session/tests/006.phpt | 25 ++
ext/session/tests/bug24592.phpt | 14 +
ext/spl/tests/spl_autoload_007.phpt | 81 ++++++
ext/standard/tests/array/007.phpt | 431 ++++++++++++++++++++++++++++
5 files changed, 563 insertions(+), 12 deletions(-)
diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt
index bed899f035..3567124695 100644
--- a/ext/pdo/tests/pdo_011.phpt
+++ b/ext/pdo/tests/pdo_011.phpt
@@ -437,10 +437,10 @@ array(4) {
}
}
unicode(16) "DerivedStatement"
-DerivedStatement::retrieve(1,A)
-DerivedStatement::retrieve(2,B)
-DerivedStatement::retrieve(3,C)
-DerivedStatement::retrieve(4,D)
+DerivedStatement::reTrieve(1,A)
+DerivedStatement::reTrieve(2,B)
+DerivedStatement::reTrieve(3,C)
+DerivedStatement::reTrieve(4,D)
array(4) {
[0]=>
array(1) {
@@ -463,10 +463,10 @@ array(4) {
unicode(1) "D"
}
}
-DerivedStatement::retrieve(1,A)
-DerivedStatement::retrieve(2,B)
-DerivedStatement::retrieve(3,C)
-DerivedStatement::retrieve(4,D)
+DerivedStatement::reTrieve(1,A)
+DerivedStatement::reTrieve(2,B)
+DerivedStatement::reTrieve(3,C)
+DerivedStatement::reTrieve(4,D)
array(4) {
[0]=>
array(1) {
@@ -489,10 +489,10 @@ array(4) {
unicode(1) "D"
}
}
-DerivedStatement::retrieve(1,A)
-DerivedStatement::retrieve(2,B)
-DerivedStatement::retrieve(3,C)
-DerivedStatement::retrieve(4,D)
+DerivedStatement::reTrieve(1,A)
+DerivedStatement::reTrieve(2,B)
+DerivedStatement::reTrieve(3,C)
+DerivedStatement::reTrieve(4,D)
array(4) {
[0]=>
array(1) {
diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt
index 40385bbe1e..e3e18bf9dd 100644
--- a/ext/session/tests/006.phpt
+++ b/ext/session/tests/006.phpt
@@ -69,3 +69,28 @@ object(b)#%d (1) {
string(5) "hallo"
}
}
+--UEXPECTF--
+original values:
+object(a)#%d (1) {
+ [u"test"]=>
+ unicode(5) "hallo"
+}
+object(b)#%d (1) {
+ [u"a"]=>
+ &object(a)#%d (1) {
+ [u"test"]=>
+ unicode(5) "hallo"
+ }
+}
+values after session:
+object(a)#%d (1) {
+ [u"test"]=>
+ unicode(5) "hallo"
+}
+object(b)#%d (1) {
+ [u"a"]=>
+ &object(a)#%d (1) {
+ [u"test"]=>
+ unicode(5) "hallo"
+ }
+}
diff --git a/ext/session/tests/bug24592.phpt b/ext/session/tests/bug24592.phpt
index 2c749386e6..ccad794267 100644
--- a/ext/session/tests/bug24592.phpt
+++ b/ext/session/tests/bug24592.phpt
@@ -34,3 +34,17 @@ array(2) {
["bar"]=>
NULL
}
+--UEXPECTF--
+Notice: Undefined index: foo in %s on line %d
+
+Notice: Undefined index: bar in %s on line %d
+NULL
+NULL
+array(0) {
+}
+array(2) {
+ [u"foo"]=>
+ NULL
+ [u"bar"]=>
+ NULL
+}
diff --git a/ext/spl/tests/spl_autoload_007.phpt b/ext/spl/tests/spl_autoload_007.phpt
index 66c9c5d83b..5c7bcbccc0 100755
--- a/ext/spl/tests/spl_autoload_007.phpt
+++ b/ext/spl/tests/spl_autoload_007.phpt
@@ -138,3 +138,84 @@ array(2) {
}
ok
===DONE===
+--UEXPECTF--
+unicode(22) "MyAutoLoader::notExist"
+Function 'MyAutoLoader::notExist' not found
+
+unicode(22) "MyAutoLoader::noAccess"
+Function 'MyAutoLoader::noAccess' not callable
+
+unicode(22) "MyAutoLoader::autoLoad"
+ok
+
+unicode(22) "MyAutoLoader::dynaLoad"
+Function 'MyAutoLoader::dynaLoad' not callable
+
+array(2) {
+ [0]=>
+ unicode(12) "MyAutoLoader"
+ [1]=>
+ unicode(8) "notExist"
+}
+Passed array does not specify an existing static method
+
+array(2) {
+ [0]=>
+ unicode(12) "MyAutoLoader"
+ [1]=>
+ unicode(8) "noAccess"
+}
+Passed array does not specify a callable static method
+
+array(2) {
+ [0]=>
+ unicode(12) "MyAutoLoader"
+ [1]=>
+ unicode(8) "autoLoad"
+}
+ok
+
+array(2) {
+ [0]=>
+ unicode(12) "MyAutoLoader"
+ [1]=>
+ unicode(8) "dynaLoad"
+}
+Passed array specifies a non static method but no object
+
+array(2) {
+ [0]=>
+ object(MyAutoLoader)#%d (0) {
+ }
+ [1]=>
+ unicode(8) "notExist"
+}
+Passed array does not specify an existing method
+
+array(2) {
+ [0]=>
+ object(MyAutoLoader)#%d (0) {
+ }
+ [1]=>
+ unicode(8) "noAccess"
+}
+Passed array does not specify a callable method
+
+array(2) {
+ [0]=>
+ object(MyAutoLoader)#%d (0) {
+ }
+ [1]=>
+ unicode(8) "autoLoad"
+}
+ok
+
+array(2) {
+ [0]=>
+ object(MyAutoLoader)#%d (0) {
+ }
+ [1]=>
+ unicode(8) "dynaLoad"
+}
+ok
+===DONE===
diff --git a/ext/standard/tests/array/007.phpt b/ext/standard/tests/array/007.phpt
index e30b8fe2c1..03fa6c19f6 100644
--- a/ext/standard/tests/array/007.phpt
+++ b/ext/standard/tests/array/007.phpt
@@ -551,3 +551,434 @@ array(3) {
int(23)
}
}
+--UEXPECTF--
+$a=array (
+ 0 => 1,
+ 'big' => 2,
+ 1 => 3,
+ 2 => 6,
+ 3 => 3,
+ 4 => 5,
+ 5 => 3,
+ 6 => 3,
+ 7 => 3,
+ 8 => 3,
+ 9 => 3,
+ 10 => 3,
+ 11 => 3,
+ 12 => 3,
+ 13 => 3,
+ 14 => 3,
+);
+$b=array (
+ 0 => 2,
+ 1 => 2,
+ 2 => 3,
+ 3 => 3,
+ 4 => 3,
+ 5 => 3,
+ 6 => 3,
+ 7 => 3,
+ 8 => 3,
+ 9 => 3,
+ 10 => 3,
+ 11 => 3,
+ 12 => 3,
+ 13 => 3,
+ 14 => 3,
+);
+$c=array (
+ 0 => -1,
+ 1 => 1,
+);
+array(2) {
+ [2]=>
+ int(6)
+ [4]=>
+ int(5)
+}
+array(5) {
+ [0]=>
+ int(1)
+ [u"big"]=>
+ int(2)
+ [1]=>
+ int(3)
+ [2]=>
+ int(6)
+ [4]=>
+ int(5)
+}
+$a=array (
+ 'a' => 2,
+ 'b' => 'some',
+ 'c' => 'done',
+ 'z' => 'foo',
+ 'f' => 5,
+ 'fan' => 'fen',
+ 7 => 18,
+ 9 => 25,
+ 11 => 42,
+ 12 => 42,
+ 45 => 42,
+ 73 => 'foo',
+ 95 => 'some',
+ 'som3' => 'some',
+ 'want' => 'wanna',
+);
+$b=array (
+ 'a' => 7,
+ 7 => 18,
+ 9 => 13,
+ 11 => 42,
+ 45 => 46,
+ 'som3' => 'some',
+ 'foo' => 'some',
+ 'goo' => 'foo',
+ 'f' => 5,
+ 'z' => 'equal',
+);
+$c=array (
+ 73 => 'foo',
+ 95 => 'some',
+);
+Results:
+
+array(5) {
+ [u"a"]=>
+ int(2)
+ [u"c"]=>
+ unicode(4) "done"
+ [u"fan"]=>
+ unicode(3) "fen"
+ [9]=>
+ int(25)
+ [u"want"]=>
+ unicode(5) "wanna"
+}
+array(9) {
+ [u"a"]=>
+ int(2)
+ [u"b"]=>
+ unicode(4) "some"
+ [u"c"]=>
+ unicode(4) "done"
+ [u"z"]=>
+ unicode(3) "foo"
+ [u"fan"]=>
+ unicode(3) "fen"
+ [9]=>
+ int(25)
+ [12]=>
+ int(42)
+ [45]=>
+ int(42)
+ [u"want"]=>
+ unicode(5) "wanna"
+}
+-=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-
+$a=array (
+ '0.1' =>
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
+);
+$b=array (
+ '0.2' =>
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
+);
+var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
+array(3) {
+ [u"0.1"]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(9)
+ [u"public_member"]=>
+ int(9)
+ }
+ [u"0.5"]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(12)
+ [u"public_member"]=>
+ int(12)
+ }
+ [0]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(23)
+ [u"public_member"]=>
+ int(23)
+ }
+}
+$a=array (
+ '0.1' =>
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
+);
+$b=array (
+ '0.2' =>
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
+);
+var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
+array(3) {
+ [u"0.1"]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(9)
+ [u"public_member"]=>
+ int(9)
+ }
+ [u"0.5"]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(12)
+ [u"public_member"]=>
+ int(12)
+ }
+ [0]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(23)
+ [u"public_member"]=>
+ int(23)
+ }
+}
+$a=array (
+ '0.1' =>
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
+);
+$b=array (
+ '0.2' =>
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
+);
+var_dump(array_udiff($a, $b, "comp_func_cr"));
+array(2) {
+ [u"0.5"]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(12)
+ [u"public_member"]=>
+ int(12)
+ }
+ [0]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(23)
+ [u"public_member"]=>
+ int(23)
+ }
+}
+$a=array (
+ '0.1' =>
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 12,
+ 'public_member' => 12,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 23,
+ 'public_member' => 23,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
+);
+$b=array (
+ '0.2' =>
+ cr::__set_state(array(
+ 'priv_member' => 9,
+ 'public_member' => 9,
+ )),
+ '0.5' =>
+ cr::__set_state(array(
+ 'priv_member' => 22,
+ 'public_member' => 22,
+ )),
+ 0 =>
+ cr::__set_state(array(
+ 'priv_member' => 3,
+ 'public_member' => 3,
+ )),
+ 1 =>
+ cr::__set_state(array(
+ 'priv_member' => 4,
+ 'public_member' => 4,
+ )),
+ 2 =>
+ cr::__set_state(array(
+ 'priv_member' => -15,
+ 'public_member' => -15,
+ )),
+);
+var_dump(array_udiff_assoc($a, $b, "comp_func_cr"));
+array(3) {
+ [u"0.1"]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(9)
+ [u"public_member"]=>
+ int(9)
+ }
+ [u"0.5"]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(12)
+ [u"public_member"]=>
+ int(12)
+ }
+ [0]=>
+ object(cr)#%d (2) {
+ [u"priv_member":u"cr":private]=>
+ int(23)
+ [u"public_member"]=>
+ int(23)
+ }
+}
--
2.40.0