From 61cb03bf3057e55845b40d2c6b869e8ee3662754 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 11 Aug 2017 19:08:24 +0200 Subject: [PATCH] #6613 #6614 #6616 removing repeated `PersistentCollectionTest` chunks of code --- .../Tests/ORM/PersistentCollectionTest.php | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php index 40a360094..3b301fcf0 100644 --- a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php @@ -34,6 +34,8 @@ class PersistentCollectionTest extends OrmTestCase parent::setUp(); $this->_emMock = EntityManagerMock::create(new ConnectionMock([], new DriverMock())); + + $this->setUpPersistentCollection(); } /** @@ -60,7 +62,6 @@ class PersistentCollectionTest extends OrmTestCase */ public function testCurrentInitializesCollection() { - $this->setUpPersistentCollection(); $this->collection->current(); $this->assertTrue($this->collection->isInitialized()); } @@ -70,7 +71,6 @@ class PersistentCollectionTest extends OrmTestCase */ public function testKeyInitializesCollection() { - $this->setUpPersistentCollection(); $this->collection->key(); $this->assertTrue($this->collection->isInitialized()); } @@ -80,7 +80,6 @@ class PersistentCollectionTest extends OrmTestCase */ public function testNextInitializesCollection() { - $this->setUpPersistentCollection(); $this->collection->next(); $this->assertTrue($this->collection->isInitialized()); } @@ -90,8 +89,6 @@ class PersistentCollectionTest extends OrmTestCase */ public function testRemovingElementsAlsoRemovesKeys() { - $this->setUpPersistentCollection(); - $dummy = new \stdClass(); $this->collection->add($dummy); @@ -106,8 +103,6 @@ class PersistentCollectionTest extends OrmTestCase */ public function testClearWillAlsoClearKeys() { - $this->setUpPersistentCollection(); - $this->collection->add(new \stdClass()); $this->collection->clear(); $this->assertEquals([], array_keys($this->collection->toArray())); @@ -118,8 +113,6 @@ class PersistentCollectionTest extends OrmTestCase */ public function testClearWillAlsoResetKeyPositions() { - $this->setUpPersistentCollection(); - $dummy = new \stdClass(); $this->collection->add($dummy); @@ -141,8 +134,6 @@ class PersistentCollectionTest extends OrmTestCase $this->_emMock->setUnitOfWork($unitOfWork); - $this->setUpPersistentCollection(); - $newElement = new \stdClass(); $persistedElement = new \stdClass(); @@ -178,8 +169,6 @@ class PersistentCollectionTest extends OrmTestCase $this->_emMock->setUnitOfWork($unitOfWork); - $this->setUpPersistentCollection(); - $newElement = new \stdClass(); $newElementThatIsAlsoPersisted = new \stdClass(); $persistedElement = new \stdClass();