summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/codeigniter/core/Loader_test.php36
1 files changed, 27 insertions, 9 deletions
diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index 1e32c7e0a..55ab9a4e5 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -195,8 +195,8 @@ class Loader_test extends CI_TestCase {
'foo' => 'bar'
);
- $this->assertEquals(NULL, $this->load->vars($vars));
- $this->assertEquals(NULL, $this->load->vars('foo', 'bar'));
+ $this->assertNull($this->load->vars($vars));
+ $this->assertNull($this->load->vars('foo', 'bar'));
}
// --------------------------------------------------------------------
@@ -230,12 +230,30 @@ class Loader_test extends CI_TestCase {
// --------------------------------------------------------------------
- // public function testLoadConfig()
- // {
- // $this->assertEquals(NULL, $this->load->config('config', FALSE, TRUE));
- // }
-}
-
-
+ public function testLoadConfig()
+ {
+ $this->_setup_config_mock();
+
+ $this->assertNull($this->load->config('config', FALSE));
+ }
+
+ // --------------------------------------------------------------------
+ public function testLoadBadConfig()
+ {
+ $this->_setup_config_mock();
+
+ $this->setExpectedException(
+ 'Exception',
+ 'CI Error: The configuration file foobar.php does not exist.'
+ );
+
+ $this->load->config('foobar', FALSE);
+ }
+ // --------------------------------------------------------------------
+
+
+
+
+} \ No newline at end of file