Skip to content

Commit d6e9fbd

Browse files
authored
Remove unnecessary PDO test mock classes (cakephp#2114)
1 parent b86a210 commit d6e9fbd

File tree

4 files changed

+8
-70
lines changed

4 files changed

+8
-70
lines changed

tests/Phinx/Db/Adapter/PdoAdapterTest.php

+8-11
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
namespace Test\Phinx\Db\Adapter;
44

5+
use PDO;
56
use PDOException;
67
use PHPUnit\Framework\TestCase;
78
use RuntimeException;
8-
use Test\Phinx\Db\Mock\PdoAdapterTestPDOMock;
9-
use Test\Phinx\Db\Mock\PdoAdapterTestPDOMockWithExecChecks;
109

1110
class PdoAdapterTest extends TestCase
1211
{
@@ -34,7 +33,7 @@ public function testOptions()
3433

3534
public function testOptionsSetConnection()
3635
{
37-
$connection = new PdoAdapterTestPDOMock();
36+
$connection = $this->getMockBuilder(PDO::class)->disableOriginalConstructor()->getMock();
3837
$this->adapter->setOptions(['connection' => $connection]);
3938

4039
$this->assertSame($connection, $this->adapter->getConnection());
@@ -181,23 +180,21 @@ public function testGetVersionLongDryRun()
181180
*/
182181
public function testExecuteCanBeCalled()
183182
{
184-
$pdo = new PdoAdapterTestPDOMockWithExecChecks();
183+
/** @var \PDO&\PHPUnit\Framework\MockObject\MockObject $pdo */
184+
$pdo = $this->getMockBuilder(PDO::class)->disableOriginalConstructor()->onlyMethods(['exec'])->getMock();
185+
$pdo->expects($this->once())->method('exec')->with('SELECT 1;')->will($this->returnValue(1));
185186

186187
$this->adapter->setConnection($pdo);
187-
188188
$this->adapter->execute('SELECT 1');
189-
190-
$this->assertSame('SELECT 1;', $pdo->getExecutedSqlForTest());
191189
}
192190

193191
public function testExecuteRightTrimsSemiColons()
194192
{
195-
$pdo = new PdoAdapterTestPDOMockWithExecChecks();
193+
/** @var \PDO&\PHPUnit\Framework\MockObject\MockObject $pdo */
194+
$pdo = $this->getMockBuilder(PDO::class)->disableOriginalConstructor()->onlyMethods(['exec'])->getMock();
195+
$pdo->expects($this->once())->method('exec')->with('SELECT 1;')->will($this->returnValue(1));
196196

197197
$this->adapter->setConnection($pdo);
198-
199198
$this->adapter->execute('SELECT 1;;');
200-
201-
$this->assertSame('SELECT 1;', $pdo->getExecutedSqlForTest());
202199
}
203200
}

tests/Phinx/Db/Mock/PdoAdapterTestPDOMock.php

-10
This file was deleted.

tests/Phinx/Db/Mock/PdoAdapterTestPDOMockWithExecChecks.php

-33
This file was deleted.

tests/Phinx/Db/Mock/PdoStatementMock.php

-16
This file was deleted.

0 commit comments

Comments
 (0)