From 3769cd11199618fd5668458828b41b8419a1757d Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 16 Jan 2015 22:37:38 +0100 Subject: [PATCH] #1172 - adding required `@group` annotations for newly introduced tests --- tests/Doctrine/Tests/Models/Generic/DateTimeModel.php | 2 ++ tests/Doctrine/Tests/ORM/EntityManagerTest.php | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php b/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php index 3298a8850..92ebe5e5d 100644 --- a/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php +++ b/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php @@ -8,6 +8,8 @@ namespace Doctrine\Tests\Models\Generic; */ class DateTimeModel { + const CLASSNAME = __CLASS__; + /** * @Id @Column(type="integer") * @GeneratedValue diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php index a412bb309..c24867555 100644 --- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php +++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php @@ -205,6 +205,12 @@ class EntityManagerTest extends \Doctrine\Tests\OrmTestCase return 'callback'; } + /** + * @group DDC-1392 + * @group DDC-1734 + * @group DDC-3368 + * @group #1172 + */ public function testMergeDetachedUnInitializedProxy() { $em = $this->createEntityManager();