Remove src\TestSupport\TestColumnSchemaBuilderTrait from yiisoft\db. (#151)

terabytesoftw · web-flow · commit cf7f4b5f31df · 2022-12-07T17:29:48.000-03:00
* Remove src\TestSupport\TestColumnSchemaBuilderTrait from yiisoft\db.
diff --git a/tests/ColumnSchemaBuilderTest.php b/tests/ColumnSchemaBuilderTest.php
@@ -4,41 +4,22 @@
 
 namespace Yiisoft\Db\Sqlite\Tests;
 
-use Yiisoft\Db\Sqlite\ColumnSchemaBuilder;
-use Yiisoft\Db\Sqlite\Schema;
-use Yiisoft\Db\TestSupport\TestColumnSchemaBuilderTrait;
+use Yiisoft\Db\Sqlite\Tests\Support\TestTrait;
+use Yiisoft\Db\Tests\Common\CommonColumnSchemaBuilderTest;
 
 /**
  * @group sqlite
+ *
+ * @psalm-suppress PropertyNotSetInConstructor
  */
-final class ColumnSchemaBuilderTest extends TestCase
+final class ColumnSchemaBuilderTest extends CommonColumnSchemaBuilderTest
 {
-    use TestColumnSchemaBuilderTrait;
-
-    public function getColumnSchemaBuilder($type, $length = null): ColumnSchemaBuilder
-    {
-        return new ColumnSchemaBuilder($type, $length);
-    }
-
-    public function typesProvider(): array
-    {
-        return [
-            ['integer UNSIGNED', Schema::TYPE_INTEGER, null, [
-                ['unsigned'],
-            ]],
-            ['integer(10) UNSIGNED', Schema::TYPE_INTEGER, 10, [
-                ['unsigned'],
-            ]],
-            ['integer(10)', Schema::TYPE_INTEGER, 10, [
-                ['comment', 'test'],
-            ]],
-        ];
-    }
+    use TestTrait;
 
     /**
-     * @dataProvider typesProvider
+     * @dataProvider \Yiisoft\Db\Sqlite\Tests\Provider\ColumnSchemaBuilderProvider::types();
      */
-    public function testCustomTypes(string $expected, string $type, ?int $length, mixed $calls): void
+    public function testCustomTypes(string $expected, string $type, int|null $length, array $calls): void
     {
         $this->checkBuildString($expected, $type, $length, $calls);
     }
diff --git a/tests/Provider/ColumnSchemaBuilderProvider.php b/tests/Provider/ColumnSchemaBuilderProvider.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Sqlite\Tests\Provider;
+
+use Yiisoft\Db\Schema\Schema;
+use Yiisoft\Db\Tests\Provider\AbstractColumnSchemaBuilderProvider;
+
+final class ColumnSchemaBuilderProvider extends AbstractColumnSchemaBuilderProvider
+{
+    public function types(): array
+    {
+        $types = parent::types();
+
+        $types[0][0] = 'integer UNSIGNED NULL DEFAULT NULL';
+        $types[1][0] = 'integer(10) UNSIGNED';
+
+        return array_merge(
+            $types,
+            [
+                ['integer UNSIGNED', Schema::TYPE_INTEGER, null, [['unsigned']]],
+            ],
+        );
+    }
+}
