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

little changes

Browse Source
This commit is contained in:
Anton Grebnev
2011-10-29 15:39:19 +04:00
parent e80e65f137
commit 3659cca99e
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/ConfigTest.php
View File

@ -15,23 +15,24 @@ require_once dirname(__FILE__) . '/../Config.php';
class ConfigTest extends PHPUnit_Framework_TestCase class ConfigTest extends PHPUnit_Framework_TestCase
{ {
private $_instance = null; private $_instance = null;
public function setUp() public function setUp()
{ {
$this->_instance = Config::getInstance(); $this->_instance = Config::getInstance();
} }
public function testGetInstance() public function testGetInstance()
{ {
$this->assertSame($this->_instance, Config::getInstance()); $this->assertSame($this->_instance, Config::getInstance());
/** /**
* @TODO: Config - class does not instanciate, Registry instead!!! Use late static binding * @TODO: Config - class does not instanciate, Registry instead!!! Use late static binding
*/ */
$this->assertNotEquals('Config', get_class(Config::getInstance())); $this->assertNotEquals('Config', get_class(Config::getInstance()));
} }
/** /**
* @expectedException Exception * @expectedException Exception
* @expectedExceptionMessage Configuration variable * @expectedExceptionMessage Configuration variable
@ -39,20 +40,20 @@ class ConfigTest extends PHPUnit_Framework_TestCase
public function testArrayAsParam() public function testArrayAsParam()
{ {
$arr = array( $arr = array(
'one' => 1, 'one' => 1,
'two' => 2, 'two' => 2,
'three' => 3, 'three' => 3,
4 => 'four' 4 => 'four'
); );
Config::set(0, $arr); Config::set(0, $arr);
$new_arr = Config::get(0); $new_arr = Config::get(0);
$this->assertEquals('ConfigArray', get_class($new_arr)); $this->assertEquals('ConfigArray', get_class($new_arr));
$this->assertEquals('four', $new_arr->offsetGet(4)); $this->assertEquals('four', $new_arr->offsetGet(4));
$this->assertEquals(1, $new_arr->one); $this->assertEquals(1, $new_arr->one);
$this->assertNotEquals(1, $new_arr->offsetGet('two')); $this->assertNotEquals(1, $new_arr->offsetGet('two'));
$new_arr->some; $new_arr->some;
} }
} }

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

@ -139,7 +139,6 @@ class ProfilerTest extends PHPUnit_Framework_TestCase
$profiler = Profiler::getInstance(); $profiler = Profiler::getInstance();
$cmdProfiler = $profiler->profilerCommand('command', 'type'); $cmdProfiler = $profiler->profilerCommand('command', 'type');
$result = $profiler->getCli(); $result = $profiler->getCli();
echo $result;
$this->assertNotNull($result); $this->assertNotNull($result);
} }