Browse Source

little changes

master
Anton Grebnev 13 years ago
parent
commit
3659cca99e
  1. 27
      tests/ConfigTest.php
  2. 1
      tests/util/profiler/ProfilerTest.php

27
tests/ConfigTest.php

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

1
tests/util/profiler/ProfilerTest.php

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

Loading…
Cancel
Save