From 67724eb7ae1dd73a7b5f9f37dfcf135fcefe992f Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sun, 18 Dec 2016 15:44:48 +0100
Subject: [PATCH] #6174 #5570 adding group annotations to newly introduced test
---
tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
index 23c04374d..0aa3e86bb 100644
--- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
+++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
@@ -401,6 +401,11 @@ class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase
self::assertSame([], $this->_unitOfWork->getOriginalEntityData($newUser), 'No original data was stored');
}
+ /**
+ * @group DDC-1955
+ * @group 5570
+ * @group 6174
+ */
public function testMergeWithNewEntityWillPersistItAndTriggerPrePersistListenersWithMergedEntityData()
{
$entity = new EntityWithListenerPopulatedField();
@@ -440,6 +445,11 @@ class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase
self::assertSame($object->generatedField, $entity->generatedField);
}
+ /**
+ * @group DDC-1955
+ * @group 5570
+ * @group 6174
+ */
public function testMergeWithExistingEntityWillNotPersistItNorTriggerPrePersistListeners()
{
$persistedEntity = new EntityWithListenerPopulatedField();