Refactored test so coverage of constructor is evaluated

Author: yann-eugone

src/batch/tests/Job/Item/Reader/IndexWithReaderTest.php

@@ -5,18 +5,60 @@
 namespace Yokai\Batch\Tests\Job\Item\Reader;
 
 use ArrayIterator;
-use Generator;
 use PHPUnit\Framework\TestCase;
 use Yokai\Batch\Job\Item\Reader\IndexWithReader;
 use Yokai\Batch\Job\Item\Reader\StaticIterableReader;
 use Yokai\Batch\JobExecution;
 
 class IndexWithReaderTest extends TestCase
 {
-    /**
-     * @dataProvider provider
-     */
-    public function test(IndexWithReader $reader, array $expected): void
+    public function testArrayKey(): void
+    {
+        $john = ['name' => 'John', 'location' => 'Washington'];
+        $marie = ['name' => 'Marie', 'location' => 'London'];
+        $reader = IndexWithReader::withArrayKey(
+            new StaticIterableReader([$john, $marie]),
+            'name'
+        );
+
+        $this->doTest($reader, ['John' => $john, 'Marie' => $marie]);
+    }
+
+    public function testObjectProperty(): void
+    {
+        $john = (object)['name' => 'John', 'location' => 'Washington'];
+        $marie = (object)['name' => 'Marie', 'location' => 'London'];
+        $reader = IndexWithReader::withProperty(
+            new StaticIterableReader([$john, $marie]),
+            'name'
+        );
+
+        $this->doTest($reader, ['John' => $john, 'Marie' => $marie]);
+    }
+
+    public function testObjectGetter(): void
+    {
+        $three = new ArrayIterator([1, 2, 3]);
+        $six = new ArrayIterator([1, 2, 3, 4, 5, 6]);
+        $reader = IndexWithReader::withGetter(
+            new StaticIterableReader([$three, $six]),
+            'count'
+        );
+
+        $this->doTest($reader, [3 => $three, 6 => $six]);
+    }
+
+    public function testArbitraryClosure(): void
+    {
+        $reader = new IndexWithReader(
+            new StaticIterableReader([1, 2, 3]),
+            fn(int $value) => $value * $value
+        );
+
+        $this->doTest($reader, [1 => 1, 4 => 2, 9 => 3]);
+    }
+
+    private function doTest(IndexWithReader $reader, array $expected): void
     {
         $reader->setJobExecution(JobExecution::createRoot('123456', 'testing'));
         $reader->initialize();
@@ -30,45 +72,4 @@ public function test(IndexWithReader $reader, array $expected): void
 
         self::assertSame($expected, $actual);
     }
-
-    public function provider(): Generator
-    {
-        $john = ['name' => 'John', 'location' => 'Washington'];
-        $marie = ['name' => 'Marie', 'location' => 'London'];
-        yield 'Index with array key' => [
-            IndexWithReader::withArrayKey(
-                new StaticIterableReader([$john, $marie]),
-                'name'
-            ),
-            ['John' => $john, 'Marie' => $marie],
-        ];
-
-        $john = (object)$john;
-        $marie = (object)$marie;
-        yield 'Index with object property' => [
-            IndexWithReader::withProperty(
-                new StaticIterableReader([$john, $marie]),
-                'name'
-            ),
-            ['John' => $john, 'Marie' => $marie],
-        ];
-
-        $three = new ArrayIterator([1, 2, 3]);
-        $six = new ArrayIterator([1, 2, 3, 4, 5, 6]);
-        yield 'Index with object method' => [
-            IndexWithReader::withGetter(
-                new StaticIterableReader([$three, $six]),
-                'count'
-            ),
-            [3 => $three, 6 => $six],
-        ];
-
-        yield 'Index with arbitrary closure' => [
-            new IndexWithReader(
-                new StaticIterableReader([1, 2, 3]),
-                fn(int $value) => $value * $value
-            ),
-            [1 => 1, 4 => 2, 9 => 3],
-        ];
-    }
 }