1
0
mirror of synced 2025-02-03 05:49:25 +03:00

#6303 #6304 simplified tests, removing references to contract naming

This commit is contained in:
Marco Pivetta 2017-08-19 16:51:31 +02:00
parent 328467c226
commit 0882b10213
No known key found for this signature in database
GPG Key ID: 4167D3337FD9D629

View File

@ -55,38 +55,39 @@ class DDC6303Test extends OrmFunctionalTestCase
$b->id => $bData, $b->id => $bData,
]; ];
$contracts = $repository /* @var $entities DDC6303ChildA[]|DDC6303ChildB[] */
$entities = $repository
->createQueryBuilder('p') ->createQueryBuilder('p')
->where('p.id IN(:ids)') ->where('p.id IN(:ids)')
->setParameter('ids', array_keys($dataMap)) ->setParameter('ids', array_keys($dataMap))
->getQuery()->getResult(); ->getQuery()->getResult();
foreach ($contracts as $contract) { foreach ($entities as $entity) {
static::assertEquals( self::assertEquals(
$contract->originalData, $entity->originalData,
$dataMap[$contract->id], $dataMap[$entity->id],
'contract ' . get_class($contract) . ' not equals to original' get_class($entity) . ' not equals to original'
); );
} }
} }
public function testEmptyValuesInJoinedInheritance() public function testEmptyValuesInJoinedInheritance()
{ {
$contractStringEmptyData = ''; $stringEmptyData = '';
$contractStringZeroData = 0; $stringZeroData = 0;
$contractArrayEmptyData = []; $arrayEmptyData = [];
$contractStringEmpty = new DDC6303ChildA(); $stringEmpty = new DDC6303ChildA();
$contractStringZero = new DDC6303ChildA(); $stringZero = new DDC6303ChildA();
$contractArrayEmpty = new DDC6303ChildB(); $arrayEmpty = new DDC6303ChildB();
$contractStringEmpty->originalData = $contractStringEmptyData; $stringEmpty->originalData = $stringEmptyData;
$contractStringZero->originalData = $contractStringZeroData; $stringZero->originalData = $stringZeroData;
$contractArrayEmpty->originalData = $contractArrayEmptyData; $arrayEmpty->originalData = $arrayEmptyData;
$this->_em->persist($contractStringZero); $this->_em->persist($stringZero);
$this->_em->persist($contractStringEmpty); $this->_em->persist($stringEmpty);
$this->_em->persist($contractArrayEmpty); $this->_em->persist($arrayEmpty);
$this->_em->flush(); $this->_em->flush();
@ -96,24 +97,24 @@ class DDC6303Test extends OrmFunctionalTestCase
$repository = $this->_em->getRepository(DDC6303BaseClass::class); $repository = $this->_em->getRepository(DDC6303BaseClass::class);
$dataMap = [ $dataMap = [
$contractStringZero->id => $contractStringZeroData, $stringZero->id => $stringZeroData,
$contractStringEmpty->id => $contractStringEmptyData, $stringEmpty->id => $stringEmptyData,
$contractArrayEmpty->id => $contractArrayEmptyData, $arrayEmpty->id => $arrayEmptyData,
]; ];
/* @var $contracts DDC6303ChildA[]|DDC6303ChildB[] */ /* @var $entities DDC6303ChildA[]|DDC6303ChildB[] */
$contracts = $repository $entities = $repository
->createQueryBuilder('p') ->createQueryBuilder('p')
->where('p.id IN(:ids)') ->where('p.id IN(:ids)')
->setParameter('ids', array_keys($dataMap)) ->setParameter('ids', array_keys($dataMap))
->getQuery() ->getQuery()
->getResult(); ->getResult();
foreach ($contracts as $contract) { foreach ($entities as $entity) {
static::assertEquals( self::assertEquals(
$contract->originalData, $entity->originalData,
$dataMap[$contract->id], $dataMap[$entity->id],
'contract ' . get_class($contract) . ' not equals to original' get_class($entity) . ' not equals to original'
); );
} }
} }