Skip to content

Commit c1fec9b

Browse files
GirgiasGirgias
authored
PDO: Clean-up tests so it's easier to see if they use default test table (#12552)
1 parent 4c6dbe0 commit c1fec9b

File tree

17 files changed

+108
-91
lines changed

17 files changed

+108
-91
lines changed

‎ext/pdo/tests/bug_43139.phpt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ $db = PDOTest::factory();
1818
$db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
1919
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
2020

21-
$from = '';
22-
if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') {
23-
$from = 'from dual';
24-
} else if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'firebird') {
25-
$from = 'FROM RDB$DATABASE';
21+
switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
22+
case 'oci': $from = ' FROM DUAL'; break;
23+
case 'firebird': $from = ' FROM RDB$DATABASE'; break;
24+
default: $from = ''; break;
2625
}
2726

2827
var_dump($db->query("select 0 as abc, 1 as xyz, 2 as def $from")->fetchAll(PDO::FETCH_GROUP));

‎ext/pdo/tests/bug_43663.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PDOTest::skip();
1111
?>
1212
--FILE--
1313
<?php
14-
class test extends PDO{
14+
class TestClass extends PDO{
1515
function __call($name, array $args) {
1616
echo "Called $name in ".__CLASS__."\n";
1717
}
@@ -23,10 +23,10 @@ class test extends PDO{
2323
if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
2424
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
2525

26-
$a = PDOTest::factory(test::class);
26+
$a = PDOTest::factory(TestClass::class);
2727
$a->foo();
2828
$a->bar();
2929
?>
3030
--EXPECT--
31-
Called foo in test
32-
Called bar in test
31+
Called foo in TestClass
32+
Called bar in TestClass

‎ext/pdo/tests/bug_44861.phpt‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,19 @@ $db = PDOTest::factory();
2727

2828
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
2929

30-
if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'oci') {
31-
$from = 'FROM DUAL';
32-
$ob = '1';
33-
} else {
34-
$from = '';
35-
$ob = 'r';
30+
switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
31+
case 'oci':
32+
$from = 'FROM DUAL';
33+
$ob = '1';
34+
break;
35+
case 'firebird':
36+
$from = 'FROM RDB$DATABASE';
37+
$ob = 'r';
38+
break;
39+
default:
40+
$from = '';
41+
$ob = 'r';
42+
break;
3643
}
3744

3845
$query = "SELECT 'row1' AS r $from UNION SELECT 'row2' $from UNION SELECT 'row3' $from UNION SELECT 'row4' $from ORDER BY $ob";

‎ext/pdo/tests/bug_60665.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../
1515
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616
$db = PDOTest::factory();
1717
switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
18-
case 'oci': $from = 'from dual'; break;
19-
case 'firebird': $from = 'from rdb$database'; break;
18+
case 'oci': $from = ' FROM DUAL'; break;
19+
case 'firebird': $from = ' FROM RDB$DATABASE'; break;
2020
default: $from = ''; break;
2121
}
2222
$statement = $db->prepare("SELECT NULL AS null_value, 0 AS zero, 1 AS one $from");

‎ext/pdo/tests/bug_69356.phpt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@ SELECT '
2828
SQL;
2929

3030
switch ($db->getAttribute(PDO::ATTR_DRIVER_NAME)) {
31-
case 'oci':
32-
$query .= ' FROM DUAL';
33-
break;
34-
case 'firebird':
35-
$query .= ' FROM RDB$DATABASE';
36-
break;
31+
case 'oci': $from = ' FROM DUAL'; break;
32+
case 'firebird': $from = ' FROM RDB$DATABASE'; break;
33+
default: $from = ''; break;
3734
}
35+
$query .= $from;
3836

3937
$stmt = $db->query($query);
4038
var_dump($stmt->debugDumpParams());

‎ext/pdo/tests/bug_72788.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
1616

1717
putenv("PDOTEST_ATTR=" . serialize(array(PDO::ATTR_PERSISTENT => true)));
1818

19-
function test() {
19+
function callback() {
2020
$db = PDOTest::factory('PDO', false);
2121
$stmt = @$db->query("SELECT 1 FROM TABLE_DOES_NOT_EXIST");
2222
if ($stmt === false) {
2323
echo "Statement failed as expected\n";
2424
}
2525
}
2626

27-
test();
28-
test();
27+
callback();
28+
callback();
2929
echo "Done";
3030
?>
3131
--EXPECT--

‎ext/pdo/tests/pdo_011.phpt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class Test1
5252
}
5353
}
5454

55-
function test($id,$val='N/A')
55+
function callback($id,$val='N/A')
5656
{
5757
echo __METHOD__ . "($id,$val)\n";
5858
return array($id=>$val);
@@ -61,10 +61,10 @@ function test($id,$val='N/A')
6161
$f = new Test1(0,0);
6262

6363
$select1->execute();
64-
var_dump($select1->fetchAll(PDO::FETCH_FUNC|PDO::FETCH_GROUP, 'test'));
64+
var_dump($select1->fetchAll(PDO::FETCH_FUNC|PDO::FETCH_GROUP, 'callback'));
6565

6666
$select2->execute();
67-
var_dump($select2->fetchAll(PDO::FETCH_FUNC, 'test'));
67+
var_dump($select2->fetchAll(PDO::FETCH_FUNC, 'callback'));
6868

6969
$select2->execute();
7070
var_dump($select2->fetchAll(PDO::FETCH_FUNC, array('Test1','factory')));
@@ -90,10 +90,10 @@ PDOTest::dropTableIfExists($db, "test011");
9090
--EXPECTF--
9191
DerivedStatement::__construct(Overloaded)
9292
Test1::__construct(0,0)
93-
test(1,N/A)
94-
test(2,N/A)
95-
test(3,N/A)
96-
test(4,N/A)
93+
callback(1,N/A)
94+
callback(2,N/A)
95+
callback(3,N/A)
96+
callback(4,N/A)
9797
array(2) {
9898
["Group1"]=>
9999
array(2) {
@@ -122,10 +122,10 @@ array(2) {
122122
}
123123
}
124124
}
125-
test(1,A)
126-
test(2,B)
127-
test(3,C)
128-
test(4,D)
125+
callback(1,A)
126+
callback(2,B)
127+
callback(3,C)
128+
callback(4,D)
129129
array(4) {
130130
[0]=>
131131
array(1) {

‎ext/pdo/tests/pdo_012.phpt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $SELECT = 'SELECT val, grp FROM test012';
2424
$stmt = $db->query($SELECT, PDO::FETCH_NUM);
2525
var_dump($stmt->fetchAll());
2626

27-
class Test
27+
class TestClass
2828
{
2929
public $val;
3030
public $grp;
@@ -37,13 +37,13 @@ class Test
3737

3838
unset($stmt);
3939

40-
$stmt = $db->query($SELECT, PDO::FETCH_CLASS, 'Test');
40+
$stmt = $db->query($SELECT, PDO::FETCH_CLASS, TestClass::class);
4141
var_dump($stmt->fetchAll());
4242

4343
unset($stmt);
4444

4545
$stmt = $db->query($SELECT, PDO::FETCH_NUM);
46-
$stmt->setFetchMode(PDO::FETCH_CLASS, 'Test', array('Changed'));
46+
$stmt->setFetchMode(PDO::FETCH_CLASS, TestClass::class, array('Changed'));
4747
var_dump($stmt->fetchAll());
4848

4949
?>
@@ -70,36 +70,36 @@ array(2) {
7070
string(6) "Group2"
7171
}
7272
}
73-
Test::__construct(N/A)
74-
Test::__construct(N/A)
73+
TestClass::__construct(N/A)
74+
TestClass::__construct(N/A)
7575
array(2) {
7676
[0]=>
77-
object(Test)#%d (2) {
77+
object(TestClass)#%d (2) {
7878
["val"]=>
7979
string(1) "A"
8080
["grp"]=>
8181
string(6) "Group1"
8282
}
8383
[1]=>
84-
object(Test)#%d (2) {
84+
object(TestClass)#%d (2) {
8585
["val"]=>
8686
string(1) "B"
8787
["grp"]=>
8888
string(6) "Group2"
8989
}
9090
}
91-
Test::__construct(Changed)
92-
Test::__construct(Changed)
91+
TestClass::__construct(Changed)
92+
TestClass::__construct(Changed)
9393
array(2) {
9494
[0]=>
95-
object(Test)#%d (2) {
95+
object(TestClass)#%d (2) {
9696
["val"]=>
9797
string(1) "A"
9898
["grp"]=>
9999
string(6) "Group1"
100100
}
101101
[1]=>
102-
object(Test)#%d (2) {
102+
object(TestClass)#%d (2) {
103103
["val"]=>
104104
string(1) "B"
105105
["grp"]=>

‎ext/pdo/tests/pdo_013.phpt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ foreach ($stmt as $data)
3030
var_dump($data);
3131
}
3232

33-
class Test
33+
class TestClass
3434
{
3535
public $val;
3636
public $grp;
@@ -43,14 +43,14 @@ class Test
4343

4444
unset($stmt);
4545

46-
foreach ($db->query($SELECT, PDO::FETCH_CLASS, 'Test') as $data)
46+
foreach ($db->query($SELECT, PDO::FETCH_CLASS, TestClass::class) as $data)
4747
{
4848
var_dump($data);
4949
}
5050

5151
unset($stmt);
5252

53-
$stmt = $db->query($SELECT, PDO::FETCH_CLASS, 'Test', array('WOW'));
53+
$stmt = $db->query($SELECT, PDO::FETCH_CLASS, TestClass::class, array('WOW'));
5454

5555
foreach($stmt as $data)
5656
{
@@ -76,29 +76,29 @@ array(2) {
7676
[1]=>
7777
string(6) "Group2"
7878
}
79-
Test::__construct(N/A)
80-
object(Test)#%d (2) {
79+
TestClass::__construct(N/A)
80+
object(TestClass)#%d (2) {
8181
["val"]=>
8282
string(1) "A"
8383
["grp"]=>
8484
string(6) "Group1"
8585
}
86-
Test::__construct(N/A)
87-
object(Test)#%d (2) {
86+
TestClass::__construct(N/A)
87+
object(TestClass)#%d (2) {
8888
["val"]=>
8989
string(1) "B"
9090
["grp"]=>
9191
string(6) "Group2"
9292
}
93-
Test::__construct(WOW)
94-
object(Test)#%d (2) {
93+
TestClass::__construct(WOW)
94+
object(TestClass)#%d (2) {
9595
["val"]=>
9696
string(1) "A"
9797
["grp"]=>
9898
string(6) "Group1"
9999
}
100-
Test::__construct(WOW)
101-
object(Test)#%d (2) {
100+
TestClass::__construct(WOW)
101+
object(TestClass)#%d (2) {
102102
["val"]=>
103103
string(1) "B"
104104
["grp"]=>

‎ext/pdo/tests/pdo_014.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $db->exec("INSERT INTO test014 VALUES(1, 'A', 'Group1')");
2020
$db->exec("INSERT INTO test014 VALUES(2, 'B', 'Group2')");
2121
$SELECT = 'SELECT val, grp FROM test014';
2222

23-
class Test
23+
class TestClass
2424
{
2525
public $val;
2626
public $grp;
@@ -31,7 +31,7 @@ class Test
3131
}
3232
}
3333

34-
$stmt = $db->query($SELECT, PDO::FETCH_CLASS, 'Test', array('WOW'));
34+
$stmt = $db->query($SELECT, PDO::FETCH_CLASS, TestClass::class, array('WOW'));
3535

3636
$it = new IteratorIterator($stmt); /* check if we can convert that thing */
3737

@@ -78,15 +78,15 @@ $db = PDOTest::factory();
7878
PDOTest::dropTableIfExists($db, "test014");
7979
?>
8080
--EXPECTF--
81-
Test::__construct(WOW)
82-
object(Test)#%d (2) {
81+
TestClass::__construct(WOW)
82+
object(TestClass)#%d (2) {
8383
["val"]=>
8484
string(1) "A"
8585
["grp"]=>
8686
string(6) "Group1"
8787
}
88-
Test::__construct(WOW)
89-
object(Test)#%d (2) {
88+
TestClass::__construct(WOW)
89+
object(TestClass)#%d (2) {
9090
["val"]=>
9191
string(1) "B"
9292
["grp"]=>

0 commit comments

Comments
 (0)