Add tests for handlers (data)

composer.json

@@ -31,7 +31,7 @@
     "prefer-stable": true,
     "require": {
         "php": "^8.1",
-        "yiisoft/data": "dev-master",
+        "yiisoft/data": "dev-tests-reogranization",
         "yiisoft/db": "^1.3"
     },
     "require-dev": {
@@ -56,7 +56,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Yiisoft\\Data\\Db\\Tests\\": "tests"
+            "Yiisoft\\Data\\Db\\Tests\\": "tests",
+            "Yiisoft\\Data\\Tests\\": "vendor/yiisoft/data/tests"
         },
         "files": ["tests/bootstrap.php"]
     },
@@ -76,4 +77,4 @@
         "test": "phpunit --testdox --no-interaction",
         "test-watch": "phpunit-watcher watch"
     }
-}
+}

tests/Base/FilterHandler/AllHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\AllHandlerWithReaderTestTrait;
+
+abstract class AllHandlerTest extends TestCase
+{
+    use AllHandlerWithReaderTestTrait;
+}

tests/Base/FilterHandler/AnyHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\AnyHandlerWithReaderTestTrait;
+
+abstract class AnyHandlerTest extends TestCase
+{
+    use AnyHandlerWithReaderTestTrait;
+}

tests/Base/FilterHandler/BetweenHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\BetweenHandlerWithReaderTestTrait;
+
+abstract class BetweenHandlerTest extends TestCase
+{
+    use BetweenHandlerWithReaderTestTrait;
+}

tests/Base/FilterHandler/EqualsHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\EqualsHandlerWithReaderTestTrait;
+
+abstract class EqualsHandlerTest extends TestCase
+{
+    use EqualsHandlerWithReaderTestTrait;
+}

tests/Base/FilterHandler/EqualsNullHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\EqualsNullHandlerWithReaderTestTrait;
+
+abstract class EqualsNullHandlerTest extends TestCase
+{
+    use EqualsNullHandlerWithReaderTestTrait;
+}

tests/Base/FilterHandler/GreaterThanHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\GreaterThanHandlerWithReaderTestTrait;
+
+abstract class GreaterThanHandlerTest extends TestCase
+{
+    use GreaterThanHandlerWithReaderTestTrait;
+}

tests/Base/FilterHandler/GreaterThanOrEqualHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\GreaterThanOrEqualHandlerWithReaderTestTrait;
+
+abstract class GreaterThanOrEqualHandlerTest extends TestCase
+{
+    use GreaterThanOrEqualHandlerWithReaderTestTrait;
+}

tests/Base/FilterHandler/LessThanHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\LessThanHandlerWithReaderTestTrait;
+
+abstract class LessThanHandlerTest extends TestCase
+{
+    use LessThanHandlerWithReaderTestTrait;
+}

tests/Base/FilterHandler/LessThanOrEqualHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\LessThanOrEqualHandlerWithReaderTestTrait;
+
+abstract class LessThanOrEqualHandlerTest extends TestCase
+{
+    use LessThanOrEqualHandlerWithReaderTestTrait;
+}

tests/Base/FilterHandler/LikeHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\LikeHandlerWithReaderTestTrait;
+
+abstract class LikeHandlerTest extends TestCase
+{
+    use LikeHandlerWithReaderTestTrait;
+}

tests/Base/FilterHandler/NotHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Base\TestCase;
+use Yiisoft\Data\Tests\Common\Reader\FilterHandler\NotHandlerWithReaderTestTrait;
+
+abstract class NotHandlerTest extends TestCase
+{
+    use NotHandlerWithReaderTestTrait;
+}

tests/Base/ReaderTrait.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base;
+
+use Yiisoft\Data\Db\QueryDataReader;
+use Yiisoft\Data\Reader\DataReaderInterface;
+use Yiisoft\Db\Query\Query;
+
+trait ReaderTrait
+{
+
+}

tests/Base/TestCase.php

@@ -4,9 +4,91 @@
 
 namespace Yiisoft\Data\Db\Tests\Base;
 
+use Yiisoft\Data\Db\QueryDataReader;
+use Yiisoft\Data\Reader\DataReaderInterface;
+use Yiisoft\Data\Tests\Common\FixtureTrait;
 use Yiisoft\Db\Driver\Pdo\PdoConnectionInterface;
+use Yiisoft\Db\Query\Query;
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
-    abstract protected function getConnection(): PdoConnectionInterface;
+    use FixtureTrait;
+
+    protected static ?PdoConnectionInterface $connection = null;
+
+    abstract protected function makeConnection(): PdoConnectionInterface;
+
+    protected function getConnection(): PdoConnectionInterface
+    {
+        if (self::$connection === null) {
+            self::$connection = $this->makeConnection();
+        }
+
+        return self::$connection;
+    }
+
+    protected function setUp(): void
+    {
+        $this->populateDatabase();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->dropDatabase();
+    }
+
+    protected function getReader(): DataReaderInterface
+    {
+        /** @var PdoConnectionInterface $db */
+        $db = $this->getConnection();
+
+        return new QueryDataReader((new Query($db))->from('user'));
+    }
+
+    protected function populateDatabase(): void
+    {
+        /** @var PdoConnectionInterface $db */
+        $db = $this->getConnection();
+        if ($db->getSchema()->getTableSchema('user') !== null) {
+            return;
+        }
+
+        $db
+            ->createCommand()
+            ->createTable(
+                'user',
+                [
+                    'id' => 'pk',
+                    'number' => 'integer NOT NULL',
+                    'email' => 'string(255) NOT NULL',
+                    'balance' => 'float NOT NULL DEFAULT 0.0',
+                    'born_at' => 'datetime',
+                ],
+            )
+            ->execute();
+
+
+        $fixtures = self::$fixtures;
+        foreach ($fixtures as $index => $fixture) {
+            $fixtures[$index]['balance'] = (string) $fixtures[$index]['balance'];
+        }
+
+        $db
+            ->createCommand()
+            ->batchInsert(
+                'user',
+                ['number', 'email', 'balance', 'born_at'],
+                $fixtures,
+            )
+            ->execute();
+    }
+
+    protected function dropDatabase(): void
+    {
+        /** @var PdoConnectionInterface $db */
+        $db = $this->getConnection();
+        $db
+            ->createCommand()
+            ->dropTable('{{%user}}');
+    }
 }

tests/Mssql/DatabaseTrait.php

@@ -12,7 +12,7 @@
 
 trait DatabaseTrait
 {
-    protected function getConnection(): PdoConnectionInterface
+    protected function makeConnection(): PdoConnectionInterface
     {
         $database = getenv('YII_MSSQL_DATABASE');
         $host = getenv('YII_MSSQL_HOST');

tests/Mssql/FilterHandler/AllHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+class AllHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AllHandlerTest
+{
+    use DatabaseTrait;
+}
+

tests/Mssql/FilterHandler/AnyHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+class AnyHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\AnyHandlerTest
+{
+    use DatabaseTrait;
+}
+

tests/Mssql/FilterHandler/BetweenHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+class BetweenHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\BetweenHandlerTest
+{
+    use DatabaseTrait;
+}
+

tests/Mssql/FilterHandler/EqualsHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+class EqualsHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsHandlerTest
+{
+    use DatabaseTrait;
+}
+

tests/Mssql/FilterHandler/EqualsNullHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+class EqualsNullHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\EqualsNullHandlerTest
+{
+    use DatabaseTrait;
+}
+

tests/Mssql/FilterHandler/GreaterThanHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+class GreaterThanHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanHandlerTest
+{
+    use DatabaseTrait;
+}
+

tests/Mssql/FilterHandler/GreaterThanOrEqualHandlerTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Mssql\FilterHandler;
+
+use Yiisoft\Data\Db\Tests\Mssql\DatabaseTrait;
+
+class GreaterThanOrEqualHandlerTest extends \Yiisoft\Data\Db\Tests\Base\FilterHandler\GreaterThanOrEqualHandlerTest
+{
+    use DatabaseTrait;
+}
+