diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php index 090a172a9..f0ea53fe8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php @@ -18,7 +18,8 @@ class Ticket4646InstanceOfAbstractTest extends OrmFunctionalTestCase public function testInstanceOf() { - $this->loadData(); + $this->_em->persist(new EmployeeTicket4646Abstract()); + $this->_em->flush(); $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646Abstract p WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646Abstract'; @@ -26,23 +27,7 @@ class Ticket4646InstanceOfAbstractTest extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertCount(1, $result); - - foreach ($result as $r) { - $this->assertInstanceOf(PersonTicket4646Abstract::class, $r); - $this->assertInstanceOf(EmployeeTicket4646Abstract::class, $r); - $this->assertSame('bar', $r->getName()); - } - } - - private function loadData() - { - $employee = new EmployeeTicket4646Abstract(); - $employee->setName('bar'); - $employee->setDepartement('qux'); - - $this->_em->persist($employee); - - $this->_em->flush($employee); + $this->assertContainsOnlyInstancesOf(PersonTicket4646Abstract::class, $result); } } @@ -64,25 +49,10 @@ abstract class PersonTicket4646Abstract */ private $id; - /** - * @Column(type="string") - */ - private $name; - public function getId() { return $this->id; } - - public function getName() - { - return $this->name; - } - - public function setName($name) - { - $this->name = $name; - } } /** @@ -91,18 +61,4 @@ abstract class PersonTicket4646Abstract */ class EmployeeTicket4646Abstract extends PersonTicket4646Abstract { - /** - * @Column(type="string") - */ - private $departement; - - public function getDepartement() - { - return $this->departement; - } - - public function setDepartement($departement) - { - $this->departement = $departement; - } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php index 649de27bb..6e4160b24 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php @@ -19,7 +19,10 @@ class Ticket4646InstanceOfMultiLevelTest extends OrmFunctionalTestCase public function testInstanceOf() { - $this->loadData(); + $this->_em->persist(new PersonTicket4646MultiLevel()); + $this->_em->persist(new EmployeeTicket4646MultiLevel()); + $this->_em->persist(new EngineerTicket4646MultiLevel()); + $this->_em->flush(); $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646MultiLevel p WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646MultiLevel'; @@ -27,40 +30,7 @@ class Ticket4646InstanceOfMultiLevelTest extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertCount(3, $result); - - foreach ($result as $r) { - $this->assertInstanceOf(PersonTicket4646MultiLevel::class, $r); - if ($r instanceof EngineerTicket4646MultiLevel) { - $this->assertEquals('foobar', $r->getName()); - $this->assertEquals('doctrine', $r->getSpecialization()); - } elseif ($r instanceof EmployeeTicket4646MultiLevel) { - $this->assertEquals('bar', $r->getName()); - $this->assertEquals('qux', $r->getDepartement()); - } else { - $this->assertEquals('foo', $r->getName()); - } - } - } - - private function loadData() - { - $person = new PersonTicket4646MultiLevel(); - $person->setName('foo'); - - $employee = new EmployeeTicket4646MultiLevel(); - $employee->setName('bar'); - $employee->setDepartement('qux'); - - $engineer = new EngineerTicket4646MultiLevel(); - $engineer->setName('foobar'); - $engineer->setDepartement('dep'); - $engineer->setSpecialization('doctrine'); - - $this->_em->persist($person); - $this->_em->persist($employee); - $this->_em->persist($engineer); - - $this->_em->flush(array($person, $employee, $engineer)); + $this->assertContainsOnlyInstancesOf(PersonTicket4646MultiLevel::class, $result); } } @@ -84,25 +54,10 @@ class PersonTicket4646MultiLevel */ private $id; - /** - * @Column(type="string") - */ - private $name; - public function getId() { return $this->id; } - - public function getName() - { - return $this->name; - } - - public function setName($name) - { - $this->name = $name; - } } /** @@ -111,20 +66,6 @@ class PersonTicket4646MultiLevel */ class EmployeeTicket4646MultiLevel extends PersonTicket4646MultiLevel { - /** - * @Column(type="string") - */ - private $departement; - - public function getDepartement() - { - return $this->departement; - } - - public function setDepartement($departement) - { - $this->departement = $departement; - } } /** @@ -133,18 +74,4 @@ class EmployeeTicket4646MultiLevel extends PersonTicket4646MultiLevel */ class EngineerTicket4646MultiLevel extends EmployeeTicket4646MultiLevel { - /** - * @Column(type="string") - */ - private $specialization; - - public function getSpecialization() - { - return $this->specialization; - } - - public function setSpecialization($specialization) - { - $this->specialization = $specialization; - } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php index a83e6e733..363611d4d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php @@ -18,7 +18,9 @@ class Ticket4646InstanceOfTest extends OrmFunctionalTestCase public function testInstanceOf() { - $this->loadData(); + $this->_em->persist(new PersonTicket4646()); + $this->_em->persist(new EmployeeTicket4646()); + $this->_em->flush(); $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646 p WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646'; @@ -26,30 +28,7 @@ class Ticket4646InstanceOfTest extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertCount(2, $result); - - foreach ($result as $r) { - $this->assertInstanceOf(PersonTicket4646::class, $r); - if ($r instanceof EmployeeTicket4646) { - $this->assertEquals('bar', $r->getName()); - } else { - $this->assertEquals('foo', $r->getName()); - } - } - } - - private function loadData() - { - $person = new PersonTicket4646(); - $person->setName('foo'); - - $employee = new EmployeeTicket4646(); - $employee->setName('bar'); - $employee->setDepartement('qux'); - - $this->_em->persist($person); - $this->_em->persist($employee); - - $this->_em->flush(array($person, $employee)); + $this->assertContainsOnlyInstancesOf(PersonTicket4646::class, $result); } } @@ -72,25 +51,10 @@ class PersonTicket4646 */ private $id; - /** - * @Column(type="string") - */ - private $name; - public function getId() { return $this->id; } - - public function getName() - { - return $this->name; - } - - public function setName($name) - { - $this->name = $name; - } } /** @@ -99,18 +63,4 @@ class PersonTicket4646 */ class EmployeeTicket4646 extends PersonTicket4646 { - /** - * @Column(type="string") - */ - private $departement; - - public function getDepartement() - { - return $this->departement; - } - - public function setDepartement($departement) - { - $this->departement = $departement; - } }