diff options
author | Andrey Andreev <narf@devilix.net> | 2013-07-27 17:10:13 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2013-07-27 17:10:13 +0200 |
commit | cccee50381def0777057e9b5803f7f26156c3d8e (patch) | |
tree | 6a02f47c889fdacbee235e7680a9ca2dcca30f04 /tests/codeigniter/core/Config_test.php | |
parent | 627ef043db42b0cfee2620875339f488268519f1 (diff) | |
parent | c1044cb62e39709aa14f86a56bc950a78cfc713c (diff) |
Merge pull request #2554 from vlakoff/develop-3
config->item() now returns NULL instead of FALSE when the required item doesn't exist.
Diffstat (limited to 'tests/codeigniter/core/Config_test.php')
-rw-r--r-- | tests/codeigniter/core/Config_test.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php index e3be8a3fc..ba9a2c070 100644 --- a/tests/codeigniter/core/Config_test.php +++ b/tests/codeigniter/core/Config_test.php @@ -24,18 +24,18 @@ class Config_test extends CI_TestCase { $this->assertEquals($this->cfg['base_url'], $this->config->item('base_url')); // Bad Config value - $this->assertFalse($this->config->item('no_good_item')); + $this->assertNull($this->config->item('no_good_item')); // Index - $this->assertFalse($this->config->item('no_good_item', 'bad_index')); - $this->assertFalse($this->config->item('no_good_item', 'default')); + $this->assertNull($this->config->item('no_good_item', 'bad_index')); + $this->assertNull($this->config->item('no_good_item', 'default')); } // -------------------------------------------------------------------- public function test_set_item() { - $this->assertFalse($this->config->item('not_yet_set')); + $this->assertNull($this->config->item('not_yet_set')); $this->config->set_item('not_yet_set', 'is set'); $this->assertEquals('is set', $this->config->item('not_yet_set')); @@ -46,7 +46,7 @@ class Config_test extends CI_TestCase { public function test_slash_item() { // Bad Config value - $this->assertFalse($this->config->slash_item('no_good_item')); + $this->assertNull($this->config->slash_item('no_good_item')); $this->assertEquals($this->cfg['base_url'], $this->config->slash_item('base_url')); $this->assertEquals($this->cfg['subclass_prefix'].'/', $this->config->slash_item('subclass_prefix')); |