doctrine#1277 DDC-3346 DDC-3531 - correct usage of the model set (set…

…Up/tearDown of model-related tables)
Ocramius · Jan 23, 2015 · 33230e5 · 33230e5
1 parent 35bccf3
commit 33230e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php
@@ -12,12 +12,9 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
  public function setUp()
  {
- parent::setUp();
+ $this->useModelSet('ddc3346');
 
- $this->setUpEntitySchema(array(
- DDC3346Author::CLASSNAME,
- DDC3346Article::CLASSNAME,
- ));
+ parent::setUp();
  }
 
  public function testFindOneWithEagerFetchWillNotHydrateLimitedCollection()

diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -193,6 +193,10 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
  'Doctrine\Tests\Models\DDC2504\DDC2504ChildClass',
  'Doctrine\Tests\Models\DDC2504\DDC2504OtherClass',
  ),
+ 'ddc3346' => array(
+ 'Doctrine\Tests\Models\DDC3346\DDC3346Author',
+ 'Doctrine\Tests\Models\DDC3346\DDC3346Article',
+ ),
  'quote' => array(
  'Doctrine\Tests\Models\Quote\Address',
  'Doctrine\Tests\Models\Quote\Group',
@@ -399,6 +403,11 @@ protected function tearDown()
  $conn->executeUpdate('DELETE FROM cache_country');
  }
 
+ if (isset($this->_usedModelSets['ddc3346'])) {
+ $conn->executeUpdate('DELETE FROM ddc3346_articles');
+ $conn->executeUpdate('DELETE FROM ddc3346_users');
+ }
+
  if (isset($this->_usedModelSets['quote'])) {
  $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-address"));
  $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-group"));