doctrine#1277 DDC-3346 DDC-3531 - correct usage of the model set (setUp/tearDown of model-related tables)

Ocramius · Ocramius · commit 16f447d1accb · 2015-01-24T14:39:46.000+01:00
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"));

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,9 @@ class DDC3346Test extends \Doctrine\Tests\OrmFunctionalTestCase`
`12`	`12`	`{`
`13`	`13`	`public function setUp()`
`14`	`14`	`{`
`15`		`- parent::setUp();`
	`15`	`+ $this->useModelSet('ddc3346');`
`16`	`16`
`17`		`- $this->setUpEntitySchema(array(`
`18`		`- DDC3346Author::CLASSNAME,`
`19`		`- DDC3346Article::CLASSNAME,`
`20`		`- ));`
	`17`	`+ parent::setUp();`
`21`	`18`	`}`
`22`	`19`
`23`	`20`	`public function testFindOneWithEagerFetchWillNotHydrateLimitedCollection()`