Detect driver in tests based on configured driver name

doctrine · Nov 6, 2021 · ca587df · ca587df
1 parent 3f9b811
commit ca587df
Show file tree

Hide file tree

Showing 27 changed files with 77 additions and 72 deletions.
diff --git a/tests/Functional/BlobTest.php b/tests/Functional/BlobTest.php
@@ -2,11 +2,10 @@
 
 namespace Doctrine\DBAL\Tests\Functional;
 
-use Doctrine\DBAL\Driver\OCI8\Driver as OCI8Driver;
-use Doctrine\DBAL\Driver\PDO;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 use Doctrine\DBAL\Types\Type;
 
 use function fopen;
@@ -17,7 +16,7 @@ class BlobTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof PDO\OCI\Driver) {
+        if (TestUtil::isDriverOneOf('pdo_oci')) {
             // inserting BLOBs as streams on Oracle requires Oracle-specific SQL syntax which is currently not supported
             // see http://php.net/manual/en/pdo.lobs.php#example-1035
             self::markTestSkipped('DBAL doesn\'t support storing LOBs represented as streams using PDO_OCI');
@@ -50,7 +49,7 @@ public function testInsert(): void
     public function testInsertProcessesStream(): void
     {
         // https://github.com/doctrine/dbal/issues/3290
-        if ($this->connection->getDriver() instanceof OCI8Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             self::markTestIncomplete('The oci8 driver does not support stream resources as parameters');
         }
 
@@ -106,7 +105,7 @@ public function testUpdate(): void
     public function testUpdateProcessesStream(): void
     {
         // https://github.com/doctrine/dbal/issues/3290
-        if ($this->connection->getDriver() instanceof OCI8Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             self::markTestIncomplete('The oci8 driver does not support stream resources as parameters');
         }
 
@@ -133,7 +132,7 @@ public function testUpdateProcessesStream(): void
 
     public function testBindParamProcessesStream(): void
     {
-        if ($this->connection->getDriver() instanceof OCI8Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             self::markTestIncomplete('The oci8 driver does not support stream resources as parameters');
         }
 

diff --git a/tests/Functional/Driver/IBMDB2/ConnectionTest.php b/tests/Functional/Driver/IBMDB2/ConnectionTest.php
@@ -3,10 +3,10 @@
 namespace Doctrine\DBAL\Tests\Functional\Driver\IBMDB2;
 
 use Doctrine\DBAL\Driver\IBMDB2\Connection;
-use Doctrine\DBAL\Driver\IBMDB2\Driver;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\ConnectionFailed;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\PrepareFailed;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 use ReflectionProperty;
 
 use function db2_close;
@@ -18,11 +18,11 @@ class ConnectionTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('ibm_db2')) {
             return;
         }
 
-        $this->markTestSkipped('ibm_db2 only test.');
+        self::markTestSkipped('This test requires the ibm_db2 driver.');
     }
 
     protected function tearDown(): void

diff --git a/tests/Functional/Driver/IBMDB2/DriverTest.php b/tests/Functional/Driver/IBMDB2/DriverTest.php
@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\IBMDB2\Driver;
 use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension ibm_db2
@@ -15,11 +16,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('ibm_db2')) {
             return;
         }
 
-        self::markTestSkipped('ibm_db2 only test.');
+        self::markTestSkipped('This test requires the ibm_db2 driver.');
     }
 
     public function testConnectsWithoutDatabaseNameParameter(): void

diff --git a/tests/Functional/Driver/IBMDB2/StatementTest.php b/tests/Functional/Driver/IBMDB2/StatementTest.php
@@ -4,9 +4,9 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\IBMDB2;
 
-use Doctrine\DBAL\Driver\IBMDB2\Driver;
 use Doctrine\DBAL\Driver\IBMDB2\Exception\StatementError;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 
 use const E_ALL;
 use const E_NOTICE;
@@ -19,11 +19,11 @@ class StatementTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('ibm_db2')) {
             return;
         }
 
-        self::markTestSkipped('ibm_db2 only test.');
+        self::markTestSkipped('This test requires the ibm_db2 driver.');
     }
 
     public function testExecutionErrorsAreNotSuppressed(): void

diff --git a/tests/Functional/Driver/Mysqli/ConnectionTest.php b/tests/Functional/Driver/Mysqli/ConnectionTest.php
@@ -19,11 +19,11 @@ class ConnectionTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('mysqli')) {
             return;
         }
 
-        self::markTestSkipped('MySQLi only test.');
+        self::markTestSkipped('This test requires the mysqli driver.');
     }
 
     public function testSupportedDriverOptions(): void

diff --git a/tests/Functional/Driver/Mysqli/DriverTest.php b/tests/Functional/Driver/Mysqli/DriverTest.php
@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\Mysqli\Driver;
 use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension mysqli
@@ -15,11 +16,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('mysqli')) {
             return;
         }
 
-        self::markTestSkipped('MySQLi only test.');
+        self::markTestSkipped('This test requires the mysqli driver.');
     }
 
     protected function createDriver(): DriverInterface

diff --git a/tests/Functional/Driver/OCI8/ConnectionTest.php b/tests/Functional/Driver/OCI8/ConnectionTest.php
@@ -2,9 +2,9 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\OCI8;
 
-use Doctrine\DBAL\Driver\OCI8\Driver;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension oci8
@@ -13,11 +13,11 @@ class ConnectionTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             return;
         }
 
-        self::markTestSkipped('oci8 only test.');
+        self::markTestSkipped('This test requires the oci8 driver.');
     }
 
     public function testLastInsertIdAcceptsFqn(): void

diff --git a/tests/Functional/Driver/OCI8/DriverTest.php b/tests/Functional/Driver/OCI8/DriverTest.php
@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\OCI8\Driver;
 use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension oci8
@@ -15,11 +16,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             return;
         }
 
-        self::markTestSkipped('oci8 only test.');
+        self::markTestSkipped('This test requires the oci8 driver.');
     }
 
     public function testConnectsWithoutDatabaseNameParameter(): void

diff --git a/tests/Functional/Driver/OCI8/ResultTest.php b/tests/Functional/Driver/OCI8/ResultTest.php
@@ -4,7 +4,6 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\OCI8;
 
-use Doctrine\DBAL\Driver\OCI8\Driver;
 use Doctrine\DBAL\Exception\DriverException;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
@@ -32,11 +31,11 @@ protected function setUp(): void
     {
         $this->connectionParams = TestUtil::getConnectionParams();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             return;
         }
 
-        self::markTestSkipped('oci8 only test.');
+        self::markTestSkipped('This test requires the oci8 driver.');
     }
 
     protected function tearDown(): void

diff --git a/tests/Functional/Driver/OCI8/StatementTest.php b/tests/Functional/Driver/OCI8/StatementTest.php
@@ -2,8 +2,8 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\OCI8;
 
-use Doctrine\DBAL\Driver\OCI8\Driver;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension oci8
@@ -12,11 +12,11 @@ class StatementTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('oci8')) {
             return;
         }
 
-        self::markTestSkipped('oci8 only test.');
+        self::markTestSkipped('This test requires the oci8 driver.');
     }
 
     /**

diff --git a/tests/Functional/Driver/PDO/MySQL/DriverTest.php b/tests/Functional/Driver/PDO/MySQL/DriverTest.php
@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\PDO\MySQL\Driver;
 use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension pdo_mysql
@@ -15,11 +16,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('pdo_mysql')) {
             return;
         }
 
-        self::markTestSkipped('pdo_mysql only test.');
+        self::markTestSkipped('This test requires the pdo_mysql driver.');
     }
 
     protected function createDriver(): DriverInterface

diff --git a/tests/Functional/Driver/PDO/OCI/DriverTest.php b/tests/Functional/Driver/PDO/OCI/DriverTest.php
@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\PDO\OCI\Driver;
 use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension pdo_oci
@@ -15,11 +16,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('pdo_oci')) {
             return;
         }
 
-        self::markTestSkipped('PDO_OCI only test.');
+        self::markTestSkipped('This test requires the pdo_oci driver.');
     }
 
     public function testConnectsWithoutDatabaseNameParameter(): void

diff --git a/tests/Functional/Driver/PDO/PgSQL/ConnectionTest.php b/tests/Functional/Driver/PDO/PgSQL/ConnectionTest.php
@@ -2,9 +2,9 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Driver\PDO\PgSQL;
 
-use Doctrine\DBAL\Driver\PDO\PgSQL\Driver;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension pdo_pgsql
@@ -13,11 +13,11 @@ class ConnectionTest extends FunctionalTestCase
 {
     protected function setUp(): void
     {
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('pdo_pgsql')) {
             return;
         }
 
-        self::markTestSkipped('pdo_pgsql only test.');
+        self::markTestSkipped('This test requires the pdo_pgsql driver.');
     }
 
     /**

diff --git a/tests/Functional/Driver/PDO/PgSQL/DriverTest.php b/tests/Functional/Driver/PDO/PgSQL/DriverTest.php
@@ -21,11 +21,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('pdo_pgsql')) {
             return;
         }
 
-        self::markTestSkipped('pdo_pgsql only test.');
+        self::markTestSkipped('This test requires the pdo_pgsql driver.');
     }
 
     /**

diff --git a/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php b/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php
@@ -20,11 +20,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('pdo_sqlsrv')) {
             return;
         }
 
-        self::markTestSkipped('pdo_sqlsrv only test.');
+        self::markTestSkipped('This test requires the pdo_sqlsrv driver.');
     }
 
     protected function createDriver(): DriverInterface

diff --git a/tests/Functional/Driver/PDO/SQLite/DriverTest.php b/tests/Functional/Driver/PDO/SQLite/DriverTest.php
@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\PDO\SQLite\Driver;
 use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension pdo_sqlite
@@ -15,11 +16,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('pdo_sqlite')) {
             return;
         }
 
-        self::markTestSkipped('pdo_sqlite only test.');
+        self::markTestSkipped('This test requires the pdo_sqlite driver.');
     }
 
     public function testReturnsDatabaseNameWithoutDatabaseNameParameter(): void

diff --git a/tests/Functional/Driver/SQLSrv/DriverTest.php b/tests/Functional/Driver/SQLSrv/DriverTest.php
@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\SQLSrv\Driver;
 use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\TestUtil;
 
 /**
  * @requires extension sqlsrv
@@ -15,11 +16,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->connection->getDriver() instanceof Driver) {
+        if (TestUtil::isDriverOneOf('sqlsrv')) {
             return;
         }
 
-        self::markTestSkipped('sqlsrv only test.');
+        self::markTestSkipped('This test requires the sqlsrv driver.');
     }
 
     protected function createDriver(): DriverInterface