From 6bc405455ec6c397139189a5f0be918cc2f48399 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 15 Jul 2015 21:51:04 +0100 Subject: [PATCH] DDC-3699 - #1387 - leveraging the `OrmFunctionalTestCase` API --- .../Tests/ORM/Functional/Ticket/DDC3699Test.php | 13 ++----------- tests/Doctrine/Tests/OrmFunctionalTestCase.php | 6 ++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php index 58f67dd3c..a2eff6b57 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3699Test.php @@ -13,18 +13,9 @@ class DDC3597Test extends \Doctrine\Tests\OrmFunctionalTestCase { protected function setUp() { - parent::setUp(); + $this->useModelSet('ddc3699'); - try { - $this->_schemaTool->createSchema(array( - $this->_em->getClassMetadata(DDC3699Parent::CLASSNAME), - $this->_em->getClassMetadata(DDC3699RelationOne::CLASSNAME), - $this->_em->getClassMetadata(DDC3699RelationMany::CLASSNAME), - $this->_em->getClassMetadata(DDC3699Child::CLASSNAME), - )); - } catch (SchemaException $e) { - // should throw error on second because schema is already created - } + parent::setUp(); } /** diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index f48d635f2..855fac617 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -139,6 +139,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\DDC117\DDC117Editor', 'Doctrine\Tests\Models\DDC117\DDC117Link', ), + 'ddc3699' => array( + 'Doctrine\Tests\Models\DDC3699\DDC3699Parent', + 'Doctrine\Tests\Models\DDC3699\DDC3699RelationOne', + 'Doctrine\Tests\Models\DDC3699\DDC3699RelationMany', + 'Doctrine\Tests\Models\DDC3699\DDC3699Child', + ), 'stockexchange' => array( 'Doctrine\Tests\Models\StockExchange\Bond', 'Doctrine\Tests\Models\StockExchange\Stock',