Skip to content

Commit 1ff3ce5

Browse files
morozovmorozov
committed
Replaced MockPlatform with the ones generated by PHPUnit
1 parent f5ddd09 commit 1ff3ce5

22 files changed

+158
-205
lines changed

‎tests/Doctrine/Tests/DBAL/ConnectionTest.php

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected function setUp() : void
5353
$this->connection = DriverManager::getConnection($this->params);
5454
}
5555

56-
public function getExecuteUpdateMockConnection()
56+
private function getExecuteUpdateMockConnection() : Connection
5757
{
5858
$driverMock = $this->createMock(Driver::class);
5959

@@ -63,10 +63,15 @@ public function getExecuteUpdateMockConnection()
6363
$this->createMock(DriverConnection::class)
6464
));
6565

66-
return $this->getMockBuilder(Connection::class)
66+
$platform = $this->getMockForAbstractClass(AbstractPlatform::class);
67+
68+
/** @var Connection|MockObject $connection */
69+
$connection = $this->getMockBuilder(Connection::class)
6770
->setMethods(['executeUpdate'])
68-
->setConstructorArgs([['platform' => new Mocks\MockPlatform()], $driverMock])
71+
->setConstructorArgs([['platform' => $platform], $driverMock])
6972
->getMock();
73+
74+
return $connection;
7075
}
7176

7277
public function testIsConnected()
@@ -153,9 +158,8 @@ public function testConnectDispatchEvent()
153158
$driverMock = $this->createMock(Driver::class);
154159
$driverMock->expects($this->at(0))
155160
->method('connect');
156-
$platform = new Mocks\MockPlatform();
157161

158-
$conn = new Connection(['platform' => $platform], $driverMock, new Configuration(), $eventManager);
162+
$conn = new Connection([], $driverMock, new Configuration(), $eventManager);
159163
$conn->connect();
160164
}
161165

@@ -249,7 +253,7 @@ public function testConnectStartsTransactionInNoAutoCommitMode()
249253
->will($this->returnValue(
250254
$this->createMock(DriverConnection::class)
251255
));
252-
$conn = new Connection(['platform' => new Mocks\MockPlatform()], $driverMock);
256+
$conn = new Connection([], $driverMock);
253257

254258
$conn->setAutoCommit(false);
255259

@@ -271,7 +275,7 @@ public function testCommitStartsTransactionInNoAutoCommitMode()
271275
->will($this->returnValue(
272276
$this->createMock(DriverConnection::class)
273277
));
274-
$conn = new Connection(['platform' => new Mocks\MockPlatform()], $driverMock);
278+
$conn = new Connection([], $driverMock);
275279

276280
$conn->setAutoCommit(false);
277281
$conn->connect();
@@ -291,7 +295,7 @@ public function testRollBackStartsTransactionInNoAutoCommitMode()
291295
->will($this->returnValue(
292296
$this->createMock(DriverConnection::class)
293297
));
294-
$conn = new Connection(['platform' => new Mocks\MockPlatform()], $driverMock);
298+
$conn = new Connection([], $driverMock);
295299

296300
$conn->setAutoCommit(false);
297301
$conn->connect();
@@ -311,7 +315,7 @@ public function testSwitchingAutoCommitModeCommitsAllCurrentTransactions()
311315
->will($this->returnValue(
312316
$this->createMock(DriverConnection::class)
313317
));
314-
$conn = new Connection(['platform' => new Mocks\MockPlatform()], $driverMock);
318+
$conn = new Connection([], $driverMock);
315319

316320
$conn->connect();
317321
$conn->beginTransaction();
@@ -520,7 +524,7 @@ public function testFetchAssoc()
520524
/** @var Connection|MockObject $conn */
521525
$conn = $this->getMockBuilder(Connection::class)
522526
->setMethods(['executeQuery'])
523-
->setConstructorArgs([['platform' => new Mocks\MockPlatform()], $driverMock])
527+
->setConstructorArgs([[], $driverMock])
524528
->getMock();
525529

526530
$conn->expects($this->once())
@@ -556,7 +560,7 @@ public function testFetchArray()
556560
/** @var Connection|MockObject $conn */
557561
$conn = $this->getMockBuilder(Connection::class)
558562
->setMethods(['executeQuery'])
559-
->setConstructorArgs([['platform' => new Mocks\MockPlatform()], $driverMock])
563+
->setConstructorArgs([[], $driverMock])
560564
->getMock();
561565

562566
$conn->expects($this->once())
@@ -593,7 +597,7 @@ public function testFetchColumn()
593597
/** @var Connection|MockObject $conn */
594598
$conn = $this->getMockBuilder(Connection::class)
595599
->setMethods(['executeQuery'])
596-
->setConstructorArgs([['platform' => new Mocks\MockPlatform()], $driverMock])
600+
->setConstructorArgs([[], $driverMock])
597601
->getMock();
598602

599603
$conn->expects($this->once())
@@ -628,7 +632,7 @@ public function testFetchAll()
628632
/** @var Connection|MockObject $conn */
629633
$conn = $this->getMockBuilder(Connection::class)
630634
->setMethods(['executeQuery'])
631-
->setConstructorArgs([['platform' => new Mocks\MockPlatform()], $driverMock])
635+
->setConstructorArgs([[], $driverMock])
632636
->getMock();
633637

634638
$conn->expects($this->once())
@@ -694,8 +698,8 @@ public function dataCallConnectOnce()
694698
public function testCallConnectOnce($method, $params)
695699
{
696700
$driverMock = $this->createMock(Driver::class);
697-
$pdoMock = $this->createMock(\Doctrine\DBAL\Driver\Connection::class);
698-
$platformMock = new Mocks\MockPlatform();
701+
$pdoMock = $this->createMock(Connection::class);
702+
$platformMock = $this->createMock(AbstractPlatform::class);
699703
$stmtMock = $this->createMock(Statement::class);
700704

701705
$pdoMock->expects($this->any())

‎tests/Doctrine/Tests/DBAL/DriverManagerTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use Doctrine\DBAL\Driver\PDOSqlite\Driver as PDOSqliteDriver;
1010
use Doctrine\DBAL\Driver\SQLSrv\Driver as SQLSrvDriver;
1111
use Doctrine\DBAL\DriverManager;
12+
use Doctrine\DBAL\Platforms\AbstractPlatform;
1213
use Doctrine\DBAL\Sharding\PoolingShardConnection;
1314
use Doctrine\DBAL\Sharding\ShardChoser\MultiTenantShardChoser;
14-
use Doctrine\Tests\DBAL\Mocks\MockPlatform;
1515
use Doctrine\Tests\DbalTestCase;
1616
use Doctrine\Tests\Mocks\ConnectionMock;
1717
use Doctrine\Tests\Mocks\DriverMock;
@@ -77,14 +77,14 @@ public function testInvalidDriver()
7777
*/
7878
public function testCustomPlatform()
7979
{
80-
$mockPlatform = new MockPlatform();
81-
$options = [
80+
$platform = $this->createMock(AbstractPlatform::class);
81+
$options = [
8282
'pdo' => new PDO('sqlite::memory:'),
83-
'platform' => $mockPlatform,
83+
'platform' => $platform,
8484
];
8585

8686
$conn = DriverManager::getConnection($options);
87-
self::assertSame($mockPlatform, $conn->getDatabasePlatform());
87+
self::assertSame($platform, $conn->getDatabasePlatform());
8888
}
8989

9090
/**

‎tests/Doctrine/Tests/DBAL/Mocks/MockPlatform.php

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎tests/Doctrine/Tests/DBAL/Schema/SchemaDiffTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
namespace Doctrine\Tests\DBAL\Schema;
44

5+
use Doctrine\DBAL\Platforms\AbstractPlatform;
56
use Doctrine\DBAL\Schema\ForeignKeyConstraint;
67
use Doctrine\DBAL\Schema\SchemaDiff;
78
use Doctrine\DBAL\Schema\Sequence;
89
use Doctrine\DBAL\Schema\Table;
910
use Doctrine\DBAL\Schema\TableDiff;
10-
use Doctrine\Tests\DBAL\Mocks\MockPlatform;
11+
use PHPUnit\Framework\MockObject\MockObject;
1112
use PHPUnit\Framework\TestCase;
1213

1314
class SchemaDiffTest extends TestCase
@@ -36,9 +37,10 @@ public function testSchemaDiffToSaveSql()
3637
self::assertEquals($expected, $sql);
3738
}
3839

39-
public function createPlatform($unsafe = false)
40+
private function createPlatform(bool $unsafe) : AbstractPlatform
4041
{
41-
$platform = $this->createMock(MockPlatform::class);
42+
/** @var AbstractPlatform|MockObject $platform */
43+
$platform = $this->createMock(AbstractPlatform::class);
4244
$platform->expects($this->exactly(1))
4345
->method('getCreateSchemaSQL')
4446
->with('foo_ns')
@@ -93,6 +95,7 @@ public function createPlatform($unsafe = false)
9395
$platform->expects($this->exactly(2))
9496
->method('supportsForeignKeyConstraints')
9597
->will($this->returnValue(true));
98+
9699
return $platform;
97100
}
98101

‎tests/Doctrine/Tests/DBAL/Schema/TableDiffTest.php

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,39 @@
22

33
namespace Doctrine\Tests\DBAL\Schema;
44

5+
use Doctrine\DBAL\Platforms\AbstractPlatform;
56
use Doctrine\DBAL\Schema\Identifier;
67
use Doctrine\DBAL\Schema\Table;
78
use Doctrine\DBAL\Schema\TableDiff;
8-
use Doctrine\Tests\DBAL\Mocks\MockPlatform;
9+
use PHPUnit\Framework\MockObject\MockObject;
910
use PHPUnit\Framework\TestCase;
1011

1112
class TableDiffTest extends TestCase
1213
{
14+
/** @var AbstractPlatform|MockObject */
15+
private $platform;
16+
17+
public function setUp() : void
18+
{
19+
$this->platform = $this->createMock(AbstractPlatform::class);
20+
}
21+
1322
/**
1423
* @group DBAL-1013
1524
*/
1625
public function testReturnsName()
1726
{
1827
$tableDiff = new TableDiff('foo');
1928

20-
self::assertEquals(new Identifier('foo'), $tableDiff->getName(new MockPlatform()));
29+
self::assertEquals(new Identifier('foo'), $tableDiff->getName($this->platform));
2130
}
2231

2332
/**
2433
* @group DBAL-1016
2534
*/
2635
public function testPrefersNameFromTableObject()
2736
{
28-
$platformMock = new MockPlatform();
29-
$tableMock = $this->getMockBuilder(Table::class)
37+
$tableMock = $this->getMockBuilder(Table::class)
3038
->disableOriginalConstructor()
3139
->getMock();
3240

@@ -35,10 +43,10 @@ public function testPrefersNameFromTableObject()
3543

3644
$tableMock->expects($this->once())
3745
->method('getQuotedName')
38-
->with($platformMock)
46+
->with($this->platform)
3947
->will($this->returnValue('foo'));
4048

41-
self::assertEquals(new Identifier('foo'), $tableDiff->getName($platformMock));
49+
self::assertEquals(new Identifier('foo'), $tableDiff->getName($this->platform));
4250
}
4351

4452
/**

‎tests/Doctrine/Tests/DBAL/StatementTest.php

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Doctrine\DBAL\Logging\SQLLogger;
1111
use Doctrine\DBAL\ParameterType;
1212
use Doctrine\DBAL\Statement;
13-
use Doctrine\Tests\DBAL\Mocks\MockPlatform;
1413
use Doctrine\Tests\DbalTestCase;
1514
use Exception;
1615
use PDOStatement;
@@ -31,19 +30,16 @@ protected function setUp() : void
3130
$this->pdoStatement = $this->getMockBuilder(PDOStatement::class)
3231
->setMethods(['execute', 'bindParam', 'bindValue'])
3332
->getMock();
34-
$platform = new MockPlatform();
35-
$driverConnection = $this->createMock(DriverConnection::class);
33+
34+
$driverConnection = $this->createMock(DriverConnection::class);
3635
$driverConnection->expects($this->any())
3736
->method('prepare')
3837
->will($this->returnValue($this->pdoStatement));
3938

40-
$driver = $this->createMock(Driver::class);
41-
$constructorArgs = [
42-
['platform' => $platform],
43-
$driver,
44-
];
45-
$this->conn = $this->getMockBuilder(Connection::class)
46-
->setConstructorArgs($constructorArgs)
39+
$driver = $this->createMock(Driver::class);
40+
41+
$this->conn = $this->getMockBuilder(Connection::class)
42+
->setConstructorArgs([[], $driver])
4743
->getMock();
4844
$this->conn->expects($this->atLeastOnce())
4945
->method('getWrappedConnection')

0 commit comments

Comments
 (0)