between and equals

Author: vjik

tests/Common/FixtureTrait.php

@@ -4,28 +4,33 @@
 
 namespace Yiisoft\Data\Tests\Common;
 
+use DateTimeImmutable;
+
 trait FixtureTrait
 {
-    protected static $fixtures = [
-        ['number' => 1, 'email' => 'foo@bar\\baz', 'balance' => 10.25, 'born_at' => null],
-        ['number' => 2, 'email' => 'bar@foo', 'balance' => 1.0, 'born_at' => null],
-        ['number' => 3, 'email' => 'seed@beat', 'balance' => 100.0, 'born_at' => null],
-        ['number' => 4, 'email' => 'the@best', 'balance' => 500.0, 'born_at' => null],
-        ['number' => 5, 'email' => 'test@test', 'balance' => 42.0, 'born_at' => '1990-01-01'],
-    ];
-
     protected function assertFixtures(array $expectedFixtureIndexes, array $actualFixtures): void
     {
         $expectedFixtures = [];
         foreach ($expectedFixtureIndexes as $index) {
             $expectedFixtures[$index] = $this->getFixture($index);
         }
 
-        $this->assertSame($expectedFixtures, $actualFixtures);
+        $this->assertEquals($expectedFixtures, $actualFixtures);
     }
 
     protected function getFixture(int $index): array
     {
-        return self::$fixtures[$index];
+        return $this->getFixtures()[$index];
+    }
+
+    protected function getFixtures(): array
+    {
+        return [
+            ['number' => 1, 'email' => 'foo@bar\\baz', 'balance' => 10.25, 'born_at' => null],
+            ['number' => 2, 'email' => 'bar@foo', 'balance' => 1.0, 'born_at' => null],
+            ['number' => 3, 'email' => 'seed@beat', 'balance' => 100.0, 'born_at' => null],
+            ['number' => 4, 'email' => 'the@best', 'balance' => 500.0, 'born_at' => null],
+            ['number' => 5, 'email' => 'test@test', 'balance' => 42.0, 'born_at' => new DateTimeImmutable('1990-01-01')],
+        ];
     }
 }

tests/Common/Reader/ReaderWithFilter/BaseReaderWithBetweenTestCase.php

@@ -4,14 +4,30 @@
 
 namespace Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter;
 
+use DateTimeImmutable;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Yiisoft\Data\Reader\Filter\Between;
 use Yiisoft\Data\Tests\Common\Reader\BaseReaderTestCase;
 
 abstract class BaseReaderWithBetweenTestCase extends BaseReaderTestCase
 {
-    public function testWithReader(): void
+    public static function dataWithReader(): iterable
     {
-        $reader = $this->getReader()->withFilter(new Between('balance', 10.25, 100.0));
-        $this->assertFixtures([0, 2, 4], $reader->read());
+        yield 'float' => [new Between('balance', 10.25, 100.0), [1, 3, 5]];
+        yield 'datetime' => [new Between('born_at', new DateTimeImmutable('1989-01-01'), new DateTimeImmutable('1991-01-01')), [5]];
+        yield 'datetime 2' => [new Between('born_at', new DateTimeImmutable('1990-01-02'), new DateTimeImmutable('1990-01-03')), []];
+    }
+
+    #[DataProvider('dataWithReader')]
+    public function testWithReader(Between $filter, array $expectedFixtureNumbers): void
+    {
+        $expectedFixtureIndexes = array_map(
+            static fn(int $number): int => $number - 1,
+            $expectedFixtureNumbers,
+        );
+        $this->assertFixtures(
+            $expectedFixtureIndexes,
+            $this->getReader()->withFilter($filter)->read(),
+        );
     }
 }

tests/Common/Reader/ReaderWithFilter/BaseReaderWithEqualsTestCase.php

@@ -4,14 +4,31 @@
 
 namespace Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter;
 
+use DateTimeImmutable;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Yiisoft\Data\Reader\Filter\Equals;
 use Yiisoft\Data\Tests\Common\Reader\BaseReaderTestCase;
 
 abstract class BaseReaderWithEqualsTestCase extends BaseReaderTestCase
 {
-    public function testWithReader(): void
+    public static function dataWithReader(): iterable
     {
-        $reader = $this->getReader()->withFilter(new Equals('number', 2));
-        $this->assertFixtures([1], $reader->read());
+        yield 'integer' => [new Equals('number', 2), [2]];
+        yield 'float' => [new Equals('balance', 10.25), [1]];
+        yield 'string' => [new Equals('email', 'the@best'), [4]];
+        yield 'datetime' => [new Equals('born_at', new DateTimeImmutable('1990-01-01')), [5]];
+    }
+
+    #[DataProvider('dataWithReader')]
+    public function testWithReader(Equals $filter, array $expectedFixtureNumbers): void
+    {
+        $expectedFixtureIndexes = array_map(
+            static fn(int $number): int => $number - 1,
+            $expectedFixtureNumbers,
+        );
+        $this->assertFixtures(
+            $expectedFixtureIndexes,
+            $this->getReader()->withFilter($filter)->read(),
+        );
     }
 }

tests/Reader/Iterable/ReaderWithFilter/ReaderTrait.php

@@ -11,6 +11,6 @@ trait ReaderTrait
 {
     protected function getReader(): DataReaderInterface
     {
-        return new IterableDataReader(self::$fixtures);
+        return new IterableDataReader($this->getFixtures());
     }
 }