From c3d1408c52dabcafa314fcc13d19f0c537d3a5df Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 18:49:27 -0500
Subject: [ticket/9983] get/put cache test moved to a base class.

PHPBB3-9983
---
 tests/cache/common_test_case.php  | 24 ++++++++++++++++++++++++
 tests/cache/file_driver_test.php  | 16 +++-------------
 tests/cache/null_driver_test.php  | 10 ++++++++++
 tests/cache/redis_driver_test.php |  4 +++-
 4 files changed, 40 insertions(+), 14 deletions(-)
 create mode 100644 tests/cache/common_test_case.php

(limited to 'tests/cache')

diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php
new file mode 100644
index 0000000000..059ce25133
--- /dev/null
+++ b/tests/cache/common_test_case.php
@@ -0,0 +1,24 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+abstract class phpbb_cache_common_test_case extends phpbb_database_test_case
+{
+	public function test_get_put()
+	{
+		$this->assertSame(false, $this->driver->get('test_key'));
+
+		$this->driver->put('test_key', 'test_value');
+
+		$this->assertEquals(
+			'test_value',
+			$this->driver->get('test_key'),
+			'File ACM put and get'
+		);
+	}
+}
diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php
index 436bd2f6bc..67408cc6d9 100644
--- a/tests/cache/file_driver_test.php
+++ b/tests/cache/file_driver_test.php
@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_cache_file_driver_test extends phpbb_database_test_case
+require_once dirname(__FILE__) . '/common_test_case.php';
+
+class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case
 {
 	private $cache_dir;
 	protected $driver;
@@ -65,18 +67,6 @@ class phpbb_cache_file_driver_test extends phpbb_database_test_case
 		rmdir($this->cache_dir);
 	}
 
-	public function test_cache_driver_file()
-	{
-		$this->driver->put('test_key', 'test_value');
-		$this->driver->save();
-
-		$this->assertEquals(
-			'test_value',
-			$this->driver->get('test_key'),
-			'File ACM put and get'
-		);
-	}
-
 	public function test_cache_sql_file()
 	{
 		global $db, $cache;
diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php
index 45e53edaa1..efa56762bf 100644
--- a/tests/cache/null_driver_test.php
+++ b/tests/cache/null_driver_test.php
@@ -23,6 +23,16 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case
 		$this->driver = new phpbb_cache_driver_null;
 	}
 
+	public function test_get_put()
+	{
+		$this->assertSame(false, $this->driver->get('key'));
+
+		$this->driver->put('key', 'value');
+
+		// null driver does not cache
+		$this->assertSame(false, $this->driver->get('key'));
+	}
+
 	public function test_null_cache_sql()
 	{
 		global $db, $cache;
diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php
index be8b518dca..bf8e49eb65 100644
--- a/tests/cache/redis_driver_test.php
+++ b/tests/cache/redis_driver_test.php
@@ -7,7 +7,9 @@
 *
 */
 
-class phpbb_cache_redis_driver_test extends phpbb_database_test_case
+require_once dirname(__FILE__) . '/common_test_case.php';
+
+class phpbb_cache_redis_driver_test extends phpbb_cache_common_test_case
 {
 	protected static $config;
 	protected $driver;
-- 
cgit v1.2.1