From 2c036b3185c4da38fb447b9d576e4219fe6af835 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sun, 30 Oct 2011 08:25:19 +0100
Subject: [PATCH] Fix glitch in testsuites tearDown()

---
 .../ORM/Functional/EntityRepositoryTest.php   | 58 ++++++++++---------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
index 4f8e11420..719a9f993 100644
--- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
@@ -20,7 +20,9 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
     public function tearDown()
     {
-        $this->_em->getConfiguration()->setEntityNamespaces(array());
+        if ($this->_em) {
+            $this->_em->getConfiguration()->setEntityNamespaces(array());
+        }
         parent::tearDown();
     }
 
@@ -78,7 +80,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         return array($user->id, $address->id);
     }
-    
+
     public function buildUser($name, $username, $status, $address)
     {
         $user = new CmsUser();
@@ -89,10 +91,10 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->_em->persist($user);
         $this->_em->flush();
-        
+
         return $user;
     }
-    
+
     public function buildAddress($country, $city, $street, $zip)
     {
         $address = new CmsAddress();
@@ -103,7 +105,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->_em->persist($address);
         $this->_em->flush();
-        
+
         return $address;
     }
 
@@ -134,22 +136,22 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         $address1 = $this->buildAddress('Germany', 'Berlim', 'Foo st.', '123456');
         $user1    = $this->buildUser('Benjamin', 'beberlei', 'dev', $address1);
-        
+
         $address2 = $this->buildAddress('Brazil', 'São Paulo', 'Bar st.', '654321');
         $user2    = $this->buildUser('Guilherme', 'guilhermeblanco', 'freak', $address2);
-        
+
         $address3 = $this->buildAddress('USA', 'Nashville', 'Woo st.', '321654');
         $user3    = $this->buildUser('Jonathan', 'jwage', 'dev', $address3);
-        
+
         unset($address1);
         unset($address2);
         unset($address3);
-        
+
         $this->_em->clear();
-        
+
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress');
         $addresses  = $repository->findBy(array('user' => array($user1->getId(), $user2->getId())));
-        
+
         $this->assertEquals(2, count($addresses));
         $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress',$addresses[0]);
     }
@@ -158,22 +160,22 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
     {
         $address1 = $this->buildAddress('Germany', 'Berlim', 'Foo st.', '123456');
         $user1    = $this->buildUser('Benjamin', 'beberlei', 'dev', $address1);
-        
+
         $address2 = $this->buildAddress('Brazil', 'São Paulo', 'Bar st.', '654321');
         $user2    = $this->buildUser('Guilherme', 'guilhermeblanco', 'freak', $address2);
-        
+
         $address3 = $this->buildAddress('USA', 'Nashville', 'Woo st.', '321654');
         $user3    = $this->buildUser('Jonathan', 'jwage', 'dev', $address3);
-        
+
         unset($address1);
         unset($address2);
         unset($address3);
-        
+
         $this->_em->clear();
-        
+
         $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress');
         $addresses  = $repository->findBy(array('user' => array($user1, $user2)));
-        
+
         $this->assertEquals(2, count($addresses));
         $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress',$addresses[0]);
     }
@@ -189,7 +191,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals('Guilherme', $users[0]->name);
         $this->assertEquals('dev', $users[0]->status);
     }
-    
+
     public function testFindAll()
     {
         $user1Id = $this->loadFixture();
@@ -280,7 +282,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $userId = $user->id;
 
         $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId);
-        
+
         $this->setExpectedException('Doctrine\ORM\OptimisticLockException');
         $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId, \Doctrine\DBAL\LockMode::OPTIMISTIC);
     }
@@ -423,7 +425,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testFindByLimitOffset()
     {
         $this->loadFixture();
-        
+
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser');
 
         $users1 = $repos->findBy(array(), null, 1, 0);
@@ -451,8 +453,8 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertSame($usersAsc[0], $usersDesc[2]);
         $this->assertSame($usersAsc[2], $usersDesc[0]);
     }
-    
-    
+
+
     /**
      * @group DDC-753
      */
@@ -465,19 +467,19 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\DDC753\DDC753EntityWithDefaultCustomRepository');
         $this->assertInstanceOf("Doctrine\Tests\Models\DDC753\DDC753DefaultRepository", $repos);
         $this->assertTrue($repos->isDefaultRepository());
-        
-        
+
+
         $repos = $this->_em->getRepository('Doctrine\Tests\Models\DDC753\DDC753EntityWithCustomRepository');
         $this->assertInstanceOf("Doctrine\Tests\Models\DDC753\DDC753CustomRepository", $repos);
         $this->assertTrue($repos->isCustomRepository());
-        
+
         $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), "Doctrine\Tests\Models\DDC753\DDC753DefaultRepository");
         $this->_em->getConfiguration()->setDefaultRepositoryClassName("Doctrine\ORM\EntityRepository");
         $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), "Doctrine\ORM\EntityRepository");
 
     }
-    
-    
+
+
     /**
      * @group DDC-753
      * @expectedException Doctrine\ORM\ORMException
@@ -488,6 +490,6 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals($this->_em->getConfiguration()->getDefaultRepositoryClassName(), "Doctrine\ORM\EntityRepository");
         $this->_em->getConfiguration()->setDefaultRepositoryClassName("Doctrine\Tests\Models\DDC753\DDC753InvalidRepository");
     }
-    
+
 }