Commit 18fb5028 authored by Benjamin Eberlei's avatar Benjamin Eberlei

Update Testsuite to be PHPUnit 3.5 compatible

parent 22ecf03f
...@@ -18,10 +18,6 @@ class DbalFunctionalTestCase extends DbalTestCase ...@@ -18,10 +18,6 @@ class DbalFunctionalTestCase extends DbalTestCase
protected function resetSharedConn() protected function resetSharedConn()
{ {
if (isset($this->sharedFixture['conn'])) {
$this->sharedFixture['conn']->close();
$this->sharedFixture['conn'] = null;
}
if (self::$_sharedConn) { if (self::$_sharedConn) {
self::$_sharedConn->close(); self::$_sharedConn->close();
self::$_sharedConn = null; self::$_sharedConn = null;
...@@ -30,13 +26,9 @@ class DbalFunctionalTestCase extends DbalTestCase ...@@ -30,13 +26,9 @@ class DbalFunctionalTestCase extends DbalTestCase
protected function setUp() protected function setUp()
{ {
if (isset($this->sharedFixture['conn'])) { if ( ! isset(self::$_sharedConn)) {
$this->_conn = $this->sharedFixture['conn']; self::$_sharedConn = TestUtil::getConnection();
} else {
if ( ! isset(self::$_sharedConn)) {
self::$_sharedConn = TestUtil::getConnection();
}
$this->_conn = self::$_sharedConn;
} }
$this->_conn = self::$_sharedConn;
} }
} }
...@@ -4,16 +4,5 @@ namespace Doctrine\Tests; ...@@ -4,16 +4,5 @@ namespace Doctrine\Tests;
class DbalFunctionalTestSuite extends DbalTestSuite class DbalFunctionalTestSuite extends DbalTestSuite
{ {
protected function setUp()
{
if ( ! isset($this->sharedFixture['conn'])) {
$this->sharedFixture['conn'] = TestUtil::getConnection();
}
}
protected function tearDown()
{
$this->sharedFixture['conn']->close();
$this->sharedFixture = null;
}
} }
\ No newline at end of file
...@@ -6,8 +6,6 @@ namespace Doctrine\Tests; ...@@ -6,8 +6,6 @@ namespace Doctrine\Tests;
error_reporting(E_ALL | E_STRICT); 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'; require_once __DIR__ . '/../../../lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php';
$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Common', __DIR__ . '/../../../lib/vendor/doctrine-common/lib'); $classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Common', __DIR__ . '/../../../lib/vendor/doctrine-common/lib');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment