RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-10 17:29:27 +03:00
Code Issues Projects Releases Wiki Activity

Correcting test case: expecting identifier hashes to support empty strings

Browse Source
This commit is contained in:
Marco Pivetta 2016-07-07 19:34:24 +02:00
parent 12789ee6ca
commit 549bfe127c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
View File

@ -368,10 +368,11 @@ class UnitOfWorkTest extends OrmTestCase
* @dataProvider entitiesWithValidIdentifiersProvider * @dataProvider entitiesWithValidIdentifiersProvider
* *
* @param object $entity * @param object $entity
* @param string $idHash
* *
* @return void * @return void
*/ */
public function testAddToIdentityMapValidIdentifiers($entity) public function testAddToIdentityMapValidIdentifiers($entity, $idHash)
{ {
$this->_unitOfWork->registerManaged( $this->_unitOfWork->registerManaged(
$entity, $entity,
@ -380,9 +381,8 @@ class UnitOfWorkTest extends OrmTestCase
); );
$this->_unitOfWork->addToIdentityMap($entity); $this->_unitOfWork->addToIdentityMap($entity);
self::assertInternalType('string', $this->_unitOfWork->getEntityIdentifier($entity));
// note: cloning to avoid lookup by spl_object_hash() // note: cloning to avoid lookup by spl_object_hash()
self::assertTrue($this->_unitOfWork->isInIdentityMap(clone $entity)); self::assertSame($entity, $this->_unitOfWork->getByIdHash($idHash, get_class($entity)));
} }
public function entitiesWithValidIdentifiersProvider() public function entitiesWithValidIdentifiersProvider()
@ -395,9 +395,15 @@ class UnitOfWorkTest extends OrmTestCase
$nonEmptyString->id = uniqid('', true); $nonEmptyString->id = uniqid('', true);
$emptyStrings = new EntityWithCompositeStringIdentifier();
$emptyStrings->id1 = '';
$emptyStrings->id2 = '';
return [ return [
'empty string, single field' => [$emptyString], 'empty string, single field' => [$emptyString, ''],
'non-empty string, single field' => [$nonEmptyString], 'non-empty string, single field' => [$nonEmptyString, $nonEmptyString->id],
'empty strings, two fields' => [$emptyStrings, ' '],
]; ];
} }
} }