improve

Author: vjik

tests/ColumnTest.php

@@ -15,6 +15,7 @@
 use Yiisoft\Db\Oracle\Column\ColumnBuilder;
 use Yiisoft\Db\Oracle\Column\JsonColumn;
 use Yiisoft\Db\Oracle\Tests\Provider\ColumnProvider;
+use Yiisoft\Db\Oracle\Tests\Support\Fixture\FixtureDump;
 use Yiisoft\Db\Oracle\Tests\Support\IntegrationTestTrait;
 use Yiisoft\Db\Oracle\Tests\Support\TestConnection;
 use Yiisoft\Db\Query\Query;
@@ -41,10 +42,7 @@ public function testQueryWithTypecasting(): void
         $db = $this->getSharedConnection();
         $isOldVersion = version_compare(TestConnection::getServerVersion(), '21', '<');
 
-        $this->loadFixture(
-            __DIR__ . '/Support/Fixture/'
-            . ($isOldVersion ? 'oci.sql' : 'oci21.sql'),
-        );
+        $this->loadFixture($isOldVersion ? FixtureDump::DEFAULT : FixtureDump::OCI21);
 
         $this->insertTypeValues($db);
 
@@ -66,10 +64,7 @@ public function testCommandWithPhpTypecasting(): void
         $db = $this->getSharedConnection();
         $isOldVersion = version_compare(TestConnection::getServerVersion(), '21', '<');
 
-        $this->loadFixture(
-            __DIR__ . '/Support/Fixture/'
-            . ($isOldVersion ? 'oci.sql' : 'oci21.sql'),
-        );
+        $this->loadFixture($isOldVersion ? FixtureDump::DEFAULT : FixtureDump::OCI21);
 
         $this->insertTypeValues($db);
 
@@ -137,10 +132,7 @@ public function testPhpTypecast(): void
         $db = $this->getSharedConnection();
         $isOldVersion = version_compare(TestConnection::getServerVersion(), '21', '<');
 
-        $this->loadFixture(
-            __DIR__ . '/Support/Fixture/'
-            . ($isOldVersion ? 'oci.sql' : 'oci21.sql'),
-        );
+        $this->loadFixture($isOldVersion ? FixtureDump::DEFAULT : FixtureDump::OCI21);
 
         parent::testPhpTypecast();
     }
@@ -150,10 +142,7 @@ public function testColumnInstance(): void
         $db = $this->getSharedConnection();
         $isOldVersion = version_compare(TestConnection::getServerVersion(), '21', '<');
 
-        $this->loadFixture(
-            __DIR__ . '/Support/Fixture/'
-            . ($isOldVersion ? 'oci.sql' : 'oci21.sql'),
-        );
+        $this->loadFixture($isOldVersion ? FixtureDump::DEFAULT : FixtureDump::OCI21);
 
         $schema = $db->getSchema();
         $tableSchema = $schema->getTableSchema('type');

tests/CommandTest.php

@@ -15,6 +15,7 @@
 use Yiisoft\Db\Oracle\Column\ColumnBuilder;
 use Yiisoft\Db\Oracle\IndexType;
 use Yiisoft\Db\Oracle\Tests\Provider\CommandProvider;
+use Yiisoft\Db\Oracle\Tests\Support\Fixture\FixtureDump;
 use Yiisoft\Db\Oracle\Tests\Support\IntegrationTestTrait;
 use Yiisoft\Db\Oracle\Tests\Support\TestConnection;
 use Yiisoft\Db\Query\Query;
@@ -63,10 +64,7 @@ public function testBatchInsert(
         $version = $db->getServerInfo()->getVersion();
         $isOldVersion = version_compare($version, '21', '<');
 
-        $this->loadFixture(
-            __DIR__ . '/Support/Fixture/'
-            . ($isOldVersion ? 'oci.sql' : 'oci21.sql'),
-        );
+        $this->loadFixture($isOldVersion ? FixtureDump::DEFAULT : FixtureDump::OCI21);
 
         parent::testBatchInsert($table, $values, $columns, $expected, $expectedParams, $insertedRow);
     }

tests/SchemaTest.php

@@ -13,6 +13,7 @@
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Oracle\Schema;
 use Yiisoft\Db\Oracle\Tests\Provider\SchemaProvider;
+use Yiisoft\Db\Oracle\Tests\Support\Fixture\FixtureDump;
 use Yiisoft\Db\Oracle\Tests\Support\IntegrationTestTrait;
 use Yiisoft\Db\Oracle\Tests\Support\TestConnection;
 use Yiisoft\Db\Schema\Column\ColumnInterface;
@@ -35,7 +36,7 @@ public function testColumns(array $columns, string $tableName = 'type', ?string
         $version21 = version_compare(TestConnection::getServerVersion(), '21', '>=');
 
         if ($version21 && $tableName === 'type') {
-            $dump = __DIR__ . '/Support/Fixture/oci21.sql';
+            $dump = FixtureDump::OCI21;
             $columns['json_col']->dbType('json');
             $columns['json_col']->check(null);
         }

tests/Support/Fixture/FixtureDump.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Oracle\Tests\Support\Fixture;
+
+final class FixtureDump
+{
+    public const DEFAULT = __DIR__ . '/oci.sql';
+    public const OCI21 = __DIR__ . '/oci21.sql';
+}

tests/Support/IntegrationTestTrait.php

@@ -5,6 +5,7 @@
 namespace Yiisoft\Db\Oracle\Tests\Support;
 
 use Yiisoft\Db\Oracle\Connection;
+use Yiisoft\Db\Oracle\Tests\Support\Fixture\FixtureDump;
 use Yiisoft\Db\Tests\Support\TestHelper;
 
 trait IntegrationTestTrait
@@ -19,7 +20,7 @@ protected function createConnection(): Connection
 
     protected function getDefaultFixture(): string
     {
-        return __DIR__ . '/Fixture/oci.sql';
+        return FixtureDump::DEFAULT;
     }
 
     protected function replaceQuotes(string $sql): string