PHP mysqlnd svn commit: r1109 - trunk/tests/ext/pdo_mysql

[uwendel]

Author: uwendel
Date: 2007-10-17 16:18:15 +0200 (Wed, 17 Oct 2007)
New Revision: 1109

Modified:
   trunk/tests/ext/pdo_mysql/pdo_mysql___construct.phpt
   trunk/tests/ext/pdo_mysql/pdo_mysql___construct_options.phpt
   trunk/tests/ext/pdo_mysql/pdo_mysql___construct_uri.phpt
   trunk/tests/ext/pdo_mysql/skipif.inc
Log:
General cleanup, skipping tests for PHP < 5.1.
PDO API changed in PHP 5.1, e.g. from global constants
to class constants.


Modified: trunk/tests/ext/pdo_mysql/pdo_mysql___construct.phpt
===================================================================
--- trunk/tests/ext/pdo_mysql/pdo_mysql___construct.phpt	2007-10-17 14:16:45 UTC (rev
1108)
+++ trunk/tests/ext/pdo_mysql/pdo_mysql___construct.phpt	2007-10-17 14:18:15 UTC (rev
1109)
@@ -1,12 +1,8 @@
 --TEST--
-MySQL PDO->__construct()
+MySQL PDO->__construct() - Generic + DSN
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-require_once('mysql_pdo_test.inc');
-$db = MySQLPDOTest::getDriver();
-if (false == MySQLPDOTest::detect_transactional_mysql_engine($db))
-	die("skip Transactional engine not found");
 ?>
 --FILE--
 <?php

Modified: trunk/tests/ext/pdo_mysql/pdo_mysql___construct_options.phpt
===================================================================
--- trunk/tests/ext/pdo_mysql/pdo_mysql___construct_options.phpt	2007-10-17 14:16:45 UTC
(rev 1108)
+++ trunk/tests/ext/pdo_mysql/pdo_mysql___construct_options.phpt	2007-10-17 14:18:15 UTC
(rev 1109)
@@ -3,10 +3,6 @@
 --SKIPIF--
 <?php
 require_once('skipif.inc');
-require_once('mysql_pdo_test.inc');
-$db = MySQLPDOTest::getDriver();
-if (false == MySQLPDOTest::detect_transactional_mysql_engine($db))
-	die("skip Transactional engine not found");
 ?>
 --FILE--
 <?php
@@ -51,7 +47,13 @@
 		$user = PDO_MYSQL_TEST_USER;
 		$pass = PDO_MYSQL_TEST_PASS;
 
+		$valid_options = array(
+			/* Odd, right? */
+			PDO::ATTR_TIMEOUT 		=> true,
 
+		);
+
+
 	} catch (PDOException $e) {
 		printf("[001] %s, [%s] %s\n",
 			$e->getMessage(),

Modified: trunk/tests/ext/pdo_mysql/pdo_mysql___construct_uri.phpt
===================================================================
--- trunk/tests/ext/pdo_mysql/pdo_mysql___construct_uri.phpt	2007-10-17 14:16:45 UTC (rev
1108)
+++ trunk/tests/ext/pdo_mysql/pdo_mysql___construct_uri.phpt	2007-10-17 14:18:15 UTC (rev
1109)
@@ -1,5 +1,5 @@
 --TEST--
-MySQL PDO->__construct() - uri
+MySQL PDO->__construct() - URI
 --SKIPIF--
 <?php
 require_once('skipif.inc');
@@ -87,6 +87,8 @@
 
 		}
 
+		/* TODO: safe mode */
+
 	} catch (PDOException $e) {
 		printf("[001] %s, [%s] %s\n",
 			$e->getMessage(),

Modified: trunk/tests/ext/pdo_mysql/skipif.inc
===================================================================
--- trunk/tests/ext/pdo_mysql/skipif.inc	2007-10-17 14:16:45 UTC (rev 1108)
+++ trunk/tests/ext/pdo_mysql/skipif.inc	2007-10-17 14:18:15 UTC (rev 1109)
@@ -1,4 +1,7 @@
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql'))
 	die('skip PDO_MySQL driver not loaded');
+
+if (version_compare(PHP_VERSION, '5.1.0') < 0)
+	die('skip Most tests assume PHP 5.1+');
 ?>
\ No newline at end of file