From cd3fc6e6ea5d905e4a77a40cace2b86e0b419cd9 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Fri, 16 Jan 2015 22:43:52 +0100
Subject: [PATCH] #1172 - adding required `@group` annotations for newly
 introduced tests

---
 .../MergeUninitializedProxyTest.php           | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
index faae9df80..a3aa9f2c2 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
@@ -28,6 +28,12 @@ class MergeUninitializedProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         }
     }
 
+    /**
+     * @group DDC-1392
+     * @group DDC-1734
+     * @group DDC-3368
+     * @group #1172
+     */
     public function testMergeDetachedUnInitializedProxy()
     {
         $detachedUninitialized = $this->_em->getReference(MUPFile::CLASSNAME, 123);
@@ -42,6 +48,12 @@ class MergeUninitializedProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertFalse($detachedUninitialized->__isInitialized());
     }
 
+    /**
+     * @group DDC-1392
+     * @group DDC-1734
+     * @group DDC-3368
+     * @group #1172
+     */
     public function testMergeUnserializedUnInitializedProxy()
     {
         $detachedUninitialized = $this->_em->getReference(MUPFile::CLASSNAME, 123);
@@ -59,6 +71,12 @@ class MergeUninitializedProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertFalse($detachedUninitialized->__isInitialized());
     }
 
+    /**
+     * @group DDC-1392
+     * @group DDC-1734
+     * @group DDC-3368
+     * @group #1172
+     */
     public function testMergeManagedProxy()
     {
         $managed = $this->_em->getReference(MUPFile::CLASSNAME, 123);
@@ -68,6 +86,12 @@ class MergeUninitializedProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertFalse($managed->__isInitialized());
     }
 
+    /**
+     * @group DDC-1392
+     * @group DDC-1734
+     * @group DDC-3368
+     * @group #1172
+     */
     public function testMergingProxyFromDifferentEntityManagerWithExistingManagedInstanceDoesNotReplaceInitializer()
     {
         $em1 = $this->createEntityManager($logger1 = new DebugStack());
@@ -123,6 +147,12 @@ class MergeUninitializedProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         );
     }
 
+    /**
+     * @group DDC-1392
+     * @group DDC-1734
+     * @group DDC-3368
+     * @group #1172
+     */
     public function testMergingUnInitializedProxyDoesNotInitializeIt()
     {
         $em1 = $this->createEntityManager($logger1 = new DebugStack());