From 7378035f68696b28e95f1d98b82d2b28f8e064c5 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 6 Jun 2016 00:08:26 +0200 Subject: [PATCH] #5849 #5850 correcting test scenario: identity map could not be built with auto-generated identities+persist --- tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index 1e9f0f33c..2e0233ba2 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -14,6 +14,9 @@ use Doctrine\Tests\Mocks\EntityPersisterMock; use Doctrine\Tests\Mocks\UnitOfWorkMock; use Doctrine\Tests\Models\Forum\ForumAvatar; use Doctrine\Tests\Models\Forum\ForumUser; +use Doctrine\Tests\Models\GeoNames\City; +use Doctrine\Tests\Models\GeoNames\Country; +use Doctrine\Tests\OrmTestCase; use stdClass; /** @@ -327,11 +330,8 @@ class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase */ public function testPersistedEntityAndClearManager() { - $entity1 = new ForumUser(); - $entity1->id = 123; - - $entity2 = new ForumAvatar(); - $entity2->id = 456; + $entity1 = new City(123, 'London'); + $entity2 = new Country(456, 'United Kingdom'); $this->_unitOfWork->persist($entity1); $this->assertTrue($this->_unitOfWork->isInIdentityMap($entity1)); @@ -339,7 +339,7 @@ class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase $this->_unitOfWork->persist($entity2); $this->assertTrue($this->_unitOfWork->isInIdentityMap($entity2)); - $this->_unitOfWork->clear(ForumAvatar::class); + $this->_unitOfWork->clear(Country::class); $this->assertTrue($this->_unitOfWork->isInIdentityMap($entity1)); $this->assertFalse($this->_unitOfWork->isInIdentityMap($entity2)); $this->assertTrue($this->_unitOfWork->isScheduledForInsert($entity1));