tony2001 Tue May 30 22:37:08 2006 UTC
Modified files:
/php-src/ext/oci8/tests coll_016_func.phpt coll_016.phpt
error1.phpt field_funcs_old.phpt
field_funcs.phpt lob_001.phpt lob_015.phpt
Log:
MFB: fix tests
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/coll_016_func.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/oci8/tests/coll_016_func.phpt
diff -u php-src/ext/oci8/tests/coll_016_func.phpt:1.3
php-src/ext/oci8/tests/coll_016_func.phpt:1.4
--- php-src/ext/oci8/tests/coll_016_func.phpt:1.3 Tue Dec 6 19:26:57 2005
+++ php-src/ext/oci8/tests/coll_016_func.phpt Tue May 30 22:37:08 2006
@@ -37,7 +37,7 @@
--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
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/coll_016.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/oci8/tests/coll_016.phpt
diff -u php-src/ext/oci8/tests/coll_016.phpt:1.3
php-src/ext/oci8/tests/coll_016.phpt:1.4
--- php-src/ext/oci8/tests/coll_016.phpt:1.3 Tue Dec 6 19:26:57 2005
+++ php-src/ext/oci8/tests/coll_016.phpt Tue May 30 22:37:08 2006
@@ -37,7 +37,7 @@
--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
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/error1.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/oci8/tests/error1.phpt
diff -u php-src/ext/oci8/tests/error1.phpt:1.4
php-src/ext/oci8/tests/error1.phpt:1.5
--- php-src/ext/oci8/tests/error1.phpt:1.4 Tue Mar 28 09:13:35 2006
+++ php-src/ext/oci8/tests/error1.phpt Tue May 30 22:37:08 2006
@@ -12,13 +12,13 @@
?>
--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"]=>
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/field_funcs_old.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/oci8/tests/field_funcs_old.phpt
diff -u php-src/ext/oci8/tests/field_funcs_old.phpt:1.4
php-src/ext/oci8/tests/field_funcs_old.phpt:1.5
--- php-src/ext/oci8/tests/field_funcs_old.phpt:1.4 Tue Mar 28 09:13:35 2006
+++ php-src/ext/oci8/tests/field_funcs_old.phpt Tue May 30 22:37:08 2006
@@ -54,7 +54,7 @@
echo "Done\n";
?>
---EXPECT--
+--EXPECTF--
array(5) {
[0]=>
string(1) "1"
@@ -71,14 +71,14 @@
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)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/field_funcs.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/oci8/tests/field_funcs.phpt
diff -u php-src/ext/oci8/tests/field_funcs.phpt:1.5
php-src/ext/oci8/tests/field_funcs.phpt:1.6
--- php-src/ext/oci8/tests/field_funcs.phpt:1.5 Thu May 18 13:20:00 2006
+++ php-src/ext/oci8/tests/field_funcs.phpt Tue May 30 22:37:08 2006
@@ -54,7 +54,7 @@
echo "Done\n";
?>
---EXPECT--
+--EXPECTF--
array(5) {
[0]=>
string(1) "1"
@@ -71,14 +71,14 @@
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)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/lob_001.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/oci8/tests/lob_001.phpt
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/lob_015.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/oci8/tests/lob_015.phpt
diff -u php-src/ext/oci8/tests/lob_015.phpt:1.3
php-src/ext/oci8/tests/lob_015.phpt:1.4
--- php-src/ext/oci8/tests/lob_015.phpt:1.3 Tue Dec 6 19:26:57 2005
+++ php-src/ext/oci8/tests/lob_015.phpt Tue May 30 22:37:08 2006
@@ -18,10 +18,11 @@
$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 @@
?>
--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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
