Merge pull request #3474 from morozov/remove-more-mocks

Remove more hard-coded mock classes
doctrine · Mar 5, 2019 · 77ecc63 · 77ecc63
2 parents 2080599 + afbae7e
commit 77ecc63
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 292 deletions.
diff --git a/tests/Doctrine/Tests/DBAL/ConnectionTest.php b/tests/Doctrine/Tests/DBAL/ConnectionTest.php
@@ -22,7 +22,6 @@
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\Tests\DbalTestCase;
-use Doctrine\Tests\Mocks\DriverMock;
 use Doctrine\Tests\Mocks\DriverStatementMock;
 use Doctrine\Tests\Mocks\ServerInfoAwareConnectionMock;
 use Doctrine\Tests\Mocks\VersionAwarePlatformDriverMock;
@@ -165,10 +164,22 @@ public function testConnectDispatchEvent()
 
     public function testEventManagerPassedToPlatform()
     {
-        $driverMock = new DriverMock();
-        $connection = new Connection($this->params, $driverMock);
-        self::assertInstanceOf(EventManager::class, $connection->getDatabasePlatform()->getEventManager());
-        self::assertSame($connection->getEventManager(), $connection->getDatabasePlatform()->getEventManager());
+        $eventManager = new EventManager();
+
+        /** @var AbstractPlatform|MockObject $driver */
+        $platform = $this->createMock(AbstractPlatform::class);
+        $platform->expects($this->once())
+            ->method('setEventManager')
+            ->with($eventManager);
+
+        /** @var Driver|MockObject $driver */
+        $driver = $this->createMock(Driver::class);
+        $driver->expects($this->any())
+            ->method('getDatabasePlatform')
+            ->willReturn($platform);
+
+        $connection = new Connection($this->params, $driver, null, $eventManager);
+        $connection->getDatabasePlatform();
     }
 
     /**

diff --git a/tests/Doctrine/Tests/DBAL/DriverManagerTest.php b/tests/Doctrine/Tests/DBAL/DriverManagerTest.php
@@ -2,8 +2,10 @@
 
 namespace Doctrine\Tests\DBAL;
 
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Connections\MasterSlaveConnection;
 use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Driver\DrizzlePDOMySql\Driver as DrizzlePDOMySqlDriver;
 use Doctrine\DBAL\Driver\PDOMySql\Driver as PDOMySQLDriver;
 use Doctrine\DBAL\Driver\PDOSqlite\Driver as PDOSqliteDriver;
@@ -13,11 +15,10 @@
 use Doctrine\DBAL\Sharding\PoolingShardConnection;
 use Doctrine\DBAL\Sharding\ShardChoser\MultiTenantShardChoser;
 use Doctrine\Tests\DbalTestCase;
-use Doctrine\Tests\Mocks\ConnectionMock;
-use Doctrine\Tests\Mocks\DriverMock;
 use PDO;
 use stdClass;
 use function extension_loaded;
+use function get_class;
 use function in_array;
 use function is_array;
 
@@ -92,7 +93,8 @@ public function testCustomPlatform()
      */
     public function testCustomWrapper()
     {
-        $wrapperClass = ConnectionMock::class;
+        $wrapper      = $this->createMock(Connection::class);
+        $wrapperClass = get_class($wrapper);
 
         $options = [
             'pdo' => new PDO('sqlite::memory:'),
@@ -238,6 +240,9 @@ public function testDatabaseUrl($url, $expected)
 
     public function databaseUrls()
     {
+        $driver      = $this->createMock(Driver::class);
+        $driverClass = get_class($driver);
+
         return [
             'simple URL' => [
                 'mysql://foo:bar@localhost/baz',
@@ -406,14 +411,14 @@ public function databaseUrls()
             'URL without scheme but custom driver' => [
                 [
                     'url'         => '//foo:bar@localhost/baz',
-                    'driverClass' => DriverMock::class,
+                    'driverClass' => $driverClass,
                 ],
                 [
                     'user'        => 'foo',
                     'password'    => 'bar',
                     'host'        => 'localhost',
                     'dbname'      => 'baz',
-                    'driverClass' => DriverMock::class,
+                    'driverClass' => $driverClass,
                 ],
             ],
             'URL without scheme but default PDO driver and default driver' => [
@@ -434,14 +439,14 @@ public function databaseUrls()
                 [
                     'url'         => '//foo:bar@localhost/baz',
                     'driver'      => 'pdo_mysql',
-                    'driverClass' => DriverMock::class,
+                    'driverClass' => $driverClass,
                 ],
                 [
                     'user'        => 'foo',
                     'password'    => 'bar',
                     'host'        => 'localhost',
                     'dbname'      => 'baz',
-                    'driverClass' => DriverMock::class,
+                    'driverClass' => $driverClass,
                 ],
             ],
             'URL with default PDO driver' => [
@@ -473,7 +478,7 @@ public function databaseUrls()
             'URL with default custom driver' => [
                 [
                     'url'         => 'mysql://foo:bar@localhost/baz',
-                    'driverClass' => DriverMock::class,
+                    'driverClass' => $driverClass,
                 ],
                 [
                     'user'     => 'foo',
@@ -501,7 +506,7 @@ public function databaseUrls()
                 [
                     'url'         => 'mysql://foo:bar@localhost/baz',
                     'driver'      => 'sqlite',
-                    'driverClass' => DriverMock::class,
+                    'driverClass' => $driverClass,
                 ],
                 [
                     'user'     => 'foo',
@@ -516,7 +521,7 @@ public function databaseUrls()
                     'url'         => 'mysql://foo:bar@localhost/baz',
                     'pdo'         => true,
                     'driver'      => 'sqlite',
-                    'driverClass' => DriverMock::class,
+                    'driverClass' => $driverClass,
                 ],
                 [
                     'user'     => 'foo',

diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php
diff --git a/tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php b/tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php