From 0072054020415fed75ee8e53f8670f25add651cc Mon Sep 17 00:00:00 2001
From: Full <fullbl@mail.com>
Date: Sat, 11 Mar 2017 20:37:32 +0100
Subject: [PATCH] moved all test models into test class

---
 .../Tests/Models/DDC6303/DDC6303Contract.php  | 24 -------
 .../Tests/Models/DDC6303/DDC6303ContractA.php | 17 -----
 .../Tests/Models/DDC6303/DDC6303ContractB.php | 17 -----
 .../ORM/Functional/Ticket/DDC6303Test.php     | 66 +++++++++++++++++--
 .../Doctrine/Tests/OrmFunctionalTestCase.php  |  5 --
 5 files changed, 61 insertions(+), 68 deletions(-)
 delete mode 100644 tests/Doctrine/Tests/Models/DDC6303/DDC6303Contract.php
 delete mode 100644 tests/Doctrine/Tests/Models/DDC6303/DDC6303ContractA.php
 delete mode 100644 tests/Doctrine/Tests/Models/DDC6303/DDC6303ContractB.php

diff --git a/tests/Doctrine/Tests/Models/DDC6303/DDC6303Contract.php b/tests/Doctrine/Tests/Models/DDC6303/DDC6303Contract.php
deleted file mode 100644
index ccb2dee34..000000000
--- a/tests/Doctrine/Tests/Models/DDC6303/DDC6303Contract.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Models\DDC6303;
-
-/**
- * @Entity
- * @Table(name="ddc6303_contract")
- * @InheritanceType("JOINED")
- * @DiscriminatorColumn(name="discr", type="string")
- * @DiscriminatorMap({
- *      "contract"    = "DDC6303Contract",
- *      "contract_b"  = "DDC6303ContractB",
- *      "contract_a"  = "DDC6303ContractA"
- * })
- */
-class DDC6303Contract
-{
-    /**
-     * @Id
-     * @Column(type="integer")
-     * @GeneratedValue
-     */
-    public $id;
-}
diff --git a/tests/Doctrine/Tests/Models/DDC6303/DDC6303ContractA.php b/tests/Doctrine/Tests/Models/DDC6303/DDC6303ContractA.php
deleted file mode 100644
index b46686050..000000000
--- a/tests/Doctrine/Tests/Models/DDC6303/DDC6303ContractA.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Models\DDC6303;
-
-/**
- * @Entity
- * @Table(name="ddc6303_contracts_a")
- */
-class DDC6303ContractA extends DDC6303Contract
-{
-    /**
-     * @Column(type="string", nullable=true)
-     *
-     * @var string
-     */
-    public $originalData;
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/Models/DDC6303/DDC6303ContractB.php b/tests/Doctrine/Tests/Models/DDC6303/DDC6303ContractB.php
deleted file mode 100644
index bba19a9f5..000000000
--- a/tests/Doctrine/Tests/Models/DDC6303/DDC6303ContractB.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Models\DDC6303;
-
-/**
- * @Entity
- * @Table(name="ddc6303_contracts_b")
- */
-class DDC6303ContractB extends DDC6303Contract
-{
-    /**
-     * @Column(type="simple_array", nullable=true)
-     *
-     * @var array
-     */
-    public $originalData;
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php
index a065e1d96..c11bc49da 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php
@@ -2,10 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-use Doctrine\Tests\Models\DDC6303\DDC6303ContractA;
-use Doctrine\Tests\Models\DDC6303\DDC6303ContractB;
-use Doctrine\Tests\Models\DDC6303\DDC6303Contract;
-
 /**
  * @group DDC6303
  */
@@ -13,8 +9,16 @@ class DDC6303Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('ddc6303');
         parent::setUp();
+        try {
+            $this->_schemaTool->createSchema(
+                [
+                $this->_em->getClassMetadata(DDC6303Contract::class),
+                $this->_em->getClassMetadata(DDC6303ContractA::class),
+                $this->_em->getClassMetadata(DDC6303ContractB::class)
+                ]
+            );
+        } catch (\Exception $ignored) {}
     }
     
     public function testMixedTypeHydratedCorrectlyInJoinedInheritance()
@@ -96,3 +100,55 @@ class DDC6303Test extends \Doctrine\Tests\OrmFunctionalTestCase
         }
      }
 }
+
+
+/**
+ * @Entity
+ * @Table(name="ddc6303_contract")
+ * @InheritanceType("JOINED")
+ * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorMap({
+ *      "contract"    = "DDC6303Contract",
+ *      "contract_b"  = "DDC6303ContractB",
+ *      "contract_a"  = "DDC6303ContractA"
+ * })
+ */
+class DDC6303Contract
+{
+    /**
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue
+     */
+    public $id;
+}
+
+
+/**
+ * @Entity
+ * @Table(name="ddc6303_contracts_a")
+ */
+class DDC6303ContractA extends DDC6303Contract
+{
+    /**
+     * @Column(type="string", nullable=true)
+     *
+     * @var string
+     */
+    public $originalData;
+}
+
+
+/**
+ * @Entity
+ * @Table(name="ddc6303_contracts_b")
+ */
+class DDC6303ContractB extends DDC6303Contract
+{
+    /**
+     * @Column(type="simple_array", nullable=true)
+     *
+     * @var array
+     */
+    public $originalData;
+}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index 5618fa120..f4ba88275 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -311,11 +311,6 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             Models\Issue5989\Issue5989Person::class,
             Models\Issue5989\Issue5989Employee::class,
             Models\Issue5989\Issue5989Manager::class,
-        ],
-        'ddc6303' => [
-            Models\DDC6303\DDC6303Contract::class,
-            Models\DDC6303\DDC6303ContractA::class,
-            Models\DDC6303\DDC6303ContractB::class,
         ]
 
     ];