Simplify generator setup in tests

alcaeus · alcaeus · commit 0015e6d2c4f9 · 2019-11-13T15:18:12.000+01:00
diff --git a/tests/Model/CachingIteratorTest.php b/tests/Model/CachingIteratorTest.php
@@ -53,7 +53,7 @@ public function testIterationWithEmptySet()
 
     public function testPartialIterationDoesNotExhaust()
     {
-        $traversable = $this->getTraversableThatThrows([1, 2, new Exception()]);
+        $traversable = $this->getTraversable([1, 2, new Exception()]);
         $iterator = new CachingIterator($traversable);
 
         $expectedKey = 0;
@@ -110,13 +110,6 @@ public function testCountWithEmptySet()
     }
 
     private function getTraversable($items)
-    {
-        foreach ($items as $item) {
-            yield $item;
-        }
-    }
-
-    private function getTraversableThatThrows($items)
     {
         foreach ($items as $item) {
             if ($item instanceof Exception) {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function testIterationWithEmptySet()`
`53`	`53`
`54`	`54`	`public function testPartialIterationDoesNotExhaust()`
`55`	`55`	`{`
`56`		`- $traversable = $this->getTraversableThatThrows([1, 2, new Exception()]);`
	`56`	`+ $traversable = $this->getTraversable([1, 2, new Exception()]);`
`57`	`57`	`$iterator = new CachingIterator($traversable);`
`58`	`58`
`59`	`59`	`$expectedKey = 0;`
`@@ -110,13 +110,6 @@ public function testCountWithEmptySet()`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`private function getTraversable($items)`
`113`		`- {`
`114`		`- foreach ($items as $item) {`
`115`		`- yield $item;`
`116`		`- }`
`117`		`- }`
`118`		`-`
`119`		`- private function getTraversableThatThrows($items)`
`120`	`113`	`{`
`121`	`114`	`foreach ($items as $item) {`
`122`	`115`	`if ($item instanceof Exception) {`