Remove src\TestSupport\TestColumnSchemaBuilderTrait from yiisoft\db. (#…

…119) * Remove src\TestSupport\TestColumnSchemaBuilderTrait from yiisoft\db.
yiisoft · Dec 7, 2022 · 559ca9d · 559ca9d
1 parent dfead62
commit 559ca9d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 21 deletions.
diff --git a/tests/ColumnSchemaBuilderTest.php b/tests/ColumnSchemaBuilderTest.php
@@ -4,35 +4,22 @@
 
 namespace Yiisoft\Db\Oracle\Tests;
 
-use Yiisoft\Db\TestSupport\TestColumnSchemaBuilderTrait;
-use Yiisoft\Db\Oracle\Schema;
+use Yiisoft\Db\Oracle\Tests\Support\TestTrait;
+use Yiisoft\Db\Tests\Common\CommonColumnSchemaBuilderTest;
 
 /**
  * @group oracle
+ *
+ * @psalm-suppress PropertyNotSetInConstructor
  */
-final class ColumnSchemaBuilderTest extends TestCase
+final class ColumnSchemaBuilderTest extends CommonColumnSchemaBuilderTest
 {
-    use TestColumnSchemaBuilderTrait;
+    use TestTrait;
 
     /**
-     * @return array
+     * @dataProvider \Yiisoft\Db\Oracle\Tests\Provider\ColumnSchemaBuilderProvider::types();
      */
-    public function typesProvider()
-    {
-        return [
-            ['integer UNSIGNED', Schema::TYPE_INTEGER, null, [
-                ['unsigned'],
-            ]],
-            ['integer(10) UNSIGNED', Schema::TYPE_INTEGER, 10, [
-                ['unsigned'],
-            ]],
-        ];
-    }
-
-    /**
-     * @dataProvider typesProviderTrait
-     */
-    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\Oracle\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 DEFAULT NULL NULL';
+        $types[1][0] = 'integer(10) UNSIGNED';
+
+        return array_merge(
+            $types,
+            [
+                ['integer UNSIGNED', Schema::TYPE_INTEGER, null, [['unsigned']]],
+            ],
+        );
+    }
+}