tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Let the BaseTestCase require db and form libraries once it's being required

Browse Source 
Further add function t() and mt() to the global namespace when requiring BaseTestCase

refs #4586
This commit is contained in:
Eric Lippmann 2013-09-03 14:01:31 +02:00 committed by Jannis Moßhammer
parent e3044b8b62
commit 6f383abdd1
2 changed files with 360 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
library/Icinga/Test/BaseTestCase.php
View File

@ -26,32 +26,48 @@
*/
// {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Test;
namespace {
// @codingStandardsIgnoreStart
require_once 'Zend/Test/PHPUnit/ControllerTestCase.php';
require_once 'Zend/Db/Adapter/Pdo/Abstract.php';
require_once 'DbTest.php';
require_once 'FormTest.php';
// @codingStandardsIgnoreEnd
if (!function_exists('t')) {
function t()
{
return func_get_arg(0);
}
}
use \Exception;
use \RuntimeException;
use \Zend_Test_PHPUnit_ControllerTestCase;
use \Zend_Config;
use \Zend_Db_Adapter_Pdo_Abstract;
use \Zend_Db_Adapter_Pdo_Mysql;
use \Zend_Db_Adapter_Pdo_Pgsql;
use \Zend_Db_Adapter_Pdo_Oci;
use \Icinga\Application\DbAdapterFactory;
use \Icinga\User\Preferences;
use \Icinga\Web\Form;
if (!function_exists('mt')) {
function mt()
{
return func_get_arg(0);
}
}
}
/**
namespace Icinga\Test {
require_once 'Zend/Test/PHPUnit/ControllerTestCase.php';
require_once 'Zend/Db/Adapter/Pdo/Abstract.php';
require_once 'DbTest.php';
require_once 'FormTest.php';
// @codingStandardsIgnoreStart
use \Exception;
use \RuntimeException;
use Zend_Test_PHPUnit_ControllerTestCase;
use Zend_Config;
use Zend_Db_Adapter_Pdo_Abstract;
use Zend_Db_Adapter_Pdo_Mysql;
use Zend_Db_Adapter_Pdo_Pgsql;
use Zend_Db_Adapter_Pdo_Oci;
use Icinga\Application\DbAdapterFactory;
use Icinga\User\Preferences;
use Icinga\Web\Form;
// @codingStandardsIgnoreEnd
/**
* Class BaseTestCase
*/
class BaseTestCase extends Zend_Test_PHPUnit_ControllerTestCase implements DbTest, FormTest
{
class BaseTestCase extends Zend_Test_PHPUnit_ControllerTestCase implements DbTest, FormTest
{
/**
* Path to application/
*
@ -131,9 +147,6 @@ class BaseTestCase extends Zend_Test_PHPUnit_ControllerTestCase implements DbTes
public function __construct($name = null, array $data = array(), $dataName = '')
{
parent::__construct($name, $data, $dataName);
$tz = @date_default_timezone_get();
date_default_timezone_set('UTC');
}
@ -331,14 +344,14 @@ class BaseTestCase extends Zend_Test_PHPUnit_ControllerTestCase implements DbTes
/**
* Require all libraries to instantiate forms
*/
public function requireFormLibraries()
public static function requireFormLibraries()
{
// @codingStandardsIgnoreStart
require_once 'Zend/Form/Decorator/Abstract.php';
require_once 'Zend/Validate/Abstract.php';
require_once 'Zend/Form/Element/Xhtml.php';
require_once 'Zend/Form/Element/Text.php';
require_once 'Zend/Form/Element/Submit.php';
require_once 'Zend/Form/Element/Checkbox.php';
require_once 'Zend/Form.php';
require_once 'Zend/View.php';
@ -358,29 +371,26 @@ class BaseTestCase extends Zend_Test_PHPUnit_ControllerTestCase implements DbTes
require_once self::$libDir . '/Web/Form.php';
require_once self::$libDir . '/User/Preferences.php';
// @codingStandardsIgnoreEnd
require_once self::$libDir . '/User/Preferences/ChangeSet.php';
}
/**
* Require all classes for database adapter creation
*/
public function requireDbLibraries()
public static function requireDbLibraries()
{
// @codingStandardsIgnoreStart
require_once 'Zend/Config.php';
require_once 'Zend/Db.php';
require_once 'Zend/Log.php';
require_once realpath(self::$libDir . '/Exception/ConfigurationError.php');
require_once realpath(self::$libDir . '/Util/ConfigAwareFactory.php');
require_once realpath(self::$libDir . '/Application/DbAdapterFactory.php');
require_once realpath(self::$libDir . '/Application/Logger.php');
// @codingStandardsIgnoreEnd
require_once self::$libDir . '/Exception/ConfigurationError.php';
require_once self::$libDir . '/Util/ConfigAwareFactory.php';
require_once self::$libDir . '/Application/DbAdapterFactory.php';
require_once self::$libDir . '/Application/Logger.php';
}
}
}
// @codingStandardsIgnoreStart
BaseTestCase::setupDirectories();
// @codingStandardsIgnoreEnd
BaseTestCase::setupDirectories();
BaseTestCase::requireFormLibraries();
BaseTestcase::requireDbLibraries();
}

5
library/Icinga/Test/FormTest.php
View File

@ -44,9 +44,4 @@ interface FormTest
* @return Form
*/
public function createForm($formClass, array $requestData = array());
/**
* Require all libraries to instantiate forms
*/
public function requireFormLibraries();
}