Skip to content

Commit 64ba080

Browse files
SakiTakamachiSakiTakamachi
committed
Optimized pdo_mysql tests
1 parent 53218b1 commit 64ba080

File tree

154 files changed

+617
-737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+617
-737
lines changed

‎ext/pdo_mysql/tests/bug41125.phpt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ Bug #41125 (PDO mysql + quote() + prepare() can result in seg fault)
44
pdo_mysql
55
--SKIPIF--
66
<?php
7-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
88
MySQLPDOTest::skip();
9-
109
?>
1110
--FILE--
1211
<?php
1312

14-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
15-
16-
$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
13+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
14+
$db = MySQLPDOTest::factory();
1715

1816
$search = "o'";
1917
$sql = "SELECT 1 FROM DUAL WHERE 'o''riley' LIKE " . $db->quote('%' . $search . '%');

‎ext/pdo_mysql/tests/bug44327.phpt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ Bug #44327 (PDORow::queryString property & numeric offsets / Crash)
44
pdo_mysql
55
--SKIPIF--
66
<?php
7-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
88
MySQLPDOTest::skip();
9-
$db = MySQLPDOTest::factory();
109
?>
1110
--FILE--
1211
<?php
13-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
12+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
1413
$db = MySQLPDOTest::factory();
1514
$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
1615

@@ -41,6 +40,11 @@ $db = MySQLPDOTest::factory();
4140
$row = $stmt->fetch();
4241
var_dump($row->queryString);
4342

43+
?>
44+
--CLEAN--
45+
<?php
46+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
47+
MySQLPDOTest::dropTestTable();
4448
?>
4549
--EXPECTF--
4650
object(PDORow)#%d (2) {

‎ext/pdo_mysql/tests/bug46292.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ Bug #46292 (PDO::setFetchMode() shouldn't requires the 2nd arg when using FETCH_
44
pdo_mysql
55
--SKIPIF--
66
<?php
7-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
88
MySQLPDOTest::skip();
99
?>
1010
--FILE--
1111
<?php
1212

13-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
13+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
1414
$pdoDb = MySQLPDOTest::factory();
1515

1616

@@ -44,7 +44,7 @@ MySQLPDOTest::skip();
4444
?>
4545
--CLEAN--
4646
<?php
47-
require __DIR__ . '/mysql_pdo_test.inc';
47+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
4848
$db = MySQLPDOTest::factory();
4949
$db->exec('DROP TABLE IF EXISTS testz');
5050
?>

‎ext/pdo_mysql/tests/bug53551.phpt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ Bug #44327 (PDORow::queryString property & numeric offsets / Crash)
44
pdo_mysql
55
--SKIPIF--
66
<?php
7-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
88
MySQLPDOTest::skip();
9-
$db = MySQLPDOTest::factory();
109
?>
1110
--FILE--
1211
<?php
13-
include __DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc';
12+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
1413
$db = MySQLPDOTest::factory();
1514

1615
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, 0);
@@ -43,7 +42,7 @@ echo "\ndone\n";
4342
?>
4443
--CLEAN--
4544
<?php
46-
include __DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc';
45+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
4746
$db = MySQLPDOTest::factory();
4847
$db->exec('DROP TABLE IF EXISTS bug53551');
4948
?>

‎ext/pdo_mysql/tests/bug53782.phpt‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
--TEST--
22
PDO MySQL Bug #53782 (foreach throws irrelevant exception)
33
--EXTENSIONS--
4-
pdo
54
pdo_mysql
65
--SKIPIF--
76
<?php
8-
require __DIR__ . '/config.inc';
9-
require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
10-
PDOTest::skip();
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
8+
MySQLPDOTest::skip();
119
?>
1210
--FILE--
1311
<?php
14-
require __DIR__ . '/config.inc';
15-
require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
16-
$conn = PDOTest::test_factory(__DIR__ . '/common.phpt');
12+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
13+
$conn = MySQLPDOTest::factory();
1714

1815
$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
1916

@@ -31,11 +28,6 @@ foreach ($res as $k => $v) {
3128

3229
echo "DONE";
3330
?>
34-
--CLEAN--
35-
<?php
36-
require __DIR__ . '/mysql_pdo_test.inc';
37-
MySQLPDOTest::dropTestTable();
38-
?>
3931
--EXPECTF--
4032
Caught: SQLSTATE[42000]: %s
4133
Value: 0

‎ext/pdo_mysql/tests/bug54929.phpt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ Bug #54929 (Parse error with single quote in sql comment (pdo-mysql))
44
pdo_mysql
55
--SKIPIF--
66
<?php
7-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
88
MySQLPDOTest::skip();
9-
109
?>
1110
--FILE--
1211
<?php
1312

14-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
15-
16-
$pdodb = PDOTest::test_factory(__DIR__ . '/common.phpt');
13+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
14+
$pdodb = MySQLPDOTest::factory();
1715

1816

1917
function testQuery($query) {

‎ext/pdo_mysql/tests/bug63176.phpt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ Bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db
44
pdo_mysql
55
--SKIPIF--
66
<?php
7-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
88
MySQLPDOTest::skip();
99
?>
1010
--FILE--
1111
<?php
12-
require(__DIR__. DIRECTORY_SEPARATOR . 'config.inc');
12+
require_once(__DIR__. DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'init.inc');
1313
class PDO2 extends PDO {
1414
protected $transLevel;
1515
}
@@ -18,7 +18,6 @@ class PDO3 extends PDO {
1818
protected $tomato;
1919
}
2020

21-
2221
class ModelA {
2322
public $db;
2423
public function __construct($h) {

‎ext/pdo_mysql/tests/bug63185.phpt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
--TEST--
22
Bug #63185: nextRowset() ignores MySQL errors with native prepared statements
33
--EXTENSIONS--
4-
pdo
54
pdo_mysql
65
--SKIPIF--
76
<?php
8-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
98
MySQLPDOTest::skip();
109
?>
1110
--FILE--
1211
<?php
13-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
12+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
1413

1514
$pdo = MySQLPDOTest::factory();
1615
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -45,7 +44,7 @@ var_dump($st->fetchAll());
4544
?>
4645
--CLEAN--
4746
<?php
48-
require_once __DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc';
47+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
4948
$pdo = MySQLPDOTest::factory();
5049
$pdo->query('DROP PROCEDURE IF EXISTS test_procedure_error_at_second');
5150
?>

‎ext/pdo_mysql/tests/bug66141.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after fail
44
pdo_mysql
55
--SKIPIF--
66
<?php
7-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
88
MySQLPDOTest::skip();
99
?>
1010
--FILE--
1111
<?php
12-
include __DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc';
12+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
1313
$db = MySQLPDOTest::factory();
1414

1515
$input = 'Something\', 1 as one, 2 as two FROM dual; -- f';

‎ext/pdo_mysql/tests/bug66528.phpt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
--TEST--
22
Bug #66528: No PDOException or errorCode if database becomes unavailable before PDO::commit
33
--EXTENSIONS--
4-
pdo
54
pdo_mysql
65
--SKIPIF--
76
<?php
8-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
7+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
98
MySQLPDOTest::skip();
109
?>
1110
--FILE--
1211
<?php
13-
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
12+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
1413

1514
$dbh = MySQLPDOTest::factory();
1615
$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -43,7 +42,7 @@ try {
4342
?>
4443
--CLEAN--
4544
<?php
46-
require __DIR__ . '/mysql_pdo_test.inc';
45+
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
4746
MySQLPDOTest::dropTestTable();
4847
?>
4948
--EXPECT--

0 commit comments

Comments
 (0)