Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-5651: Unit Test the Scheduler

Browse source 
Moved common database setup functions to helper class
This commit is contained in:
drigato 2014-01-23 11:37:20 -05:00
parent 3826a88d1f
commit fc4dfd5cb0
2 changed files with 34 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

29
airtime_mvc/tests/application/services/database/ShowServiceDbTest.php
View file

@ -2,7 +2,6 @@
require_once "Zend/Test/PHPUnit/DatabaseTestCase.php";
require_once "ShowService.php";
require_once "../application/configs/conf.php";
require_once "AirtimeInstall.php";
require_once "ShowServiceData.php";
require_once "TestHelper.php";
#require_once "PHPUnit/Extensions/Database/DataSet/ReplacementDataSet.php";
@ -22,25 +21,11 @@ class ShowServiceDbTest extends Zend_Test_PHPUnit_DatabaseTestCase
public function setUp()
{
TestHelper::installTestDatabase();
//XXX: Zend_Test_PHPUnit_DatabaseTestCase doesn't use this for whatever reason:
//$this->bootstrap = array($this, 'appBootstrap');
//So instead we just manually call the appBootstrap here:
//TODO: Use AirtimeInstall.php to create the database and database tables
//Load Database parameters
//We need to load the config before our app bootstrap runs. The config
//is normally
$CC_CONFIG = Config::getConfig();
$dbuser = $CC_CONFIG['dsn']['username'];
$dbpasswd = $CC_CONFIG['dsn']['password'];
$dbname = $CC_CONFIG['dsn']['database'];
$dbhost = $CC_CONFIG['dsn']['hostspec'];
AirtimeInstall::createDatabase();
AirtimeInstall::createDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost);
AirtimeInstall::SetDefaultTimezone();
$this->appBootstrap();
//$this->_nowDT = new DateTime("now", new DateTimeZone("UTC"));
@ -57,14 +42,8 @@ class ShowServiceDbTest extends Zend_Test_PHPUnit_DatabaseTestCase
public function getConnection()
{
if ($this->_connectionMock == null) {
$config = new Zend_Config(
array(
'host' => '127.0.0.1',
'dbname' => 'airtime_test',
'username' => 'airtime',
'password' => 'airtime'
)
);
$config = TestHelper::getDbZendConfig();
$connection = Zend_Db::factory('pdo_pgsql', $config);
$this->_connectionMock = $this->createZendDbConnection(