wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace constant DEBUG to use in Config. Remove start profiler from FrontController (moved to bootstrap).

Browse Source
This commit is contained in:
Alexander Demidov
2012-06-27 17:56:06 +04:00
parent bcc9be619d
commit cfd6536c5f
26 changed files with 134 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/util/profiler/ProfilerTest.php
View File

@ -36,9 +36,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/
public function testGetInstaceNoDebug()
{
if (!defined('DEBUG')) {
define('DEBUG', false);
}
Config::set('DEBUG', 0);
$this->setExpectedException('GeneralException', 'Need to turn on DEBUG before use.');
Profiler::getInstance();
}
@ -48,9 +46,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/
public function testGetInstance()
{
if (!defined('DEBUG')) {
define('DEBUG', true);
}
Config::set('DEBUG', 1);
$profiler = Profiler::getInstance();
$this->assertInstanceOf('Profiler', $profiler);
$this->assertSame($profiler, Profiler::getInstance());
@ -61,9 +57,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/
public function testProfilerCommand()
{
if (!defined('DEBUG')) {
define('DEBUG', true);
}
Config::set('DEBUG', 1);
$this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false);
$profiler = Profiler::getInstance();
$cmdProfiler = $profiler->profilerCommand('command', 'type');
@ -75,9 +69,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/
public function testStartEndNoCommandProfiler()
{
if (!defined('DEBUG')) {
define('DEBUG', true);
}
Config::set('DEBUG', 1);
$profiler = Profiler::getInstance();
$profiler->start();
$result = $profiler->end('<body></body>');
@ -95,9 +87,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/
public function testStartEndWithCommandProfiler()
{
if (!defined('DEBUG')) {
define('DEBUG', true);
}
Config::set('DEBUG', 1);
$this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false);
$profiler = Profiler::getInstance();
@ -115,9 +105,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/
public function testGetJSON()
{
if (!defined('DEBUG')) {
define('DEBUG', true);
}
Config::set('DEBUG', 1);
$this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false);
$profiler = Profiler::getInstance();
@ -130,9 +118,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/
public function testGetCLI()
{
if (!defined('DEBUG')) {
define('DEBUG', true);
}
Config::set('DEBUG', 1);
$this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false);
$profiler = Profiler::getInstance();