From 86f475fd40c8da14282ff8d1c7860a60522adee0 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 30 May 2006 22:37:08 +0000 Subject: [PATCH] MFB: fix tests --- ext/oci8/tests/coll_016.phpt | 2 +- ext/oci8/tests/coll_016_func.phpt | 2 +- ext/oci8/tests/error1.phpt | 4 ++-- ext/oci8/tests/field_funcs.phpt | 6 +++--- ext/oci8/tests/field_funcs_old.phpt | 6 +++--- ext/oci8/tests/lob_001.phpt | Bin 1256 -> 1305 bytes ext/oci8/tests/lob_015.phpt | 24 +++++++++++++----------- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/ext/oci8/tests/coll_016.phpt b/ext/oci8/tests/coll_016.phpt index 1a57a104ef..45e5288415 100644 --- a/ext/oci8/tests/coll_016.phpt +++ b/ext/oci8/tests/coll_016.phpt @@ -37,7 +37,7 @@ require dirname(__FILE__)."/drop_type.inc"; --EXPECTF-- bool(true) -Warning: OCI-Collection::assignelem(): OCI-22165: given index [4294967295] must be in the range of 0 to [0] in %s on line %d +Warning: OCI-Collection::assignelem(): OCI-22165: given index [%d] must be in the range of 0 to [0] in %s on line %d bool(false) Warning: OCI-Collection::assignelem(): OCI-22165: given index [5000] must be in the range of 0 to [0] in %s on line %d diff --git a/ext/oci8/tests/coll_016_func.phpt b/ext/oci8/tests/coll_016_func.phpt index e090ca19e2..8911d590fc 100644 --- a/ext/oci8/tests/coll_016_func.phpt +++ b/ext/oci8/tests/coll_016_func.phpt @@ -37,7 +37,7 @@ require dirname(__FILE__)."/drop_type.inc"; --EXPECTF-- bool(true) -Warning: oci_collection_element_assign(): OCI-22165: given index [4294967295] must be in the range of 0 to [0] in %s on line %d +Warning: oci_collection_element_assign(): OCI-22165: given index [%d] must be in the range of 0 to [0] in %s on line %d bool(false) Warning: oci_collection_element_assign(): OCI-22165: given index [5000] must be in the range of 0 to [0] in %s on line %d diff --git a/ext/oci8/tests/error1.phpt b/ext/oci8/tests/error1.phpt index 8b358b612a..25a3f09e92 100644 --- a/ext/oci8/tests/error1.phpt +++ b/ext/oci8/tests/error1.phpt @@ -12,13 +12,13 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: oci_connect(): ORA-12154: TNS:could not resolve service name in %s on line %d +Warning: oci_connect(): ORA-12154: TNS:could not resolve %s in %s on line %d bool(false) array(4) { ["code"]=> int(12154) ["message"]=> - string(45) "ORA-12154: TNS:could not resolve service name" + string(%d) "ORA-12154: TNS:could not resolve %s" ["offset"]=> int(0) ["sqltext"]=> diff --git a/ext/oci8/tests/field_funcs.phpt b/ext/oci8/tests/field_funcs.phpt index 988e5f7a12..102f2fdc03 100644 --- a/ext/oci8/tests/field_funcs.phpt +++ b/ext/oci8/tests/field_funcs.phpt @@ -54,7 +54,7 @@ require dirname(__FILE__).'/drop_table.inc'; echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- array(5) { [0]=> string(1) "1" @@ -71,14 +71,14 @@ bool(false) string(2) "ID" string(6) "NUMBER" int(2) -int(0) +int(%d) int(0) int(22) bool(false) string(5) "VALUE" string(6) "NUMBER" int(2) -int(0) +int(%d) int(0) int(22) bool(true) diff --git a/ext/oci8/tests/field_funcs_old.phpt b/ext/oci8/tests/field_funcs_old.phpt index 34af094291..e6f21d613d 100644 --- a/ext/oci8/tests/field_funcs_old.phpt +++ b/ext/oci8/tests/field_funcs_old.phpt @@ -54,7 +54,7 @@ require dirname(__FILE__).'/drop_table.inc'; echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- array(5) { [0]=> string(1) "1" @@ -71,14 +71,14 @@ bool(false) string(2) "ID" string(6) "NUMBER" int(2) -int(0) +int(%d) int(0) int(22) bool(false) string(5) "VALUE" string(6) "NUMBER" int(2) -int(0) +int(%d) int(0) int(22) bool(true) diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt index 029888469d8a497b51bfdecb73517fa01cff6eca..cbcb92e7ec76c4fc2245fd899ebf70c125d0d472 100644 GIT binary patch delta 27 jcmaFCIg@L{1{Ox6$s1V=I29D4m7IM1os=f;WYGrzd@Tqn delta 21 ccmbQq^@4N51{Oxc$s1V=*lW35^7B%;08$?Y!2kdN diff --git a/ext/oci8/tests/lob_015.phpt b/ext/oci8/tests/lob_015.phpt index d2b7f0ad43..297d5b4971 100644 --- a/ext/oci8/tests/lob_015.phpt +++ b/ext/oci8/tests/lob_015.phpt @@ -18,10 +18,11 @@ $ora_sql = "INSERT INTO $statement = oci_parse($c,$ora_sql); $blob = oci_new_descriptor($c,OCI_D_LOB,1,2,3); $blob = oci_new_descriptor($c); +$int = 1; oci_bind_by_name($statement,":v_blob", $blob,-1,OCI_B_BLOB,4); oci_bind_by_name($statement,":v_blob", $blob,-1,OCI_B_BLOB,4,5); -oci_bind_by_name($statement,":v_blob", $blob,-1); -oci_bind_by_name($statement,":v_blob", $blob); +oci_bind_by_name($statement,":v_blob", $int,-1); +oci_bind_by_name($statement,":v_blob", $int); oci_bind_by_name($statement,":v_blob"); oci_bind_by_name($statement); oci_execute($statement, OCI_DEFAULT); @@ -34,18 +35,19 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: oci_new_descriptor() expects at most 2 parameters, 5 given in %slob_015.php on line %d +Warning: oci_new_descriptor() expects at most 2 parameters, 5 given in %s on line %d -Warning: oci_bind_by_name() expects at most 5 parameters, 6 given in %slob_015.php on line %d +Warning: oci_bind_by_name() expects at most 5 parameters, 6 given in %s on line %d -Warning: oci_bind_by_name() expects at most 5 parameters, 7 given in %slob_015.php on line %d +Warning: oci_bind_by_name() expects at most 5 parameters, 7 given in %s on line %d -Notice: Object of class OCI-Lob to string conversion in %slob_015.php on line %d +Warning: oci_bind_by_name() expects at least 3 parameters, 2 given in %s on line %d -Warning: oci_bind_by_name() expects at least 3 parameters, 2 given in %slob_015.php on line %d +Warning: oci_bind_by_name() expects at least 3 parameters, 1 given in %s on line %d -Warning: oci_bind_by_name() expects at least 3 parameters, 1 given in %slob_015.php on line %d - -Warning: oci_execute(): ORA-00932: inconsistent datatypes: expected NUMBER got BLOB in %slob_015.php on line %d -string(6) "Object" +Warning: oci_execute(): ORA-00932: inconsistent datatypes: expected NUMBER got BLOB in %s on line %d +object(OCI-Lob)#%d (1) { + ["descriptor"]=> + resource(%d) of type (oci8 descriptor) +} Done -- 2.40.0