Rename abstract test case classes

PHPUnit 10 no longer ignores abstract classes that end with Test.
doctrine · Jun 14, 2023 · 3b4b2f4 · 3b4b2f4
1 parent 1dc87d0
commit 3b4b2f4
Show file tree

Hide file tree

Showing 34 changed files with 65 additions and 100 deletions.
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -134,7 +134,7 @@
                 <file name="src/Types/ArrayType.php"/>
                 <file name="src/Types/ObjectType.php"/>
                 <file name="src/Types/Type.php"/>
-                <file name="tests/Schema/ComparatorTest.php"/>
+                <file name="tests/Schema/AbstractComparatorTestCase.php"/>
                 <!--
                     TODO: remove in 4.0.0
                 -->
@@ -747,8 +747,8 @@
                     or breaking API changes.
                 -->
                 <file name="src/Platforms/AbstractMySQLPlatform.php"/>
-                <file name="tests/Functional/Driver/AbstractDriverTest.php"/>
-                
+                <file name="tests/Functional/Driver/AbstractDriverTestCase.php"/>
+
                 <!-- We're checking for invalid input. -->
                 <directory name="src/Driver/PgSQL"/>
                 <file name="src/Result.php"/>

diff --git a/tests/Driver/AbstractDB2DriverTest.php → tests/Driver/AbstractDB2DriverTestCase.php b/tests/Driver/AbstractDB2DriverTest.php → tests/Driver/AbstractDB2DriverTestCase.php
@@ -3,8 +3,6 @@
 namespace Doctrine\DBAL\Tests\Driver;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\AbstractDB2Driver;
 use Doctrine\DBAL\Driver\API\ExceptionConverter as ExceptionConverterInterface;
 use Doctrine\DBAL\Driver\API\IBMDB2\ExceptionConverter;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
@@ -13,14 +11,9 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\DB2SchemaManager;
 
-/** @extends AbstractDriverTest<DB2Platform> */
-class AbstractDB2DriverTest extends AbstractDriverTest
+/** @extends AbstractDriverTestCase<DB2Platform> */
+abstract class AbstractDB2DriverTestCase extends AbstractDriverTestCase
 {
-    protected function createDriver(): Driver
-    {
-        return $this->getMockForAbstractClass(AbstractDB2Driver::class);
-    }
-
     protected function createPlatform(): AbstractPlatform
     {
         return new DB2Platform();

diff --git a/tests/Driver/AbstractDriverTest.php → tests/Driver/AbstractDriverTestCase.php b/tests/Driver/AbstractDriverTest.php → tests/Driver/AbstractDriverTestCase.php
@@ -18,7 +18,7 @@
 use function sprintf;
 
 /** @template P of AbstractPlatform */
-abstract class AbstractDriverTest extends TestCase
+abstract class AbstractDriverTestCase extends TestCase
 {
     use VerifyDeprecations;
 

diff --git a/tests/Driver/AbstractMySQLDriverTest.php → tests/Driver/AbstractMySQLDriverTestCase.php b/tests/Driver/AbstractMySQLDriverTest.php → tests/Driver/AbstractMySQLDriverTestCase.php
@@ -3,8 +3,6 @@
 namespace Doctrine\DBAL\Tests\Driver;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\AbstractMySQLDriver;
 use Doctrine\DBAL\Driver\API\ExceptionConverter;
 use Doctrine\DBAL\Driver\API\MySQL;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
@@ -16,14 +14,9 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\MySQLSchemaManager;
 
-/** @extends AbstractDriverTest<MySQLPlatform> */
-class AbstractMySQLDriverTest extends AbstractDriverTest
+/** @extends AbstractDriverTestCase<MySQLPlatform> */
+abstract class AbstractMySQLDriverTestCase extends AbstractDriverTestCase
 {
-    protected function createDriver(): Driver
-    {
-        return $this->getMockForAbstractClass(AbstractMySQLDriver::class);
-    }
-
     protected function createPlatform(): AbstractPlatform
     {
         return new MySQLPlatform();

diff --git a/tests/Driver/AbstractOracleDriverTest.php → ...s/Driver/AbstractOracleDriverTestCase.php b/tests/Driver/AbstractOracleDriverTest.php → ...s/Driver/AbstractOracleDriverTestCase.php
@@ -3,23 +3,16 @@
 namespace Doctrine\DBAL\Tests\Driver;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\AbstractOracleDriver;
 use Doctrine\DBAL\Driver\API\ExceptionConverter;
 use Doctrine\DBAL\Driver\API\OCI;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\OracleSchemaManager;
 
-/** @extends AbstractDriverTest<OraclePlatform> */
-class AbstractOracleDriverTest extends AbstractDriverTest
+/** @extends AbstractDriverTestCase<OraclePlatform> */
+abstract class AbstractOracleDriverTestCase extends AbstractDriverTestCase
 {
-    protected function createDriver(): Driver
-    {
-        return $this->getMockForAbstractClass(AbstractOracleDriver::class);
-    }
-
     protected function createPlatform(): AbstractPlatform
     {
         return new OraclePlatform();

diff --git a/...s/Driver/AbstractPostgreSQLDriverTest.php → ...iver/AbstractPostgreSQLDriverTestCase.php b/...s/Driver/AbstractPostgreSQLDriverTest.php → ...iver/AbstractPostgreSQLDriverTestCase.php
@@ -3,8 +3,6 @@
 namespace Doctrine\DBAL\Tests\Driver;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\AbstractPostgreSQLDriver;
 use Doctrine\DBAL\Driver\API\ExceptionConverter;
 use Doctrine\DBAL\Driver\API\PostgreSQL;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
@@ -14,14 +12,9 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\PostgreSQLSchemaManager;
 
-/** @extends AbstractDriverTest<PostgreSQLPlatform> */
-class AbstractPostgreSQLDriverTest extends AbstractDriverTest
+/** @extends AbstractDriverTestCase<PostgreSQLPlatform> */
+abstract class AbstractPostgreSQLDriverTestCase extends AbstractDriverTestCase
 {
-    protected function createDriver(): Driver
-    {
-        return $this->getMockForAbstractClass(AbstractPostgreSQLDriver::class);
-    }
-
     protected function createPlatform(): AbstractPlatform
     {
         return new PostgreSQL94Platform();

diff --git a/tests/Driver/AbstractSQLServerDriverTest.php → ...river/AbstractSQLServerDriverTestCase.php b/tests/Driver/AbstractSQLServerDriverTest.php → ...river/AbstractSQLServerDriverTestCase.php
@@ -12,8 +12,8 @@
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\SQLServerSchemaManager;
 
-/** @extends AbstractDriverTest<SQLServerPlatform> */
-abstract class AbstractSQLServerDriverTest extends AbstractDriverTest
+/** @extends AbstractDriverTestCase<SQLServerPlatform> */
+abstract class AbstractSQLServerDriverTestCase extends AbstractDriverTestCase
 {
     protected function createPlatform(): AbstractPlatform
     {

diff --git a/tests/Driver/AbstractSQLiteDriverTest.php → ...s/Driver/AbstractSQLiteDriverTestCase.php b/tests/Driver/AbstractSQLiteDriverTest.php → ...s/Driver/AbstractSQLiteDriverTestCase.php
@@ -3,23 +3,16 @@
 namespace Doctrine\DBAL\Tests\Driver;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver;
-use Doctrine\DBAL\Driver\AbstractSQLiteDriver;
 use Doctrine\DBAL\Driver\API\ExceptionConverter;
 use Doctrine\DBAL\Driver\API\SQLite;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\SqliteSchemaManager;
 
-/** @extends AbstractDriverTest<SqlitePlatform> */
-class AbstractSQLiteDriverTest extends AbstractDriverTest
+/** @extends AbstractDriverTestCase<SqlitePlatform> */
+abstract class AbstractSQLiteDriverTestCase extends AbstractDriverTestCase
 {
-    protected function createDriver(): Driver
-    {
-        return $this->getMockForAbstractClass(AbstractSQLiteDriver::class);
-    }
-
     protected function createPlatform(): AbstractPlatform
     {
         return new SqlitePlatform();

diff --git a/tests/Driver/IBMDB2/DB2DriverTest.php → tests/Driver/IBMDB2/DriverTest.php b/tests/Driver/IBMDB2/DB2DriverTest.php → tests/Driver/IBMDB2/DriverTest.php
@@ -4,9 +4,9 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\IBMDB2\Driver;
-use Doctrine\DBAL\Tests\Driver\AbstractDB2DriverTest;
+use Doctrine\DBAL\Tests\Driver\AbstractDB2DriverTestCase;
 
-class DB2DriverTest extends AbstractDB2DriverTest
+class DriverTest extends AbstractDB2DriverTestCase
 {
     protected function createDriver(): DriverInterface
     {

diff --git a/tests/Driver/Mysqli/DriverTest.php b/tests/Driver/Mysqli/DriverTest.php
@@ -4,9 +4,9 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\Mysqli\Driver;
-use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTest;
+use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTestCase;
 
-class DriverTest extends AbstractMySQLDriverTest
+class DriverTest extends AbstractMySQLDriverTestCase
 {
     protected function createDriver(): DriverInterface
     {

diff --git a/tests/Driver/OCI8/DriverTest.php b/tests/Driver/OCI8/DriverTest.php
@@ -4,9 +4,9 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\OCI8\Driver;
-use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTest;
+use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTestCase;
 
-class DriverTest extends AbstractOracleDriverTest
+class DriverTest extends AbstractOracleDriverTestCase
 {
     protected function createDriver(): DriverInterface
     {

diff --git a/tests/Driver/PDO/MySQL/DriverTest.php b/tests/Driver/PDO/MySQL/DriverTest.php
@@ -4,9 +4,9 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\PDO\MySQL\Driver;
-use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTest;
+use Doctrine\DBAL\Tests\Driver\AbstractMySQLDriverTestCase;
 
-class DriverTest extends AbstractMySQLDriverTest
+class DriverTest extends AbstractMySQLDriverTestCase
 {
     protected function createDriver(): DriverInterface
     {

diff --git a/tests/Driver/PDO/OCI/DriverTest.php b/tests/Driver/PDO/OCI/DriverTest.php
@@ -4,9 +4,9 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\PDO\OCI\Driver;
-use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTest;
+use Doctrine\DBAL\Tests\Driver\AbstractOracleDriverTestCase;
 
-class DriverTest extends AbstractOracleDriverTest
+class DriverTest extends AbstractOracleDriverTestCase
 {
     protected function createDriver(): DriverInterface
     {

diff --git a/tests/Driver/PDO/PgSQL/DriverTest.php b/tests/Driver/PDO/PgSQL/DriverTest.php
@@ -6,12 +6,12 @@
 use Doctrine\DBAL\Driver\Connection;
 use Doctrine\DBAL\Driver\PDO;
 use Doctrine\DBAL\Driver\PDO\PgSQL\Driver;
-use Doctrine\DBAL\Tests\Driver\AbstractPostgreSQLDriverTest;
+use Doctrine\DBAL\Tests\Driver\AbstractPostgreSQLDriverTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 
 use function array_merge;
 
-class DriverTest extends AbstractPostgreSQLDriverTest
+class DriverTest extends AbstractPostgreSQLDriverTestCase
 {
     protected function setUp(): void
     {

diff --git a/tests/Driver/PDO/SQLSrv/DriverTest.php b/tests/Driver/PDO/SQLSrv/DriverTest.php
@@ -4,9 +4,9 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\PDO\SQLSrv\Driver;
-use Doctrine\DBAL\Tests\Driver\AbstractSQLServerDriverTest;
+use Doctrine\DBAL\Tests\Driver\AbstractSQLServerDriverTestCase;
 
-class DriverTest extends AbstractSQLServerDriverTest
+class DriverTest extends AbstractSQLServerDriverTestCase
 {
     protected function createDriver(): DriverInterface
     {

diff --git a/tests/Driver/PDO/SQLite/DriverTest.php b/tests/Driver/PDO/SQLite/DriverTest.php
@@ -4,9 +4,9 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\PDO\SQLite\Driver;
-use Doctrine\DBAL\Tests\Driver\AbstractSQLiteDriverTest;
+use Doctrine\DBAL\Tests\Driver\AbstractSQLiteDriverTestCase;
 
-class DriverTest extends AbstractSQLiteDriverTest
+class DriverTest extends AbstractSQLiteDriverTestCase
 {
     protected function createDriver(): DriverInterface
     {

diff --git a/tests/Driver/SQLSrv/DriverTest.php b/tests/Driver/SQLSrv/DriverTest.php
@@ -4,9 +4,9 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\SQLSrv\Driver;
-use Doctrine\DBAL\Tests\Driver\AbstractSQLServerDriverTest;
+use Doctrine\DBAL\Tests\Driver\AbstractSQLServerDriverTestCase;
 
-class DriverTest extends AbstractSQLServerDriverTest
+class DriverTest extends AbstractSQLServerDriverTestCase
 {
     protected function createDriver(): DriverInterface
     {

diff --git a/.../Functional/Driver/AbstractDriverTest.php → ...ctional/Driver/AbstractDriverTestCase.php b/.../Functional/Driver/AbstractDriverTest.php → ...ctional/Driver/AbstractDriverTestCase.php
@@ -8,7 +8,7 @@
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use PHPUnit\Framework\Constraint\IsType;
 
-abstract class AbstractDriverTest extends FunctionalTestCase
+abstract class AbstractDriverTestCase extends FunctionalTestCase
 {
     /**
      * The driver instance under test.

diff --git a/...l/Driver/AbstractPostgreSQLDriverTest.php → ...iver/AbstractPostgreSQLDriverTestCase.php b/...l/Driver/AbstractPostgreSQLDriverTest.php → ...iver/AbstractPostgreSQLDriverTestCase.php
@@ -10,7 +10,7 @@
 use function microtime;
 use function sprintf;
 
-abstract class AbstractPostgreSQLDriverTest extends AbstractDriverTest
+abstract class AbstractPostgreSQLDriverTestCase extends AbstractDriverTestCase
 {
     public function testConnectsWithApplicationNameParameter(): void
     {

diff --git a/tests/Functional/Driver/IBMDB2/DriverTest.php b/tests/Functional/Driver/IBMDB2/DriverTest.php
@@ -4,11 +4,11 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\IBMDB2\Driver;
-use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 
 /** @requires extension ibm_db2 */
-class DriverTest extends AbstractDriverTest
+class DriverTest extends AbstractDriverTestCase
 {
     protected function setUp(): void
     {

diff --git a/tests/Functional/Driver/Mysqli/DriverTest.php b/tests/Functional/Driver/Mysqli/DriverTest.php
@@ -4,11 +4,11 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\Mysqli\Driver;
-use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 
 /** @requires extension mysqli */
-class DriverTest extends AbstractDriverTest
+class DriverTest extends AbstractDriverTestCase
 {
     protected function setUp(): void
     {

diff --git a/tests/Functional/Driver/OCI8/DriverTest.php b/tests/Functional/Driver/OCI8/DriverTest.php
@@ -4,11 +4,11 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\OCI8\Driver;
-use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 
 /** @requires extension oci8 */
-class DriverTest extends AbstractDriverTest
+class DriverTest extends AbstractDriverTestCase
 {
     protected function setUp(): void
     {

diff --git a/tests/Functional/Driver/PDO/MySQL/DriverTest.php b/tests/Functional/Driver/PDO/MySQL/DriverTest.php
@@ -4,11 +4,11 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\PDO\MySQL\Driver;
-use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 
 /** @requires extension pdo_mysql */
-class DriverTest extends AbstractDriverTest
+class DriverTest extends AbstractDriverTestCase
 {
     protected function setUp(): void
     {

diff --git a/tests/Functional/Driver/PDO/OCI/DriverTest.php b/tests/Functional/Driver/PDO/OCI/DriverTest.php
@@ -4,11 +4,11 @@
 
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\PDO\OCI\Driver;
-use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 
 /** @requires extension pdo_oci */
-class DriverTest extends AbstractDriverTest
+class DriverTest extends AbstractDriverTestCase
 {
     protected function setUp(): void
     {

diff --git a/tests/Functional/Driver/PDO/PgSQL/DriverTest.php b/tests/Functional/Driver/PDO/PgSQL/DriverTest.php
@@ -4,11 +4,11 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\PDO\PgSQL\Driver;
-use Doctrine\DBAL\Tests\Functional\Driver\AbstractPostgreSQLDriverTest;
+use Doctrine\DBAL\Tests\Functional\Driver\AbstractPostgreSQLDriverTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 
 /** @requires extension pdo_pgsql */
-class DriverTest extends AbstractPostgreSQLDriverTest
+class DriverTest extends AbstractPostgreSQLDriverTestCase
 {
     protected function setUp(): void
     {

diff --git a/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php b/tests/Functional/Driver/PDO/SQLSrv/DriverTest.php
@@ -5,14 +5,14 @@
 use Doctrine\DBAL\Driver as DriverInterface;
 use Doctrine\DBAL\Driver\PDO\SQLSrv\Connection;
 use Doctrine\DBAL\Driver\PDO\SQLSrv\Driver;
-use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest;
+use Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 use PDO;
 
 use function array_merge;
 
 /** @requires extension pdo_sqlsrv */
-class DriverTest extends AbstractDriverTest
+class DriverTest extends AbstractDriverTestCase
 {
     protected function setUp(): void
     {