Raised CI_Loader test coverage to 93%
Signed-off-by: dchill42 <dchill42@gmail.com>
diff --git a/tests/mocks/ci_testcase.php b/tests/mocks/ci_testcase.php
index e581d4b..f164929 100644
--- a/tests/mocks/ci_testcase.php
+++ b/tests/mocks/ci_testcase.php
@@ -38,6 +38,7 @@
$this->ci_vfs_root = vfsStream::setup();
$this->ci_app_root = vfsStream::newDirectory('application')->at($this->ci_vfs_root);
$this->ci_base_root = vfsStream::newDirectory('system')->at($this->ci_vfs_root);
+ $this->ci_view_root = vfsStream::newDirectory('views')->at($this->ci_app_root);
if (method_exists($this, 'set_up'))
{
diff --git a/tests/mocks/ci_testconfig.php b/tests/mocks/ci_testconfig.php
index eb318dd..0c52bb9 100644
--- a/tests/mocks/ci_testconfig.php
+++ b/tests/mocks/ci_testconfig.php
@@ -4,14 +4,16 @@
public $config = array();
public $_config_paths = array(APPPATH);
+ public $loaded = array();
public function item($key)
{
return isset($this->config[$key]) ? $this->config[$key] : FALSE;
}
- public function load($arg1, $arg2, $arg3)
+ public function load($file, $arg2 = FALSE, $arg3 = FALSE)
{
+ $this->loaded[] = $file;
return TRUE;
}
diff --git a/tests/mocks/core/common.php b/tests/mocks/core/common.php
index b001074..9289b27 100644
--- a/tests/mocks/core/common.php
+++ b/tests/mocks/core/common.php
@@ -170,9 +170,10 @@
if ( ! function_exists('is_loaded'))
{
- function is_loaded()
+ function &is_loaded()
{
- throw new Exception('Bad Isolation: mock up environment');
+ $loaded = array();
+ return $loaded;
}
}
@@ -190,4 +191,4 @@
{
return TRUE;
}
-}
+}
\ No newline at end of file
diff --git a/tests/mocks/core/loader.php b/tests/mocks/core/loader.php
deleted file mode 100644
index 7ea4da3..0000000
--- a/tests/mocks/core/loader.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-class Mock_Core_Loader extends CI_Loader {
-
- /**
- * Give public access to _ci_autoloader for testing
- */
- public function autoload()
- {
- $this->_ci_autoloader();
- }
-
-}
diff --git a/tests/mocks/database/schema/skeleton.php b/tests/mocks/database/schema/skeleton.php
index 18e1ddd..69e3c18 100644
--- a/tests/mocks/database/schema/skeleton.php
+++ b/tests/mocks/database/schema/skeleton.php
@@ -30,7 +30,7 @@
CI_TestCase::instance()->ci_instance_var('db', $db);
- $loader = new Mock_Core_Loader();
+ $loader = new CI_Loader();
$loader->dbforge();
$forge = CI_TestCase::instance()->ci_instance_var('dbforge');