MFB: fix tests

diff --git a/ext/oci8/tests/coll_016.phpt b/ext/oci8/tests/coll_016.phpt
index 1a57a104efd5784fd0d4b872ded3af8db33efe13..45e52884152749c2f434b457f96af36ec5ffcdf4 100644 (file)
--- 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 e090ca19e28cc037ddd53d2f75b701b7a3adf801..8911d590fcac991ec22dbfca4b3616273e81000f 100644 (file)
--- 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 8b358b612afab3e1dfa2e9f19e59144c62c93580..25a3f09e92d363f78697e2f1d342556d40a40b66 100644 (file)
--- 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 988e5f7a12af8b443a21e6110f4016c1ecd56438..102f2fdc03829e412a40452ab1cf9825c8c8ca06 100644 (file)
--- 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 34af094291837f2ba5d78bb62271096127e335f4..e6f21d613d091832da99111496103938b5912521 100644 (file)
--- 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 (file)
Binary files a/ext/oci8/tests/lob_001.phpt and b/ext/oci8/tests/lob_001.phpt differ

diff --git a/ext/oci8/tests/lob_015.phpt b/ext/oci8/tests/lob_015.phpt
index d2b7f0ad432a235fc896808eb88e75e767bc1a9b..297d5b49718c06e7ad013e53bb1ee028a7dea31e 100644 (file)
--- 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