tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTestCase: Let db be accessed statically 

E.g. from setUp and tearDown for class
This commit is contained in:
Markus Frosch 2018-09-04 14:31:17 +02:00
parent e895978ff2
commit 4b03821caf
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/Director/Test/BaseTestCase.php
View File

@ -6,7 +6,6 @@ use Icinga\Application\Icinga;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;
use Icinga\Module\Director\Data\Db\DbConnection;
use Icinga\Module\Director\Db; use Icinga\Module\Director\Db;
use Icinga\Module\Director\Db\Migrations; use Icinga\Module\Director\Db\Migrations;
use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Objects\IcingaObject;
@ -16,7 +15,8 @@ abstract class BaseTestCase extends PHPUnit_Framework_TestCase
{ {
private static $app; private static $app;
private $db; /** @var Db */
private static $db;
public function setUp() public function setUp()
{ {
@ -39,7 +39,7 @@ abstract class BaseTestCase extends PHPUnit_Framework_TestCase
return $this->getDbResourceName() !== null; return $this->getDbResourceName() !== null;
} }
protected function getDbResourceName() protected static function getDbResourceName()
{ {
if (array_key_exists('DIRECTOR_TESTDB_RES', $_SERVER)) { if (array_key_exists('DIRECTOR_TESTDB_RES', $_SERVER)) {
return $_SERVER['DIRECTOR_TESTDB_RES']; return $_SERVER['DIRECTOR_TESTDB_RES'];
@ -52,10 +52,10 @@ abstract class BaseTestCase extends PHPUnit_Framework_TestCase
* @return Db * @return Db
* @throws ConfigurationError * @throws ConfigurationError
*/ */
protected function getDb() protected static function getDb()
{ {
if ($this->db === null) { if (self::$db === null) {
$resourceName = $this->getDbResourceName(); $resourceName = self::getDbResourceName();
if (! $resourceName) { if (! $resourceName) {
throw new ConfigurationError( throw new ConfigurationError(
'Could not run DB-based tests, please configure a testing db resource' 'Could not run DB-based tests, please configure a testing db resource'
@ -74,12 +74,12 @@ abstract class BaseTestCase extends PHPUnit_Framework_TestCase
if (array_key_exists('DIRECTOR_TESTDB_PASSWORD', $_SERVER)) { if (array_key_exists('DIRECTOR_TESTDB_PASSWORD', $_SERVER)) {
$dbConfig->password = $_SERVER['DIRECTOR_TESTDB_PASSWORD']; $dbConfig->password = $_SERVER['DIRECTOR_TESTDB_PASSWORD'];
} }
$this->db = new Db($dbConfig); self::$db = new Db($dbConfig);
$migrations = new Migrations($this->db); $migrations = new Migrations(self::$db);
$migrations->applyPendingMigrations(); $migrations->applyPendingMigrations();
} }
return $this->db; return self::$db;
} }
protected function newObject($type, $name, $properties = array()) protected function newObject($type, $name, $properties = array())