tests updated

Author: Smoren

tests/unit/ArrayView/ReadTest.php

@@ -42,6 +42,24 @@ public function testReadCombined(array $source, callable $viewGetter, array $exp
         $this->assertSame($view->toArray(), $expected);
     }
 
+    /**
+     * @dataProvider dataProviderForIsAndFilter
+     */
+    public function testIsAndFilter(array $source, callable $predicate, array $expectedMask, array $expectedArray)
+    {
+        // Given
+        $view = ArrayView::toView($source);
+
+        // When
+        $boolMask = $view->is($predicate);
+        $filtered = $view->filter($predicate);
+
+        // Then
+        $this->assertSame($expectedMask, $boolMask->getValue());
+        $this->assertSame($expectedArray, $view->subview($boolMask)->toArray());
+        $this->assertSame($expectedArray, $filtered->toArray());
+    }
+
     public function dataProviderForArrayRead(): array
     {
         return [
@@ -174,4 +192,34 @@ public function dataProviderForReadCombine(): array
             ],
         ];
     }
+
+    public function dataProviderForIsAndFilter(): array
+    {
+        return [
+            [
+                [],
+                fn (int $x) => $x % 2 === 0,
+                [],
+                [],
+            ],
+            [
+                [1],
+                fn (int $x) => $x % 2 === 0,
+                [false],
+                [],
+            ],
+            [
+                [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+                fn (int $x) => $x % 2 === 0,
+                [false, true, false, true, false, true, false, true, false, true],
+                [2, 4, 6, 8, 10],
+            ],
+            [
+                [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+                fn (int $_, int $i) => $i % 2 === 0,
+                [true, false, true, false, true, false, true, false, true, false],
+                [1, 3, 5, 7, 9],
+            ],
+        ];
+    }
 }

tests/unit/ArrayView/WriteTest.php

@@ -158,24 +158,6 @@ public function testApplyWith(array $source, callable $viewGetter, callable $map
         $this->assertSame($expected, $source);
     }
 
-    /**
-     * @dataProvider dataProviderForIsAndFilter
-     */
-    public function testIsAndFilter(array $source, callable $predicate, array $expectedMask, array $expectedArray)
-    {
-        // Given
-        $view = ArrayView::toView($source);
-
-        // When
-        $boolMask = $view->is($predicate);
-        $filtered = $view->filter($predicate);
-
-        // Then
-        $this->assertSame($expectedMask, $boolMask->getValue());
-        $this->assertSame($expectedArray, $view->subview($boolMask)->toArray());
-        $this->assertSame($expectedArray, $filtered->toArray());
-    }
-
     public function dataProviderForArrayWrite(): array
     {
         return [
@@ -400,34 +382,4 @@ public function dataProviderForApplyWith(): array
             ],
         ];
     }
-
-    public function dataProviderForIsAndFilter(): array
-    {
-        return [
-            [
-                [],
-                fn (int $x) => $x % 2 === 0,
-                [],
-                [],
-            ],
-            [
-                [1],
-                fn (int $x) => $x % 2 === 0,
-                [false],
-                [],
-            ],
-            [
-                [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-                fn (int $x) => $x % 2 === 0,
-                [false, true, false, true, false, true, false, true, false, true],
-                [2, 4, 6, 8, 10],
-            ],
-            [
-                [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
-                fn (int $_, int $i) => $i % 2 === 0,
-                [true, false, true, false, true, false, true, false, true, false],
-                [1, 3, 5, 7, 9],
-            ],
-        ];
-    }
 }