sixd                                     Tue, 16 Nov 2010 20:50:29 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=305415

Log:
Improve test cross- DB version portability

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/oci8/package.xml
    U   
php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home.phpt
    A   
php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt
    U   
php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old.phpt
    A   
php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old_11.phpt
    U   php/php-src/trunk/ext/oci8/package.xml
    U   php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home.phpt
    A   php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_11.phpt
    U   php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old.phpt
    A   php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old_11.phpt

Modified: php/php-src/branches/PHP_5_3/ext/oci8/package.xml
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/package.xml	2010-11-16 20:23:44 UTC (rev 305414)
+++ php/php-src/branches/PHP_5_3/ext/oci8/package.xml	2010-11-16 20:50:29 UTC (rev 305415)
@@ -183,6 +183,8 @@
     <file name="connect_scope_try5.phpt" role="test" />
     <file name="connect_scope_try6.phpt" role="test" />
     <file name="connect_with_charset_001.phpt" role="test" />
+    <file name="connect_without_oracle_home_11.phpt" role="test" />
+    <file name="connect_without_oracle_home_old_11.phpt" role="test" />
     <file name="connect_without_oracle_home_old.phpt" role="test" />
     <file name="connect_without_oracle_home.phpt" role="test" />
     <file name="create_table.inc" role="test" />

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home.phpt	2010-11-16 20:23:44 UTC (rev 305414)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home.phpt	2010-11-16 20:50:29 UTC (rev 305415)
@@ -10,6 +10,10 @@
 if ($ov !== 1) {
 	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
 }
+$iv = preg_match('/Oracle .*Version => (10\.2)/', $phpinfo);
+if ($iv != 1) {
+    die ("skip tests a feature that works only with Oracle 10gR2");
+}
 ?>
 --ENV--
 ORACLE_HOME=""

Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt	2010-11-16 20:50:29 UTC (rev 305415)
@@ -0,0 +1,41 @@
+--TEST--
+oci_connect() without ORACLE_HOME set (OCIServerAttach() segfaults)
+--SKIPIF--
+<?php
+if (!extension_loaded('oci8')) die("skip no oci8 extension");
+ob_start();
+phpinfo(INFO_MODULES);
+$phpinfo = ob_get_clean();
+$ov = preg_match('/Compile-time ORACLE_HOME/', $phpinfo);
+if ($ov != 1) {
+	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
+}
+$iv = preg_match('/Oracle .*Version => (11\.2|12)/', $phpinfo);
+if ($iv != 1) {
+        die ("skip tests a feature that works only with Oracle 11gR2 or greater version of client");
+}
+?>
+--ENV--
+ORACLE_HOME=""
+--FILE--
+<?php
+
+require dirname(__FILE__)."/details.inc";
+
+if (!empty($dbase)) {
+	var_dump(oci_connect($user, $password, $dbase));
+}
+else {
+	var_dump(oci_connect($user, $password));
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d
+
+Warning: oci_connect(): Error while trying to retrieve text for error ORA-01804
+ in %s on line %d
+bool(false)
+===DONE===


Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_11.phpt
___________________________________________________________________
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old.phpt	2010-11-16 20:23:44 UTC (rev 305414)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old.phpt	2010-11-16 20:50:29 UTC (rev 305415)
@@ -10,6 +10,10 @@
 if ($ov !== 1) {
 	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
 }
+$iv = preg_match('/Oracle .*Version => (10\.2)/', $phpinfo);
+if ($iv != 1) {
+    die ("skip tests a feature that works only with Oracle 10gR2");
+}
 ?>
 --ENV--
 ORACLE_HOME=""

Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old_11.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old_11.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old_11.phpt	2010-11-16 20:50:29 UTC (rev 305415)
@@ -0,0 +1,41 @@
+--TEST--
+ocilogon() without ORACLE_HOME set (OCIServerAttach() segfaults)
+--SKIPIF--
+<?php
+if (!extension_loaded('oci8')) die("skip no oci8 extension");
+ob_start();
+phpinfo(INFO_MODULES);
+$phpinfo = ob_get_clean();
+$ov = preg_match('/Compile-time ORACLE_HOME/', $phpinfo);
+if ($ov !== 1) {
+	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
+}
+$iv = preg_match('/Oracle .*Version => (11\.2|12)/', $phpinfo);
+if ($iv != 1) {
+    die ("skip tests a feature that works only with Oracle 11gR2 or greater version of client");
+}
+?>
+--ENV--
+ORACLE_HOME=""
+--FILE--
+<?php
+
+require dirname(__FILE__)."/details.inc";
+
+if (!empty($dbase)) {
+	var_dump(ocilogon($user, $password, $dbase));
+}
+else {
+	var_dump(ocilogon($user, $password));
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Warning: ocilogon(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d
+
+Warning: ocilogon(): Error while trying to retrieve text for error ORA-01804
+ in %sconnect_without_oracle_home_old_11.php on line %d
+bool(false)
+===DONE===


Property changes on: php/php-src/branches/PHP_5_3/ext/oci8/tests/connect_without_oracle_home_old_11.phpt
___________________________________________________________________
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/trunk/ext/oci8/package.xml
===================================================================
--- php/php-src/trunk/ext/oci8/package.xml	2010-11-16 20:23:44 UTC (rev 305414)
+++ php/php-src/trunk/ext/oci8/package.xml	2010-11-16 20:50:29 UTC (rev 305415)
@@ -183,6 +183,8 @@
     <file name="connect_scope_try5.phpt" role="test" />
     <file name="connect_scope_try6.phpt" role="test" />
     <file name="connect_with_charset_001.phpt" role="test" />
+    <file name="connect_without_oracle_home_11.phpt" role="test" />
+    <file name="connect_without_oracle_home_old_11.phpt" role="test" />
     <file name="connect_without_oracle_home_old.phpt" role="test" />
     <file name="connect_without_oracle_home.phpt" role="test" />
     <file name="create_table.inc" role="test" />

Modified: php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home.phpt	2010-11-16 20:23:44 UTC (rev 305414)
+++ php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home.phpt	2010-11-16 20:50:29 UTC (rev 305415)
@@ -10,6 +10,10 @@
 if ($ov !== 1) {
 	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
 }
+$iv = preg_match('/Oracle .*Version => (10\.2)/', $phpinfo);
+if ($iv != 1) {
+    die ("skip tests a feature that works only with Oracle 10gR2");
+}
 ?>
 --ENV--
 ORACLE_HOME=""

Added: php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_11.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_11.phpt	                        (rev 0)
+++ php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_11.phpt	2010-11-16 20:50:29 UTC (rev 305415)
@@ -0,0 +1,41 @@
+--TEST--
+oci_connect() without ORACLE_HOME set (OCIServerAttach() segfaults)
+--SKIPIF--
+<?php
+if (!extension_loaded('oci8')) die("skip no oci8 extension");
+ob_start();
+phpinfo(INFO_MODULES);
+$phpinfo = ob_get_clean();
+$ov = preg_match('/Compile-time ORACLE_HOME/', $phpinfo);
+if ($ov != 1) {
+	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
+}
+$iv = preg_match('/Oracle .*Version => (11\.2|12)/', $phpinfo);
+if ($iv != 1) {
+        die ("skip tests a feature that works only with Oracle 11gR2 or greater version of client");
+}
+?>
+--ENV--
+ORACLE_HOME=""
+--FILE--
+<?php
+
+require dirname(__FILE__)."/details.inc";
+
+if (!empty($dbase)) {
+	var_dump(oci_connect($user, $password, $dbase));
+}
+else {
+	var_dump(oci_connect($user, $password));
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d
+
+Warning: oci_connect(): Error while trying to retrieve text for error ORA-01804
+ in %s on line %d
+bool(false)
+===DONE===


Property changes on: php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_11.phpt
___________________________________________________________________
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native

Modified: php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old.phpt	2010-11-16 20:23:44 UTC (rev 305414)
+++ php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old.phpt	2010-11-16 20:50:29 UTC (rev 305415)
@@ -10,6 +10,10 @@
 if ($ov !== 1) {
 	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
 }
+$iv = preg_match('/Oracle .*Version => (10\.2)/', $phpinfo);
+if ($iv != 1) {
+    die ("skip tests a feature that works only with Oracle 10gR2");
+}
 ?>
 --ENV--
 ORACLE_HOME=""

Added: php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old_11.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old_11.phpt	                        (rev 0)
+++ php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old_11.phpt	2010-11-16 20:50:29 UTC (rev 305415)
@@ -0,0 +1,41 @@
+--TEST--
+ocilogon() without ORACLE_HOME set (OCIServerAttach() segfaults)
+--SKIPIF--
+<?php
+if (!extension_loaded('oci8')) die("skip no oci8 extension");
+ob_start();
+phpinfo(INFO_MODULES);
+$phpinfo = ob_get_clean();
+$ov = preg_match('/Compile-time ORACLE_HOME/', $phpinfo);
+if ($ov !== 1) {
+	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
+}
+$iv = preg_match('/Oracle .*Version => (11\.2|12)/', $phpinfo);
+if ($iv != 1) {
+    die ("skip tests a feature that works only with Oracle 11gR2 or greater version of client");
+}
+?>
+--ENV--
+ORACLE_HOME=""
+--FILE--
+<?php
+
+require dirname(__FILE__)."/details.inc";
+
+if (!empty($dbase)) {
+	var_dump(ocilogon($user, $password, $dbase));
+}
+else {
+	var_dump(ocilogon($user, $password));
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Warning: ocilogon(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d
+
+Warning: ocilogon(): Error while trying to retrieve text for error ORA-01804
+ in %sconnect_without_oracle_home_old_11.php on line %d
+bool(false)
+===DONE===


Property changes on: php/php-src/trunk/ext/oci8/tests/connect_without_oracle_home_old_11.phpt
___________________________________________________________________
Added: svn:keywords
   + Id Rev Revision
Added: svn:eol-style
   + native
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to