From 72c6e0cd58dcb5ba2d1f04c47633bbc8bd3037d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=CC=81=20Lorenzo=20Rodri=CC=81guez?=
 <jose.zap@gmail.com>
Date: Mon, 31 Jan 2011 00:47:30 -0430
Subject: [PATCH] Fixing Cache tests

---
 lib/Cake/Cache/Cache.php                      |  4 ++--
 lib/Cake/tests/cases/libs/cache.test.php      | 20 ++++++-------------
 .../Engine/TestAppCacheEngine.php}            |  0
 .../Engine/TestPluginCacheEngine.php}         |  0
 4 files changed, 8 insertions(+), 16 deletions(-)
 rename lib/Cake/tests/test_app/libs/{cache/test_app_cache.php => Cache/Engine/TestAppCacheEngine.php} (100%)
 rename lib/Cake/tests/test_app/plugins/test_plugin/libs/{cache/test_plugin_cache.php => Cache/Engine/TestPluginCacheEngine.php} (100%)

diff --git a/lib/Cake/Cache/Cache.php b/lib/Cake/Cache/Cache.php
index 9f84ac99779..59b62fd7a34 100644
--- a/lib/Cake/Cache/Cache.php
+++ b/lib/Cake/Cache/Cache.php
@@ -125,9 +125,9 @@ public static function config($name = null, $settings = array()) {
 	protected static function _buildEngine($name) {
 		$config = self::$_config[$name];
 
-		list($plugin, $class) = pluginSplit($config['engine']);
+		list($plugin, $class) = pluginSplit($config['engine'], true);
 		$cacheClass = $class . 'Engine';
-		App::uses($cacheClass, 'Cache/Engine');
+		App::uses($cacheClass, $plugin . 'Cache/Engine');
 		if (!class_exists($cacheClass)) {
 			return false;
 		}
diff --git a/lib/Cake/tests/cases/libs/cache.test.php b/lib/Cake/tests/cases/libs/cache.test.php
index 82c8a7c107a..b0bf9e33d9e 100644
--- a/lib/Cake/tests/cases/libs/cache.test.php
+++ b/lib/Cake/tests/cases/libs/cache.test.php
@@ -16,9 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('Cache')) {
-	require LIBS . 'cache.php';
-}
+
+App::uses('Cache', 'Cache');
 
 /**
  * CacheTest class
@@ -234,19 +233,12 @@ function testConfigured() {
  * @return void
  */
 	function testInitSettings() {
-		Cache::config('default', array('engine' => 'File', 'path' => TMP . 'tests'));
+		$initial = Cache::settings();
+		$override = array('engine' => 'File', 'path' => TMP . 'tests');
+		Cache::config('default', $override);
 
 		$settings = Cache::settings();
-		$expecting = array(
-			'engine' => 'File',
-			'duration'=> 3600,
-			'probability' => 100,
-			'path'=> TMP . 'tests',
-			'prefix'=> 'cake_',
-			'lock' => false,
-			'serialize'=> true,
-			'isWindows' => DIRECTORY_SEPARATOR == '\\'
-		);
+		$expecting = $override + $initial;
 		$this->assertEqual($settings, $expecting);
 	}
 
diff --git a/lib/Cake/tests/test_app/libs/cache/test_app_cache.php b/lib/Cake/tests/test_app/libs/Cache/Engine/TestAppCacheEngine.php
similarity index 100%
rename from lib/Cake/tests/test_app/libs/cache/test_app_cache.php
rename to lib/Cake/tests/test_app/libs/Cache/Engine/TestAppCacheEngine.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/lib/Cake/tests/test_app/plugins/test_plugin/libs/Cache/Engine/TestPluginCacheEngine.php
similarity index 100%
rename from lib/Cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/libs/Cache/Engine/TestPluginCacheEngine.php