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

Fixed tests RedisDebugTest, ProfilerTest with use PROFILER setting.

Browse Source
This commit is contained in:
Alexander Demidov
2012-07-09 14:28:02 +04:00
parent a0010c3706
commit 69cd61121e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/redis/RedisDebugTest.php
View File

@ -59,7 +59,7 @@ class RedisDebugTest extends PHPUnit_Framework_TestCase
*/ */
public function testCallSimpleParams() public function testCallSimpleParams()
{ {
Config::set('DEBUG', true); Config::set('PROFILER', true);
$mock = $this->getMock('Redis', array('connect')); $mock = $this->getMock('Redis', array('connect'));
$mock->expects($this->once()) $mock->expects($this->once())
@ -77,7 +77,7 @@ class RedisDebugTest extends PHPUnit_Framework_TestCase
*/ */
public function testCallArrayParam() public function testCallArrayParam()
{ {
Config::set('DEBUG', true); Config::set('PROFILER', true);
$mock = $this->getMock('Redis', array('connect')); $mock = $this->getMock('Redis', array('connect'));
$mock->expects($this->once()) $mock->expects($this->once())
@ -95,7 +95,7 @@ class RedisDebugTest extends PHPUnit_Framework_TestCase
*/ */
public function testCallUndefinedMethod() public function testCallUndefinedMethod()
{ {
Config::set('DEBUG', true); Config::set('PROFILER', true);
$mock = $this->getMock('Redis', array('connect')); $mock = $this->getMock('Redis', array('connect'));
$redisDebug = new RedisDebug($mock); $redisDebug = new RedisDebug($mock);

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

@ -38,8 +38,8 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/ */
public function testGetInstaceNoDebug() public function testGetInstaceNoDebug()
{ {
Config::set('DEBUG', false); Config::set('PROFILER', false);
$this->setExpectedException('GeneralException', 'Need to turn on DEBUG before use.'); $this->setExpectedException('GeneralException', 'Need to turn on PROFILER before use.');
Profiler::getInstance(); Profiler::getInstance();
} }
@ -48,7 +48,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/ */
public function testGetInstance() public function testGetInstance()
{ {
Config::set('DEBUG', true); Config::set('PROFILER', true);
$profiler = Profiler::getInstance(); $profiler = Profiler::getInstance();
$this->assertInstanceOf('Profiler', $profiler); $this->assertInstanceOf('Profiler', $profiler);
$this->assertSame($profiler, Profiler::getInstance()); $this->assertSame($profiler, Profiler::getInstance());
@ -59,7 +59,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/ */
public function testProfilerCommand() public function testProfilerCommand()
{ {
Config::set('DEBUG', true); Config::set('PROFILER', true);
$this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false); $this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false);
$profiler = Profiler::getInstance(); $profiler = Profiler::getInstance();
$cmdProfiler = $profiler->profilerCommand('command', 'type'); $cmdProfiler = $profiler->profilerCommand('command', 'type');
@ -71,7 +71,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/ */
public function testStartEndNoCommandProfiler() public function testStartEndNoCommandProfiler()
{ {
Config::set('DEBUG', true); Config::set('PROFILER', true);
$profiler = Profiler::getInstance(); $profiler = Profiler::getInstance();
$profiler->start(); $profiler->start();
$result = $profiler->end('<body></body>'); $result = $profiler->end('<body></body>');
@ -89,7 +89,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/ */
public function testStartEndWithCommandProfiler() public function testStartEndWithCommandProfiler()
{ {
Config::set('DEBUG', true); Config::set('PROFILER', true);
$this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false); $this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false);
$profiler = Profiler::getInstance(); $profiler = Profiler::getInstance();
@ -107,7 +107,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/ */
public function testGetJSON() public function testGetJSON()
{ {
Config::set('DEBUG', true); Config::set('PROFILER', true);
$this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false); $this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false);
$profiler = Profiler::getInstance(); $profiler = Profiler::getInstance();
@ -120,7 +120,7 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
*/ */
public function testGetCLI() public function testGetCLI()
{ {
Config::set('DEBUG', true); Config::set('PROFILER', true);
$this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false); $this->getMock('CommandProfiler', array('getType', 'getCommand', 'getElapsed'), array(), 'CommandProfilerMock', false);
$profiler = Profiler::getInstance(); $profiler = Profiler::getInstance();