Merge pull request doctrine#7440 from carusogabriel/dedicated-assertions

Use dedicated assertContainsOnlyInstancesOf PHPUnit assertion
aivus · Oct 30, 2018 · d81284b · d81284b
2 parents 91346c4 + b0825e4
commit d81284b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 26 deletions.
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheJoinTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheJoinTableInheritanceTest.php
@@ -151,10 +151,7 @@ public function testQueryCacheFindAllJoinTableEntities() : void
 
         self::assertCount(count($this->attractionsInfo), $result2);
         self::assertEquals($queryCount + 1, $this->getCurrentQueryCount());
-
-        foreach ($result2 as $entity) {
-            self::assertInstanceOf(AttractionInfo::class, $entity);
-        }
+        self::assertContainsOnlyInstancesOf(AttractionInfo::class, $result2);
     }
 
     public function testOneToManyRelationJoinTable() : void
@@ -231,9 +228,6 @@ public function testQueryCacheShouldBeEvictedOnTimestampUpdate() : void
 
         self::assertCount(count($this->attractionsInfo) + 1, $result2);
         self::assertEquals($queryCount + 6, $this->getCurrentQueryCount());
-
-        foreach ($result2 as $entity) {
-            self::assertInstanceOf(AttractionInfo::class, $entity);
-        }
+        self::assertContainsOnlyInstancesOf(AttractionInfo::class, $result2);
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php
@@ -1151,9 +1151,6 @@ public function testQueryCacheShouldBeEvictedOnTimestampUpdate() : void
 
         self::assertCount(3, $result2);
         self::assertEquals($queryCount + 1, $this->getCurrentQueryCount());
-
-        foreach ($result2 as $entity) {
-            self::assertInstanceOf(Country::class, $entity);
-        }
+        self::assertContainsOnlyInstancesOf(Country::class, $result2);
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheSingleTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheSingleTableInheritanceTest.php
@@ -145,10 +145,7 @@ public function testQueryCacheFindAll() : void
 
         self::assertCount(count($this->attractions), $result2);
         self::assertEquals($queryCount + 1, $this->getCurrentQueryCount());
-
-        foreach ($result2 as $entity) {
-            self::assertInstanceOf(Attraction::class, $entity);
-        }
+        self::assertContainsOnlyInstancesOf(Attraction::class, $result2);
     }
 
     public function testShouldNotPutOneToManyRelationOnPersist() : void
@@ -251,9 +248,6 @@ public function testQueryCacheShouldBeEvictedOnTimestampUpdate() : void
 
         self::assertCount(count($this->attractions) + 1, $result2);
         self::assertEquals($queryCount + 1, $this->getCurrentQueryCount());
-
-        foreach ($result2 as $entity) {
-            self::assertInstanceOf(Attraction::class, $entity);
-        }
+        self::assertContainsOnlyInstancesOf(Attraction::class, $result2);
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1685Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1685Test.php
@@ -45,9 +45,7 @@ public function testPaginateCount() : void
 
     public function testPaginateIterate() : void
     {
-        foreach ($this->paginator as $ad) {
-            self::assertInstanceOf(DDC117ArticleDetails::class, $ad);
-        }
+        self::assertContainsOnlyInstancesOf(DDC117ArticleDetails::class, $this->paginator);
     }
 
     public function testPaginateCountNoOutputWalkers() : void
@@ -64,8 +62,6 @@ public function testPaginateIterateNoOutputWalkers() : void
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('Paginating an entity with foreign key as identifier only works when using the Output Walkers. Call Paginator#setUseOutputWalkers(true) before iterating the paginator.');
 
-        foreach ($this->paginator as $ad) {
-            self::assertInstanceOf(DDC117ArticleDetails::class, $ad);
-        }
+        self::assertContainsOnlyInstancesOf(DDC117ArticleDetails::class, $this->paginator);
     }
 }