Generalize CustomIntrospectionTest

Author: derrabus

tests/Functional/Schema/CustomIntrospectionTest.php

@@ -4,11 +4,8 @@
 
 namespace Doctrine\DBAL\Tests\Functional\Schema;
 
-use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Schema\AbstractSchemaManager;
-use Doctrine\DBAL\Schema\Comparator;
-use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Schema\ColumnDiff;
+use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Tests\Functional\Schema\Types\MoneyType;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Types\Type;
@@ -25,33 +22,17 @@
  */
 class CustomIntrospectionTest extends FunctionalTestCase
 {
-    private AbstractSchemaManager $schemaManager;
-
-    private Comparator $comparator;
-
-    private AbstractPlatform $platform;
-
     public static function setUpBeforeClass(): void
     {
         Type::addType('money', MoneyType::class);
     }
 
-    protected function setUp(): void
-    {
-        $this->platform = $this->connection->getDatabasePlatform();
-
-        if (! $this->platform instanceof AbstractMySQLPlatform) {
-            self::markTestSkipped();
-        }
-
-        $this->schemaManager = $this->connection->createSchemaManager();
-        $this->comparator    = $this->schemaManager->createComparator();
-    }
-
     public function testCustomColumnIntrospection(): void
     {
-        $tableName = 'test_custom_column_introspection';
-        $table     = new Table($tableName);
+        $tableName     = 'test_custom_column_intro';
+        $schemaManager = $this->connection->createSchemaManager();
+        $schema        = new Schema([], [], $schemaManager->createSchemaConfig());
+        $table         = $schema->createTable($tableName);
 
         $table->addColumn('id', 'integer');
         $table->addColumn('quantity', 'decimal');
@@ -63,18 +44,20 @@ public function testCustomColumnIntrospection(): void
 
         $this->dropAndCreateTable($table);
 
-        $onlineTable = $this->schemaManager->introspectTable($tableName);
-
-        $diff        = $this->comparator->compareTables($table, $onlineTable);
-        $changedCols = [];
+        $onlineTable = $schemaManager->introspectTable($tableName);
+        $diff        = $schemaManager->createComparator()->compareTables($onlineTable, $table);
+        $changedCols = array_map(
+            static function (ColumnDiff $columnDiff): ?string {
+                $column = $columnDiff->getOldColumn();
 
-        if (! $diff->isEmpty()) {
-            $changedCols = array_map(static fn ($c) => $c->getOldColumnName()->getName(), $diff->getModifiedColumns());
-        }
+                return $column !== null ? $column->getName() : null;
+            },
+            $diff->getModifiedColumns(),
+        );
 
         self::assertTrue($diff->isEmpty(), sprintf(
             'Tables should be identical. Differences detected in %s.',
-            implode(':', $changedCols),
+            implode(', ', $changedCols),
         ));
     }
 }