From 33230e547d5a6bba753ab1d36e6dc083bde7109e Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Fri, 23 Jan 2015 16:15:57 +0100
Subject: [PATCH] #1277 DDC-3346 DDC-3531 - correct usage of the model set
 (setUp/tearDown of model-related tables)

---
 .../Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php | 7 ++-----
 tests/Doctrine/Tests/OrmFunctionalTestCase.php           | 9 +++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3346Test.php
index e02788c6959..10e1309e39f 100644
--- 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
index cfced6d61f1..f73ac54fcc8 100644
--- 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"));