php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 21:41:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

improved db test, avoid error by accessing db directlry

Browse Source 
always use getConnection()
This commit is contained in:
Carsten Brandt
2015-01-10 22:08:42 +01:00
parent f177f1701a
commit 0300683bfc
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/unit/framework/db/DatabaseTestCase.php
View File

@ -11,7 +11,7 @@ abstract class DatabaseTestCase extends TestCase
/**
* @var Connection
*/
protected $db;
private $_db;
protected function setUp()
{
@ -28,8 +28,8 @@ abstract class DatabaseTestCase extends TestCase
protected function tearDown()
{
if ($this->db) {
$this->db->close();
if ($this->_db) {
$this->_db->close();
}
$this->destroyApplication();
}
@ -41,8 +41,8 @@ abstract class DatabaseTestCase extends TestCase
*/
public function getConnection($reset = true, $open = true)
{
if (!$reset && $this->db) {
return $this->db;
if (!$reset && $this->_db) {
return $this->_db;
}
$config = $this->database;
if (isset($config['fixture'])) {
@ -52,11 +52,11 @@ abstract class DatabaseTestCase extends TestCase
$fixture = null;
}
try {
$this->db = $this->prepareDatabase($config, $fixture, $open);
$this->_db = $this->prepareDatabase($config, $fixture, $open);
} catch (\Exception $e) {
$this->markTestSkipped("Something wrong when preparing database: " . $e->getMessage());
}
return $this->db;
return $this->_db;
}
public function prepareDatabase($config, $fixture, $open = true)