From 922c55f5ddeda25463e9a5b7a0b00d44a65fa65b Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sat, 26 Aug 2017 14:15:05 +0200
Subject: [PATCH] Replacing direct `quote` model-set schema creation with
 actually existing model-set setup

---
 .../ORM/Functional/Ticket/DDC142Test.php      | 18 +++--------------
 .../ORM/Functional/Ticket/DDC1843Test.php     | 20 +++----------------
 .../ORM/Functional/Ticket/DDC1885Test.php     | 16 +++------------
 .../ORM/Functional/Ticket/GH6402Test.php      |  2 --
 4 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php
index 287b73dec..ae455f546 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-use Doctrine\Tests\Models\Quote\Group;
-use Doctrine\Tests\Models\Quote\Phone;
 use Doctrine\Tests\Models\Quote\User;
 use Doctrine\Tests\Models\Quote\Address;
 
@@ -13,21 +11,11 @@ use Doctrine\Tests\Models\Quote\Address;
  */
 class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
-    protected function setUp()
+    protected function setUp() : void
     {
-        parent::setUp();
+        $this->useModelSet('quote');
 
-        try {
-            $this->_schemaTool->createSchema(
-                [
-                $this->_em->getClassMetadata(User::class),
-                $this->_em->getClassMetadata(Group::class),
-                $this->_em->getClassMetadata(Phone::class),
-                $this->_em->getClassMetadata(Address::class),
-                ]
-            );
-        } catch(\Exception $e) {
-        }
+        parent::setUp();
     }
 
     public function testCreateRetrieveUpdateDelete()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php
index 4273a36b6..c97ebb287 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php
@@ -2,10 +2,7 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-use Doctrine\Tests\Models\Quote\Address;
 use Doctrine\Tests\Models\Quote\Group;
-use Doctrine\Tests\Models\Quote\Phone;
-use Doctrine\Tests\Models\Quote\User;
 
 /**
  * @group DDC-1845
@@ -13,22 +10,11 @@ use Doctrine\Tests\Models\Quote\User;
  */
 class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
-
-    protected function setUp()
+    protected function setUp() : void
     {
-        parent::setUp();
+        $this->useModelSet('quote');
 
-        try {
-            $this->_schemaTool->createSchema(
-                [
-                $this->_em->getClassMetadata(User::class),
-                $this->_em->getClassMetadata(Group::class),
-                $this->_em->getClassMetadata(Phone::class),
-                $this->_em->getClassMetadata(Address::class),
-                ]
-            );
-        } catch(\Exception $e) {
-        }
+        parent::setUp();
     }
 
     public function testCreateRetrieveUpdateDelete()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php
index 283340b82..2c141151b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1885Test.php
@@ -2,7 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-use Doctrine\Tests\Models\Quote\Address;
 use Doctrine\Tests\Models\Quote\Group;
 use Doctrine\Tests\Models\Quote\User;
 
@@ -18,20 +17,11 @@ class DDC1885Test extends \Doctrine\Tests\OrmFunctionalTestCase
      */
     private $user;
 
-    protected function setUp()
+    protected function setUp() : void
     {
-        parent::setUp();
+        $this->useModelSet('quote');
 
-        try {
-            $this->_schemaTool->createSchema(
-                [
-                $this->_em->getClassMetadata(User::class),
-                $this->_em->getClassMetadata(Group::class),
-                $this->_em->getClassMetadata(Address::class),
-                ]
-            );
-        } catch(\Exception $e) {
-        }
+        parent::setUp();
 
         $user           = new User();
         $user->name     = "FabioBatSilva";
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php
index 85bf43ea0..d675da94a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Tests\Models\Quote\Address;
 use Doctrine\Tests\Models\Quote\City;
 use Doctrine\Tests\Models\Quote\FullAddress;
-use Doctrine\Tests\Models\Quote\Group;
-use Doctrine\Tests\Models\Quote\Phone;
 use Doctrine\Tests\Models\Quote\User;
 use Doctrine\Tests\OrmFunctionalTestCase;