From 0a8ff7a0302d224f9abf9f4c19e94de9693f7329 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Fri, 29 Oct 2010 16:46:21 +0200
Subject: [PATCH] Fix Testsuite to run with PHPUnit 3.5

---
 .../Doctrine/Tests/OrmFunctionalTestCase.php  | 22 ++++++++-----------
 .../Doctrine/Tests/OrmFunctionalTestSuite.php | 12 +---------
 tests/Doctrine/Tests/TestInit.php             |  2 --
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index c39798aa6..a115abc46 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -103,7 +103,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
      */
     protected function tearDown()
     {
-        $conn = $this->sharedFixture['conn'];
+        $conn = static::$_sharedConn;
 
         $this->_sqlLoggerStack->enabled = false;
 
@@ -185,23 +185,19 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
     {
         $forceCreateTables = false;
         
-        if ( ! isset($this->sharedFixture['conn'])) {
-            if ( ! isset(static::$_sharedConn)) {
-                static::$_sharedConn = TestUtil::getConnection();
-            }
+        if ( ! isset(static::$_sharedConn)) {
+            static::$_sharedConn = TestUtil::getConnection();
             
-            $this->sharedFixture['conn'] = static::$_sharedConn;
-            
-            if ($this->sharedFixture['conn']->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) {
+            if (static::$_sharedConn->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) {
                 $forceCreateTables = true;
             }
         }
 
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
-            if (in_array($this->sharedFixture['conn']->getDatabasePlatform()->getName(), array("mysql", "postgresql"))) {
-                $this->sharedFixture['conn']->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
-            } else if ($this->sharedFixture['conn']->getDatabasePlatform()->getName() == "oracle") {
-                $this->sharedFixture['conn']->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
+            if (in_array(static::$_sharedConn->getDatabasePlatform()->getName(), array("mysql", "postgresql"))) {
+                static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
+            } else if (static::$_sharedConn->getDatabasePlatform()->getName() == "oracle") {
+                static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
             }
         }
         
@@ -261,7 +257,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
 
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver());
         
-        $conn = $this->sharedFixture['conn'];
+        $conn = static::$_sharedConn;
         $conn->getConfiguration()->setSQLLogger($this->_sqlLoggerStack);
         
         return \Doctrine\ORM\EntityManager::create($conn, $config);
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestSuite.php b/tests/Doctrine/Tests/OrmFunctionalTestSuite.php
index d281ed785..8d4b8b058 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestSuite.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestSuite.php
@@ -11,15 +11,5 @@ namespace Doctrine\Tests;
  */
 class OrmFunctionalTestSuite extends OrmTestSuite
 {
-    protected function setUp()
-    {
-        if ( ! isset($this->sharedFixture['conn'])) {
-            $this->sharedFixture['conn'] = TestUtil::getConnection();
-        }
-    }
-    
-    protected function tearDown()
-    {
-        $this->sharedFixture = null;
-    }
+
 }
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/TestInit.php b/tests/Doctrine/Tests/TestInit.php
index cd3bf4daa..0445cf76b 100644
--- a/tests/Doctrine/Tests/TestInit.php
+++ b/tests/Doctrine/Tests/TestInit.php
@@ -6,8 +6,6 @@ namespace Doctrine\Tests;
 
 error_reporting(E_ALL | E_STRICT);
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
 require_once __DIR__ . '/../../../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php';
 
 if (isset($GLOBALS['DOCTRINE_COMMON_PATH'])) {