WIP

composer.json

@@ -31,7 +31,7 @@
     "prefer-stable": true,
     "require": {
         "php": "^8.1",
-        "yiisoft/data": "dev-tests-reogranization",
+        "yiisoft/data": "dev-master",
         "yiisoft/db": "^1.3"
     },
     "require-dev": {

tests/Base/TestCase.php → tests/Base/DataTrait.php

@@ -10,7 +10,7 @@
 use Yiisoft\Db\Driver\Pdo\PdoConnectionInterface;
 use Yiisoft\Db\Query\Query;
 
-abstract class TestCase extends \PHPUnit\Framework\TestCase
+trait DataTrait
 {
     use FixtureTrait;
 
@@ -45,6 +45,24 @@ protected function getReader(): DataReaderInterface
         return new QueryDataReader((new Query($db))->from('user'));
     }
 
+    protected function assertFixtures(array $expectedFixtureIndexes, array $actualFixtures): void
+    {
+        $processedActualFixtures = [];
+        foreach ($actualFixtures as $fixture) {
+            if (is_object($fixture)) {
+                $fixture = json_decode(json_encode($fixture), associative: true);
+            }
+
+            unset($fixture['id']);
+            $fixture['number'] = (int) $fixture['number'];
+            $fixture['balance'] = (float) $fixture['balance'];
+
+            $processedActualFixtures[$fixture['number'] - 1] = $fixture;
+        }
+
+        parent::assertFixtures($expectedFixtureIndexes, $processedActualFixtures);
+    }
+
     protected function populateDatabase(): void
     {
         /** @var PdoConnectionInterface $db */

tests/Base/QueryDataReaderTest.php

@@ -6,6 +6,7 @@
 
 use DateTime;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
 use Yiisoft\Data\Db\QueryDataReader;
 use Yiisoft\Data\Db\Tests\Support\CustomerDataReader;
 use Yiisoft\Data\Db\Tests\Support\CustomerDTO;
@@ -28,6 +29,8 @@
 
 abstract class QueryDataReaderTest extends TestCase
 {
+    use DataTrait;
+
     public function testDataReader(): void
     {
         $db = $this->getConnection();

tests/Base/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithAllTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithAllTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithAnyTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithAnyTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithAnyTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithBetweenTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithBetweenTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithBetweenTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsNullTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithEqualsNullTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithEqualsNullTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithEqualsTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithEqualsTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanOrEqualTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithGreaterThanOrEqualTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithGreaterThanOrEqualTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithGreaterThanTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithGreaterThanTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithInTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithInTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithInTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanOrEqualTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithLessThanOrEqualTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithLessThanOrEqualTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithLessThanTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithLessThanTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithLikeTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithLikeTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithLikeTestCase
+{
+    use DataTrait;
+}

tests/Base/Reader/ReaderWithFilter/BaseReaderWithNotTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Db\Tests\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Db\Tests\Base\DataTrait;
+
+abstract class BaseReaderWithNotTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithNotTestCase
+{
+    use DataTrait;
+}