Optimized pdo_mysql tests

Author: SakiTakamachi

ext/pdo_mysql/tests/bug41125.phpt

@@ -4,16 +4,14 @@ Bug #41125 (PDO mysql + quote() + prepare() can result in seg fault)
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
-
 ?>
 --FILE--
 <?php
 
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
-
-$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+$db = MySQLPDOTest::factory();
 
 $search = "o'";
 $sql = "SELECT 1 FROM DUAL WHERE 'o''riley' LIKE " . $db->quote('%' . $search . '%');
@@ -86,7 +84,7 @@ foreach ($queries as $k => $query) {
 ?>
 --EXPECTF--
 1
-00000 -  - 
+00000 -  -
 -------------------------------------------------------
 
 Warning: PDOStatement::execute(): SQLSTATE[HY093]: Invalid parameter number: number of bound variables does not match number of tokens in %s on line %d

ext/pdo_mysql/tests/bug44327.phpt

@@ -4,13 +4,12 @@ Bug #44327 (PDORow::queryString property & numeric offsets / Crash)
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
-$db = MySQLPDOTest::factory();
 ?>
 --FILE--
 <?php
-    require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+    require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
     $db = MySQLPDOTest::factory();
     $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
 
@@ -41,6 +40,11 @@ $db = MySQLPDOTest::factory();
     $row = $stmt->fetch();
     var_dump($row->queryString);
 
+?>
+--CLEAN--
+<?php
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::dropTestTable();
 ?>
 --EXPECTF--
 object(PDORow)#%d (2) {

ext/pdo_mysql/tests/bug46292.phpt

@@ -4,13 +4,13 @@ Bug #46292 (PDO::setFetchMode() shouldn't requires the 2nd arg when using FETCH_
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
 --FILE--
 <?php
 
-    require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+    require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
     $pdoDb = MySQLPDOTest::factory();
 
 
@@ -27,13 +27,13 @@ MySQLPDOTest::skip();
     $pdoDb->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
     $pdoDb->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
 
-    $pdoDb->query('DROP TABLE IF EXISTS testz');
+    $pdoDb->query('DROP TABLE IF EXISTS test');
 
-    $pdoDb->query('CREATE TABLE testz (name VARCHAR(20) NOT NULL, value INT)');
+    $pdoDb->query('CREATE TABLE test (name VARCHAR(20) NOT NULL, value INT)');
 
-    $pdoDb->query("INSERT INTO testz VALUES ('myclass', 1), ('myclass2', 2), ('myclass', NULL), ('myclass3', NULL)");
+    $pdoDb->query("INSERT INTO test VALUES ('myclass', 1), ('myclass2', 2), ('myclass', NULL), ('myclass3', NULL)");
 
-    $stmt = $pdoDb->prepare("SELECT * FROM testz");
+    $stmt = $pdoDb->prepare("SELECT * FROM test");
 
     var_dump($stmt->setFetchMode(PDO::FETCH_CLASS | PDO::FETCH_CLASSTYPE | PDO::FETCH_GROUP));
     $stmt->execute();
@@ -44,9 +44,8 @@ MySQLPDOTest::skip();
 ?>
 --CLEAN--
 <?php
-require __DIR__ . '/mysql_pdo_test.inc';
-$db = MySQLPDOTest::factory();
-$db->exec('DROP TABLE IF EXISTS testz');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::dropTestTable();
 ?>
 --EXPECTF--
 bool(true)

ext/pdo_mysql/tests/bug53551.phpt

@@ -4,26 +4,25 @@ Bug #44327 (PDORow::queryString property & numeric offsets / Crash)
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
-$db = MySQLPDOTest::factory();
 ?>
 --FILE--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc';
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 $db = MySQLPDOTest::factory();
 
 $db->setAttribute(PDO::ATTR_EMULATE_PREPARES, 0);
 
-$createSql = "CREATE TABLE `bug53551` (
+$createSql = "CREATE TABLE `test` (
   `count` bigint(20) unsigned NOT NULL DEFAULT '0'
 )";
 
-$db->exec('drop table if exists bug53551');
+$db->exec('drop table if exists test');
 $db->exec($createSql);
-$db->exec("insert into bug53551 set `count` = 1 ");
+$db->exec("insert into test set `count` = 1 ");
 $db->exec("SET sql_mode = 'Traditional'");
-$sql = 'UPDATE bug53551 SET `count` = :count';
+$sql = 'UPDATE test SET `count` = :count';
 $stmt = $db->prepare($sql);
 
 $values = array (
@@ -43,9 +42,8 @@ echo "\ndone\n";
 ?>
 --CLEAN--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc';
-$db = MySQLPDOTest::factory();
-$db->exec('DROP TABLE IF EXISTS bug53551');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::dropTestTable();
 ?>
 --EXPECTF--
 1

ext/pdo_mysql/tests/bug53782.phpt

@@ -1,19 +1,16 @@
 --TEST--
 PDO MySQL Bug #53782 (foreach throws irrelevant exception)
 --EXTENSIONS--
-pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require __DIR__ . '/config.inc';
-require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
-PDOTest::skip();
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
 ?>
 --FILE--
 <?php
-require __DIR__ . '/config.inc';
-require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
-$conn = PDOTest::test_factory(__DIR__ . '/common.phpt');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+$db = MySQLPDOTest::factory();
 
 $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
@@ -31,11 +28,6 @@ foreach ($res as $k => $v) {
 
 echo "DONE";
 ?>
---CLEAN--
-<?php
-require __DIR__ . '/mysql_pdo_test.inc';
-MySQLPDOTest::dropTestTable();
-?>
 --EXPECTF--
 Caught: SQLSTATE[42000]: %s
 Value: 0

ext/pdo_mysql/tests/bug54929.phpt

@@ -4,16 +4,14 @@ Bug #54929 (Parse error with single quote in sql comment (pdo-mysql))
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
-
 ?>
 --FILE--
 <?php
 
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
-
-$pdodb = PDOTest::test_factory(__DIR__ . '/common.phpt');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+$pdodb = MySQLPDOTest::factory();
 
 
 function testQuery($query) {

ext/pdo_mysql/tests/bug63176.phpt

@@ -4,12 +4,12 @@ Bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
 --FILE--
 <?php
-require(__DIR__. DIRECTORY_SEPARATOR . 'config.inc');
+require_once(__DIR__. DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'init.inc');
 class PDO2 extends PDO {
     protected $transLevel;
 }
@@ -18,7 +18,6 @@ class PDO3 extends PDO {
     protected $tomato;
 }
 
-
 class ModelA {
     public $db;
     public function __construct($h) {

ext/pdo_mysql/tests/bug63185.phpt

@@ -1,16 +1,15 @@
 --TEST--
 Bug #63185: nextRowset() ignores MySQL errors with native prepared statements
 --EXTENSIONS--
-pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
 --FILE--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 
 $pdo = MySQLPDOTest::factory();
 $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -45,7 +44,7 @@ var_dump($st->fetchAll());
 ?>
 --CLEAN--
 <?php
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc';
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 $pdo = MySQLPDOTest::factory();
 $pdo->query('DROP PROCEDURE IF EXISTS test_procedure_error_at_second');
 ?>

ext/pdo_mysql/tests/bug66141.phpt

@@ -4,12 +4,12 @@ Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after fail
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
 --FILE--
 <?php
-include __DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc';
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 $db = MySQLPDOTest::factory();
 
 $input = 'Something\', 1 as one, 2 as two  FROM dual; -- f';

ext/pdo_mysql/tests/bug66528.phpt

@@ -1,16 +1,15 @@
 --TEST--
 Bug #66528: No PDOException or errorCode if database becomes unavailable before PDO::commit
 --EXTENSIONS--
-pdo
 pdo_mysql
 --SKIPIF--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 ?>
 --FILE--
 <?php
-require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 
 $dbh = MySQLPDOTest::factory();
 $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -43,7 +42,7 @@ try {
 ?>
 --CLEAN--
 <?php
-require __DIR__ . '/mysql_pdo_test.inc';
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::dropTestTable();
 ?>
 --EXPECT--