diff --git a/lib/Cake/tests/cases/libs/cache/apc.test.php b/lib/Cake/tests/cases/libs/cache/apc.test.php index 0abd07778..28043b908 100644 --- 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 index fb6741a7a..50d20181e 100644 --- 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 index 61bcec550..ada9c52bc 100644 --- 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 index eea1c4b2c..5788118c3 100644 --- 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