Fixing cache engine tests

cakephp · Mar 6, 2011 · b286ff0 · b286ff0
1 parent eb70912
commit b286ff0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/lib/Cake/tests/cases/libs/cache/apc.test.php b/lib/Cake/tests/cases/libs/cache/apc.test.php
@@ -16,9 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('Cache')) {
-	require LIBS . 'cache.php';
-}
+
+App::uses('Cache', 'Cache');
 
 /**
  * ApcEngineTest class

diff --git a/lib/Cake/tests/cases/libs/cache/file.test.php b/lib/Cake/tests/cases/libs/cache/file.test.php
@@ -16,9 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('Cache')) {
-	require LIBS . 'cache.php';
-}
+
+App::uses('Cache', 'Cache');
 
 /**
  * FileEngineTest class

diff --git a/lib/Cake/tests/cases/libs/cache/memcache.test.php b/lib/Cake/tests/cases/libs/cache/memcache.test.php
@@ -16,10 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('Cache')) {
-	require LIBS . 'cache.php';
-}
-require_once LIBS . 'cache' . DS . 'memcache.php';
+
+App::uses('Cache', 'Cache');
+App::uses('MemcacheEngine', 'Cache/Engine');
 
 class TestMemcacheEngine extends MemcacheEngine {
 /**

diff --git a/lib/Cake/tests/cases/libs/cache/xcache.test.php b/lib/Cake/tests/cases/libs/cache/xcache.test.php
@@ -16,9 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('Cache')) {
-	require LIBS . 'cache.php';
-}
+
+App::uses('Cache', 'Cache');
 
 /**
  * XcacheEngineTest class