From dd9a6bea0acfabb5e5a6cfda6846e2b8dd59d19b Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Wed, 10 Sep 2014 16:57:35 +0200
Subject: [PATCH] DDC-3272 - minor cleanups - inspecting a test failure related
 with `@Doctrine\ORM\Mapping\Table` autoloading

---
 .../Tests/ORM/Tools/EntityGeneratorTest.php      | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
index bb6eeab45..172213dab 100644
--- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
@@ -11,8 +11,9 @@ use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Tools\EntityGenerator;
 use Doctrine\Tests\Models\DDC2372\DDC2372Admin;
 use Doctrine\Tests\Models\DDC2372\DDC2372User;
+use Doctrine\Tests\OrmTestCase;
 
-class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
+class EntityGeneratorTest extends OrmTestCase
 {
 
     /**
@@ -291,23 +292,18 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
      */
     public function testMappedSuperclassAnnotationGeneration()
     {
-        $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook');
-
+        $metadata                     = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook');
         $metadata->namespace          = $this->_namespace;
         $metadata->isMappedSuperclass = true;
 
         $this->_generator->setAnnotationPrefix('ORM\\');
         $this->_generator->writeEntityClass($metadata, $this->_tmpDir);
-
-        // force instantiation (causes autoloading to kick in)
-        $this->newInstance($metadata);
-
-        $cm = new ClassMetadata($metadata->name);
-
-        $cm->initializeReflection(new RuntimeReflectionService);
+        $this->newInstance($metadata); // force instantiation (causes autoloading to kick in)
 
         $driver = new AnnotationDriver(new AnnotationReader(), array());
+        $cm     = new ClassMetadata($metadata->name);
 
+        $cm->initializeReflection(new RuntimeReflectionService);
         $driver->loadMetadataForClass($cm->name, $cm);
 
         $this->assertTrue($cm->isMappedSuperclass);