From b7566dc65b64e56b513fed49eab4fc3099101a3d Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Fri, 16 Jan 2015 22:20:58 +0100
Subject: [PATCH] #1172 - correcting test: all connections should have a saved
file instance
---
.../ORM/Functional/MergeUninitializedProxyTest.php | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
index d86c28fa3..e9851e425 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
@@ -68,23 +68,27 @@ class MergeUninitializedProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertFalse($managed->__isInitialized());
}
- public function testMergingProxyFromDifferentEntityManagerDoesNotReplaceInitializer()
+ public function testMergingProxyFromDifferentEntityManagerWithExistingManagedInstanceDoesNotReplaceInitializer()
{
$em1 = $this->createEntityManager($logger1 = new DebugStack());
$em2 = $this->createEntityManager($logger2 = new DebugStack());
$file1 = new MUPFile();
+ $file2 = new MUPFile();
$em1->persist($file1);
+ $em2->persist($file2);
$em1->flush();
+ $em2->flush();
$em1->clear();
+ $em2->clear();
$queryCount1 = count($logger1->queries);
- $queryCount2 = count($logger1->queries);
+ $queryCount2 = count($logger2->queries);
- $proxy1 = $em1->getReference(MUPFile::CLASSNAME, $file1->fileId);
- $proxy2 = $em2->getReference(MUPFile::CLASSNAME, $file1->fileId);
- $merged2 = $em2->merge($proxy1);
+ $proxy1 = $em1->getReference(MUPFile::CLASSNAME, $file1->fileId);
+ $proxy2 = $em2->getReference(MUPFile::CLASSNAME, $file1->fileId);
+ $merged2 = $em2->merge($proxy1);
$this->assertNotSame($proxy1, $merged2);
$this->assertSame($proxy2, $merged2);