Commit:    1675fd22775c7067c5d21e0cc1a0cc81f9434a5c
Author:    Christopher Jones <s...@php.net>         Mon, 7 Oct 2013 17:26:00 
-0700
Parents:   12f9939b790a02ca3f22b91813029e78208f2c24
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=1675fd22775c7067c5d21e0cc1a0cc81f9434a5c

Log:
Add new tests

Changed paths:
  A  ext/oci8/tests/db_op_1.phpt
  A  ext/oci8/tests/db_op_2.phpt


Diff:
diff --git a/ext/oci8/tests/db_op_1.phpt b/ext/oci8/tests/db_op_1.phpt
new file mode 100644
index 0000000..f645cf8
--- /dev/null
+++ b/ext/oci8/tests/db_op_1.phpt
@@ -0,0 +1,61 @@
+--TEST--
+oci_set_db_operation: basic test for end-to-end tracing
+--SKIPIF--
+<?php 
+if (!extension_loaded('oci8')) die ("skip no oci8 extension"); 
+$target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on 
these DBs
+require(dirname(__FILE__).'/skipif.inc');
+if (strcasecmp($user, "system") && strcasecmp($user, "sys")) {
+    die("skip needs to be run as a DBA user");
+}
+preg_match('/.*Release 
([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/',
 oci_server_version($c), $matches);
+if (!(isset($matches[0]) && $matches[1] >= 12)) {
+    die("skip expected output only valid when using Oracle Database 12c or 
greater");
+}
+preg_match('/^[[:digit:]]+/', oci_client_version(), $matches);
+if (!(isset($matches[0]) && $matches[0] >= 12)) { 
+    die("skip works only with Oracle 12c or greater version of Oracle client 
libraries");
+}
+if (!function_exists('oci_set_db_operation'))
+{ 
+    die("skip function oci_set_db_operation() does not exist");
+}
+?>
+--FILE--
+<?php
+
+require(dirname(__FILE__).'/connect.inc');
+
+// Run Test
+
+echo "Test 1\n";
+
+// Test setting the "DB operation" used by Oracle DB for end-to-end 
application tracing
+
+function dq($c, $q)
+{
+    $s = oci_parse($c, $q);
+    oci_execute($s);
+    var_dump(oci_fetch_assoc($s));
+}
+
+oci_set_db_operation($c, "db_op_1");
+dq($c, 'select * from dual');
+
+dq($c, 'select dbop_name from v$sql_monitor where dbop_name is not null order 
by dbop_exec_id desc');
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Test 1
+array(1) {
+  ["DUMMY"]=>
+  string(1) "X"
+}
+array(1) {
+  ["DBOP_NAME"]=>
+  string(7) "db_op_1"
+}
+===DONE===
+    
diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt
new file mode 100644
index 0000000..05c2269
--- /dev/null
+++ b/ext/oci8/tests/db_op_2.phpt
@@ -0,0 +1,69 @@
+--TEST--
+oci_set_db_operation: basic test for end-to-end tracing
+--SKIPIF--
+<?php 
+if (!extension_loaded('oci8')) die ("skip no oci8 extension"); 
+$target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on 
these DBs
+require(dirname(__FILE__).'/skipif.inc');
+if (strcasecmp($user, "system") && strcasecmp($user, "sys")) {
+    die("skip needs to be run as a DBA user");
+}
+preg_match('/.*Release 
([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/',
 oci_server_version($c), $matches);
+if (!(isset($matches[0]) && $matches[1] >= 12)) {
+    die("skip expected output only valid when using Oracle Database 12c or 
greater");
+}
+preg_match('/^[[:digit:]]+/', oci_client_version(), $matches);
+if (!(isset($matches[0]) && $matches[0] >= 12)) { 
+    die("skip works only with Oracle 12c or greater version of Oracle client 
libraries");
+}
+if (!function_exists('oci_set_db_operation'))
+{ 
+    die("skip function oci_set_db_operation() does not exist");
+}
+?>
+--FILE--
+<?php
+
+require(dirname(__FILE__).'/connect.inc');
+
+function dq($c, $q)
+{
+    $s = oci_parse($c, $q);
+    oci_execute($s);
+    var_dump(oci_fetch_assoc($s));
+}
+
+echo "Test 1\n";
+oci_set_db_operation($c, "db_op_2_a");
+dq($c, 'select * from dual');
+
+echo "Test 2\n";
+oci_set_db_operation($c, "db_op_2_b");
+dq($c, 'select * from dual');
+
+echo "Test 3\n";
+dq($c, 'select dbop_name from v$sql_monitor where dbop_name like \'db_op2%\' 
order by dbop_exec_id desc');
+
+?>
+===DONE===
+<?php exit(0); ?>
+--XFAIL--
+Fails due to Oracle Bug 16695981
+--EXPECTF--
+Test 1
+array(1) {
+  ["DUMMY"]=>
+  string(1) "X"
+}
+Test 2
+array(1) {
+  ["DUMMY"]=>
+  string(1) "X"
+}
+Test 3
+array(2) {
+  ["DBOP_NAME"]=>
+  string(7) "db_op_2a"
+}
+===DONE===
+


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to