2 files changed, 57 insertions, 6 deletions
diff --git a/tests/class_loader/cache_mock.php b/tests/class_loader/cache_mock.php
index b254978fcc..73d1e64cf5 100644
--- a/tests/class_loader/cache_mock.php
+++ b/tests/class_loader/cache_mock.php
@@ -8,7 +8,9 @@
 *
 */
 
-class phpbb_cache_mock
+require '../phpBB/includes/cache/driver/interface.php';
+
+class phpbb_cache_mock implements phpbb_cache_driver_interface
 {
 	private $variables = array();
 
@@ -22,8 +24,51 @@ class phpbb_cache_mock
 		return false;
 	}
 
-	function put($var_name, $value)
+	function put($var_name, $value, $ttl = 0)
 	{
 		$this->variables[$var_name] = $value;
 	}
+
+	function load()
+	{
+	}
+	function unload()
+	{
+	}
+	function save()
+	{
+	}
+	function tidy()
+	{
+	}
+	function purge()
+	{
+	}
+	function destroy($var_name, $table = '')
+	{
+	}
+	public function _exists($var_name)
+	{
+	}
+	public function sql_load($query)
+	{
+	}
+	public function sql_save($query, &$query_result, $ttl)
+	{
+	}
+	public function sql_exists($query_id)
+	{
+	}
+	public function sql_fetchrow($query_id)
+	{
+	}
+	public function sql_fetchfield($query_id, $field)
+	{
+	}
+	public function sql_rowseek($rownum, $query_id)
+	{
+	}
+	public function sql_freeresult($query_id)
+	{
+	}
 }
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
index 3eb3c915a1..c01278f914 100644
--- a/tests/class_loader/class_loader_test.php
+++ b/tests/class_loader/class_loader_test.php
@@ -10,8 +10,6 @@
 
 require_once __DIR__ . '/cache_mock.php';
 
-require_once __DIR__ . '/../../phpBB/includes/class_loader.php';
-
 class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 {
 	public function setUp()
@@ -63,8 +61,16 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 
 	public function test_resolve_cached()
 	{
-		$cache = new phpbb_cache_mock;
-		$cache->put('class_loader', array('phpbb_a_cached_name' => 'a/cached_name'));
+		$cacheMap = array('class_loader' => array('phpbb_a_cached_name' => 'a/cached_name'));
+
+		$cache = $this->getMock('phpbb_cache_driver_interface',
+					array('get', 'put', 'load', 'unload', 'save', 'tidy', 'purge', 'destroy', '_exists',
+						'sql_load', 'sql_save', 'sql_exists', 'sql_fetchrow', 'sql_fetchfield', 'sql_rowseek', 'sql_freeresult'));
+		$cache->expects($this->any())
+			->method('get')
+			->will($this->returnCallback(function($var_name) use ($cacheMap) {
+				return $cacheMap[$var_name];
+			}));
 
 		$prefix = __DIR__ . '/';
 		$class_loader = new phpbb_class_loader($prefix, '.php', $cache);