RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Fixed connection sharing when Functional DBAL or ORM tests are run standalone.

Browse source
This commit is contained in:
romanb 2009-05-30 10:30:05 +00:00
parent acec85a412
commit 2a9886af48
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/Doctrine/Tests/DbalFunctionalTestCase.php
View file

@ -4,15 +4,19 @@ namespace Doctrine\Tests;
class DbalFunctionalTestCase extends DbalTestCase class DbalFunctionalTestCase extends DbalTestCase
{ {
/* Shared connection when a TestCase is run alone (outside of it's functional suite) */
private static $_sharedConn;
protected $_conn; protected $_conn;
protected function setUp() protected function setUp()
{ {
if ( ! isset($this->_conn)) { if (isset($this->sharedFixture['conn'])) {
if ( ! isset($this->sharedFixture['conn'])) {
$this->sharedFixture['conn'] = TestUtil::getConnection();
}
$this->_conn = $this->sharedFixture['conn']; $this->_conn = $this->sharedFixture['conn'];
} else {
if ( ! isset(self::$_sharedConn)) {
self::$_sharedConn = TestUtil::getConnection();
}
$this->_conn = self::$_sharedConn;
} }
} }
} }

9
tests/Doctrine/Tests/OrmFunctionalTestCase.php
View file

@ -14,6 +14,9 @@ class OrmFunctionalTestCase extends OrmTestCase
/* The query cache shared between all functional tests. */ /* The query cache shared between all functional tests. */
private static $_queryCacheImpl = null; private static $_queryCacheImpl = null;
/* Shared connection when a TestCase is run alone (outside of it's functional suite) */
private static $_sharedConn;
/** The EntityManager for this testcase. */ /** The EntityManager for this testcase. */
protected $_em; protected $_em;
@ -79,8 +82,12 @@ class OrmFunctionalTestCase extends OrmTestCase
protected function setUp() protected function setUp()
{ {
$forceCreateTables = false; $forceCreateTables = false;
if ( ! isset($this->sharedFixture['conn'])) { if ( ! isset($this->sharedFixture['conn'])) {
$this->sharedFixture['conn'] = TestUtil::getConnection(); if ( ! isset(self::$_sharedConn)) {
self::$_sharedConn = TestUtil::getConnection();
}
$this->sharedFixture['conn'] = self::$_sharedConn;
if ($this->sharedFixture['conn']->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) { if ($this->sharedFixture['conn']->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) {
$forceCreateTables = true; $forceCreateTables = true;
} }