3 files changed, 13 insertions, 51 deletions
diff --git a/tests/cache/all_tests.php b/tests/cache/all_tests.php
deleted file mode 100644
index 829d496e5d..0000000000
--- a/tests/cache/all_tests.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_request_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'cache/cache_test.php';
-
-class phpbb_cache_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Cache System');
-
-		$suite->addTestSuite('phpbb_cache_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_cache_all_tests::main')
-{
-	phpbb_cache_all_tests::main();
-}
diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php
index 220fddfd25..463095f129 100644
--- a/tests/cache/cache_test.php
+++ b/tests/cache/cache_test.php
@@ -2,37 +2,39 @@
 /**
 *
 * @package testing
-* @version $Id$
 * @copyright (c) 2010 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
 
-require_once 'test_framework/framework.php';
+require_once __DIR__ . '/../../phpBB/includes/functions.php';
 
 class phpbb_cache_test extends phpbb_test_case
 {
 	protected function tearDown()
 	{
-		$iterator = new DirectoryIterator('cache/tmp');
+		$iterator = new DirectoryIterator(__DIR__ . '/tmp');
 		foreach ($iterator as $file)
 		{
-			if (is_file('cache/tmp/' . $file))
+			if (is_file(__DIR__ . '/tmp/' . $file) && $file != '.gitkeep')
 			{
-				unlink('cache/tmp/' . $file);
+				unlink(__DIR__ . '/tmp/' . $file);
 			}
 		}
 	}
 
-	public function test_acm_file()
+	public function test_cache_driver_file()
 	{
-		$acm = new phpbb_cache_driver_file('cache/tmp/');
-		$acm->put('test_key', 'test_value');
-		$acm->save();
-		
+		global $phpEx;
+		$phpEx = 'txt'; // do not store files as .php
+
+		$driver = new phpbb_cache_driver_file(__DIR__ . '/tmp/');
+		$driver->put('test_key', 'test_value');
+		$driver->save();
+
 		$this->assertEquals(
 			'test_value',
-			$acm->get('test_key'),
+			$driver->get('test_key'),
 			'File ACM put and get'
 		);
 	}
diff --git a/tests/cache/tmp/.gitkeep b/tests/cache/tmp/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/cache/tmp/.gitkeep