From 42c9ff026ec5096109cece0830ea0e8ca4543df9 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Fri, 16 Jan 2015 22:47:00 +0100
Subject: [PATCH] #1172 - renaming test class for clarity

---
 .../{MergeUninitializedProxyTest.php => MergeProxiesTest.php}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/Doctrine/Tests/ORM/Functional/{MergeUninitializedProxyTest.php => MergeProxiesTest.php} (99%)

diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php
similarity index 99%
rename from tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
rename to tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php
index 987c3bbe8..68b9627e0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php
@@ -14,7 +14,7 @@ use Doctrine\Tests\Models\Generic\DateTimeModel;
 use Doctrine\Tests\OrmFunctionalTestCase;
 use Doctrine\Tests\TestUtil;
 
-class MergeUninitializedProxyTest extends OrmFunctionalTestCase
+class MergeProxiesTest extends OrmFunctionalTestCase
 {
     /**
      * {@inheritDoc}