Fixing Cache tests

lib/Cake/Cache/Cache.php

@@ -125,9 +125,9 @@ class Cache {
 	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;
 		}

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 @@ class CacheTest extends CakeTestCase {
  * @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(
+		$expecting = $override + $initial;
-			'engine' => 'File',
-			'duration'=> 3600,
-			'probability' => 100,
-			'path'=> TMP . 'tests',
-			'prefix'=> 'cake_',
-			'lock' => false,
-			'serialize'=> true,
-			'isWindows' => DIRECTORY_SEPARATOR == '\\'
-		);
 		$this->assertEqual($settings, $expecting);
 	}