From aa6dc9695d8d81c14561606b8634907605ba3c0d Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 7 Sep 2016 23:18:39 +0200 Subject: [PATCH] #5975 minor test cleanups --- .../ORM/Functional/Ticket/GH5762Test.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php index a602921de..b42dd6534 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php @@ -11,10 +11,9 @@ use Doctrine\Tests\OrmFunctionalTestCase; */ class GH5762Test extends OrmFunctionalTestCase { - - protected function setup() + protected function setUp() { - parent::setup(); + parent::setUp(); $this->_schemaTool->createSchema(array( $this->_em->getClassMetadata(GH5762Driver::class), @@ -27,22 +26,23 @@ class GH5762Test extends OrmFunctionalTestCase { $result = $this->fetchData(); - $this->assertInstanceOf(GH5762Driver::class, $result); - $this->assertInstanceOf(PersistentCollection::class, $result->driverRides); - $this->assertInstanceOf(GH5762DriverRide::class, $result->driverRides->get(0)); - $this->assertInstanceOf(GH5762Car::class, $result->driverRides->get(0)->car); + self::assertInstanceOf(GH5762Driver::class, $result); + self::assertInstanceOf(PersistentCollection::class, $result->driverRides); + self::assertInstanceOf(GH5762DriverRide::class, $result->driverRides->get(0)); + self::assertInstanceOf(GH5762Car::class, $result->driverRides->get(0)->car); $cars = array(); foreach ($result->driverRides as $ride) { $cars[] = $ride->car->brand; } - $this->assertEquals(count($cars), count(array_unique($cars))); - $this->assertContains('BMW', $cars); - $this->assertContains('Crysler', $cars); - $this->assertContains('Dodge', $cars); - $this->assertContains('Mercedes', $cars); - $this->assertContains('Volvo', $cars); + self::assertEquals(count($cars), count(array_unique($cars))); + + self::assertContains('BMW', $cars); + self::assertContains('Crysler', $cars); + self::assertContains('Dodge', $cars); + self::assertContains('Mercedes', $cars); + self::assertContains('Volvo', $cars); } private function fetchData()