From: Antony Dovgal <tony2001@php.net>
Date: Tue, 30 May 2006 22:27:32 +0000 (+0000)
Subject: fix tests
X-Git-Tag: php-5.2.0RC1~411
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1272d8972d197fa4d85632f41b520b223b86dd2;p=php

fix tests
---

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/lob_001.phpt b/ext/oci8/tests/lob_001.phpt
index 029888469d..cbcb92e7ec 100644
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 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