From 7bba09811c65acfd98ebf1e6626f59de7a16cbb3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 30 Nov 2012 12:18:33 -0500
Subject: [ticket/10875] Revise sql cache test.

Delete data from database before retrieving it from cache,
ensuring results come from cache.

PHPBB3-10875
---
 tests/cache/cache_test.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'tests/cache')

diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php
index c5f5fac88c..40eef91d53 100644
--- a/tests/cache/cache_test.php
+++ b/tests/cache/cache_test.php
@@ -89,20 +89,26 @@ class phpbb_cache_test extends phpbb_database_test_case
 			WHERE config_name = 'foo'";
 		$result = $db->sql_query($sql, 300);
 		$first_result = $db->sql_fetchrow($result);
+		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
+		$this->assertEquals($expected, $first_result);
 
 		$this->assertFileExists($this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php');
 
+		$sql = "DELETE FROM phpbb_config";
+		$result = $db->sql_query($sql);
+
 		$sql = "SELECT * FROM phpbb_config
 			WHERE config_name = 'foo'";
 		$result = $db->sql_query($sql, 300);
 
-		$this->assertEquals($first_result, $db->sql_fetchrow($result));
+		$this->assertEquals($expected, $db->sql_fetchrow($result));
 
 		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'bar'";
-		$result = $db->sql_query($sql, 300);
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql);
 
-		$this->assertNotEquals($first_result, $db->sql_fetchrow($result));
+		$no_cache_result = $db->sql_fetchrow($result);
+		$this->assertSame(false, $no_cache_result);
 
 		$db->sql_close();
 	}
-- 
cgit v1.2.1


From 0c06ac466f61cdab1c647cec23ea66ef70b2ad7e Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Fri, 30 Nov 2012 12:28:13 -0500
Subject: [ticket/10875] Test for null cache driver and sql cache.

PHPBB3-10875
---
 tests/cache/cache_test.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'tests/cache')

diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php
index 40eef91d53..c904aa6c41 100644
--- a/tests/cache/cache_test.php
+++ b/tests/cache/cache_test.php
@@ -112,4 +112,33 @@ class phpbb_cache_test extends phpbb_database_test_case
 
 		$db->sql_close();
 	}
+
+	public function test_null_cache_sql()
+	{
+		$driver = new phpbb_cache_driver_null($this->cache_dir);
+
+		global $db, $cache;
+		$db = $this->new_dbal();
+		$cache = new phpbb_cache_service($driver);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+		$first_result = $db->sql_fetchrow($result);
+		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
+		$this->assertEquals($expected, $first_result);
+
+		$sql = "DELETE FROM phpbb_config";
+		$result = $db->sql_query($sql);
+
+		// As null cache driver does not actually cache,
+		// this should return no results
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertSame(false, $db->sql_fetchrow($result));
+
+		$db->sql_close();
+	}
 }
-- 
cgit v1.2.1


From e4d2ad6b2788d9c3c030382f5ad2f02b6b7f75db Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 1 Dec 2012 00:36:34 +0100
Subject: [ticket/10875] tests/cache/cache_test.php: Use single quotes where
 possible.

PHPBB3-10875
---
 tests/cache/cache_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/cache')

diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php
index c904aa6c41..285af5cd0c 100644
--- a/tests/cache/cache_test.php
+++ b/tests/cache/cache_test.php
@@ -94,7 +94,7 @@ class phpbb_cache_test extends phpbb_database_test_case
 
 		$this->assertFileExists($this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php');
 
-		$sql = "DELETE FROM phpbb_config";
+		$sql = 'DELETE FROM phpbb_config';
 		$result = $db->sql_query($sql);
 
 		$sql = "SELECT * FROM phpbb_config
@@ -128,7 +128,7 @@ class phpbb_cache_test extends phpbb_database_test_case
 		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
 		$this->assertEquals($expected, $first_result);
 
-		$sql = "DELETE FROM phpbb_config";
+		$sql = 'DELETE FROM phpbb_config';
 		$result = $db->sql_query($sql);
 
 		// As null cache driver does not actually cache,
-- 
cgit v1.2.1


From c852044d6eecc0a652800b1661491c0f9c545054 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 00:48:21 -0500
Subject: [ticket/9983] Add redis cache driver tests.

In order to not overwrite data in default redis store, at least
one of redis host or post must be explicitly specified.

Redis cache driver constructor has been modified to accept
host and port as parameters. This was not added to public API
as there are more parameters being passed via global constants.

PHPBB3-9983
---
 tests/cache/cache_test.php | 68 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 2 deletions(-)

(limited to 'tests/cache')

diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php
index 285af5cd0c..ad60a9077e 100644
--- a/tests/cache/cache_test.php
+++ b/tests/cache/cache_test.php
@@ -77,7 +77,7 @@ class phpbb_cache_test extends phpbb_database_test_case
 		);
 	}
 
-	public function test_cache_sql()
+	public function test_cache_sql_file()
 	{
 		$driver = new phpbb_cache_driver_file($this->cache_dir);
 
@@ -87,12 +87,76 @@ class phpbb_cache_test extends phpbb_database_test_case
 
 		$sql = "SELECT * FROM phpbb_config
 			WHERE config_name = 'foo'";
+
+		$cache_path = $this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php';
+		$this->assertFileNotExists($cache_path);
+
+		$result = $db->sql_query($sql, 300);
+		$first_result = $db->sql_fetchrow($result);
+		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
+		$this->assertEquals($expected, $first_result);
+
+		$this->assertFileExists($cache_path);
+
+		$sql = 'DELETE FROM phpbb_config';
+		$result = $db->sql_query($sql);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertEquals($expected, $db->sql_fetchrow($result));
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql);
+
+		$no_cache_result = $db->sql_fetchrow($result);
+		$this->assertSame(false, $no_cache_result);
+
+		$db->sql_close();
+	}
+
+	public function test_cache_sql_redis()
+	{
+		if (!extension_loaded('redis'))
+		{
+			$this->markTestSkipped('redis extension is not loaded');
+		}
+
+		$config = phpbb_test_case_helpers::get_test_config();
+		if (isset($config['redis_host']) || isset($config['redis_port']))
+		{
+			$host = isset($config['redis_host']) ? $config['redis_host'] : 'localhost';
+			$port = isset($config['redis_port']) ? $config['redis_port'] : 6379;
+		}
+		else
+		{
+			$this->markTestSkipped('Test redis host/port is not specified');
+		}
+		$driver = new phpbb_cache_driver_redis($host, $port);
+		$driver->purge();
+
+		global $db, $cache;
+		$db = $this->new_dbal();
+		$cache = new phpbb_cache_service($driver);
+
+		$redis = new Redis();
+		$ok = $redis->connect($host, $port);
+		$this->assertTrue($ok);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+
+		$key = $driver->key_prefix . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql));
+		$this->assertFalse($redis->exists($key));
+
 		$result = $db->sql_query($sql, 300);
 		$first_result = $db->sql_fetchrow($result);
 		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
 		$this->assertEquals($expected, $first_result);
 
-		$this->assertFileExists($this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php');
+		$this->assertTrue($redis->exists($key));
 
 		$sql = 'DELETE FROM phpbb_config';
 		$result = $db->sql_query($sql);
-- 
cgit v1.2.1


From 1e3dff83b3e56353fd97a6581989c478e52ed892 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 15:03:44 -0500
Subject: [ticket/9983] Split cache test into per-driver files.

PHPBB3-9983
---
 tests/cache/cache_test.php        | 208 --------------------------------------
 tests/cache/file_driver_test.php  | 117 +++++++++++++++++++++
 tests/cache/null_driver_test.php  |  45 +++++++++
 tests/cache/redis_driver_test.php |  89 ++++++++++++++++
 4 files changed, 251 insertions(+), 208 deletions(-)
 delete mode 100644 tests/cache/cache_test.php
 create mode 100644 tests/cache/file_driver_test.php
 create mode 100644 tests/cache/null_driver_test.php
 create mode 100644 tests/cache/redis_driver_test.php

(limited to 'tests/cache')

diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php
deleted file mode 100644
index ad60a9077e..0000000000
--- a/tests/cache/cache_test.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2010 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
-class phpbb_cache_test extends phpbb_database_test_case
-{
-	private $cache_dir;
-
-	public function __construct()
-	{
-		$this->cache_dir = dirname(__FILE__) . '/../tmp/cache/';
-	}
-
-	public function getDataSet()
-	{
-		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
-	}
-
-	protected function setUp()
-	{
-		parent::setUp();
-
-		if (file_exists($this->cache_dir))
-		{
-			// cache directory possibly left after aborted
-			// or failed run earlier
-			$this->remove_cache_dir();
-		}
-		$this->create_cache_dir();
-	}
-
-	protected function tearDown()
-	{
-		if (file_exists($this->cache_dir))
-		{
-			$this->remove_cache_dir();
-		}
-
-		parent::tearDown();
-	}
-
-	private function create_cache_dir()
-	{
-		$this->get_test_case_helpers()->makedirs($this->cache_dir);
-	}
-
-	private function remove_cache_dir()
-	{
-		$iterator = new DirectoryIterator($this->cache_dir);
-		foreach ($iterator as $file)
-		{
-			if ($file != '.' && $file != '..')
-			{
-				unlink($this->cache_dir . '/' . $file);
-			}
-		}
-		rmdir($this->cache_dir);
-	}
-
-	public function test_cache_driver_file()
-	{
-		$driver = new phpbb_cache_driver_file($this->cache_dir);
-		$driver->put('test_key', 'test_value');
-		$driver->save();
-
-		$this->assertEquals(
-			'test_value',
-			$driver->get('test_key'),
-			'File ACM put and get'
-		);
-	}
-
-	public function test_cache_sql_file()
-	{
-		$driver = new phpbb_cache_driver_file($this->cache_dir);
-
-		global $db, $cache;
-		$db = $this->new_dbal();
-		$cache = new phpbb_cache_service($driver);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-
-		$cache_path = $this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php';
-		$this->assertFileNotExists($cache_path);
-
-		$result = $db->sql_query($sql, 300);
-		$first_result = $db->sql_fetchrow($result);
-		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
-		$this->assertEquals($expected, $first_result);
-
-		$this->assertFileExists($cache_path);
-
-		$sql = 'DELETE FROM phpbb_config';
-		$result = $db->sql_query($sql);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql, 300);
-
-		$this->assertEquals($expected, $db->sql_fetchrow($result));
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql);
-
-		$no_cache_result = $db->sql_fetchrow($result);
-		$this->assertSame(false, $no_cache_result);
-
-		$db->sql_close();
-	}
-
-	public function test_cache_sql_redis()
-	{
-		if (!extension_loaded('redis'))
-		{
-			$this->markTestSkipped('redis extension is not loaded');
-		}
-
-		$config = phpbb_test_case_helpers::get_test_config();
-		if (isset($config['redis_host']) || isset($config['redis_port']))
-		{
-			$host = isset($config['redis_host']) ? $config['redis_host'] : 'localhost';
-			$port = isset($config['redis_port']) ? $config['redis_port'] : 6379;
-		}
-		else
-		{
-			$this->markTestSkipped('Test redis host/port is not specified');
-		}
-		$driver = new phpbb_cache_driver_redis($host, $port);
-		$driver->purge();
-
-		global $db, $cache;
-		$db = $this->new_dbal();
-		$cache = new phpbb_cache_service($driver);
-
-		$redis = new Redis();
-		$ok = $redis->connect($host, $port);
-		$this->assertTrue($ok);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-
-		$key = $driver->key_prefix . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql));
-		$this->assertFalse($redis->exists($key));
-
-		$result = $db->sql_query($sql, 300);
-		$first_result = $db->sql_fetchrow($result);
-		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
-		$this->assertEquals($expected, $first_result);
-
-		$this->assertTrue($redis->exists($key));
-
-		$sql = 'DELETE FROM phpbb_config';
-		$result = $db->sql_query($sql);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql, 300);
-
-		$this->assertEquals($expected, $db->sql_fetchrow($result));
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql);
-
-		$no_cache_result = $db->sql_fetchrow($result);
-		$this->assertSame(false, $no_cache_result);
-
-		$db->sql_close();
-	}
-
-	public function test_null_cache_sql()
-	{
-		$driver = new phpbb_cache_driver_null($this->cache_dir);
-
-		global $db, $cache;
-		$db = $this->new_dbal();
-		$cache = new phpbb_cache_service($driver);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql, 300);
-		$first_result = $db->sql_fetchrow($result);
-		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
-		$this->assertEquals($expected, $first_result);
-
-		$sql = 'DELETE FROM phpbb_config';
-		$result = $db->sql_query($sql);
-
-		// As null cache driver does not actually cache,
-		// this should return no results
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql, 300);
-
-		$this->assertSame(false, $db->sql_fetchrow($result));
-
-		$db->sql_close();
-	}
-}
diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php
new file mode 100644
index 0000000000..436bd2f6bc
--- /dev/null
+++ b/tests/cache/file_driver_test.php
@@ -0,0 +1,117 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2010 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_cache_file_driver_test extends phpbb_database_test_case
+{
+	private $cache_dir;
+	protected $driver;
+
+	public function __construct()
+	{
+		$this->cache_dir = dirname(__FILE__) . '/../tmp/cache/';
+	}
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		if (file_exists($this->cache_dir))
+		{
+			// cache directory possibly left after aborted
+			// or failed run earlier
+			$this->remove_cache_dir();
+		}
+		$this->create_cache_dir();
+
+		$this->driver = new phpbb_cache_driver_file($this->cache_dir);
+	}
+
+	protected function tearDown()
+	{
+		if (file_exists($this->cache_dir))
+		{
+			$this->remove_cache_dir();
+		}
+
+		parent::tearDown();
+	}
+
+	private function create_cache_dir()
+	{
+		$this->get_test_case_helpers()->makedirs($this->cache_dir);
+	}
+
+	private function remove_cache_dir()
+	{
+		$iterator = new DirectoryIterator($this->cache_dir);
+		foreach ($iterator as $file)
+		{
+			if ($file != '.' && $file != '..')
+			{
+				unlink($this->cache_dir . '/' . $file);
+			}
+		}
+		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;
+		$db = $this->new_dbal();
+		$cache = new phpbb_cache_service($this->driver);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+
+		$cache_path = $this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php';
+		$this->assertFileNotExists($cache_path);
+
+		$result = $db->sql_query($sql, 300);
+		$first_result = $db->sql_fetchrow($result);
+		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
+		$this->assertEquals($expected, $first_result);
+
+		$this->assertFileExists($cache_path);
+
+		$sql = 'DELETE FROM phpbb_config';
+		$result = $db->sql_query($sql);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertEquals($expected, $db->sql_fetchrow($result));
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql);
+
+		$no_cache_result = $db->sql_fetchrow($result);
+		$this->assertSame(false, $no_cache_result);
+
+		$db->sql_close();
+	}
+}
diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php
new file mode 100644
index 0000000000..7bf72931a0
--- /dev/null
+++ b/tests/cache/null_driver_test.php
@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_cache_null_driver_test extends phpbb_database_test_case
+{
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+	}
+
+	public function test_null_cache_sql()
+	{
+		$driver = new phpbb_cache_driver_null;
+
+		global $db, $cache;
+		$db = $this->new_dbal();
+		$cache = new phpbb_cache_service($driver);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+		$first_result = $db->sql_fetchrow($result);
+		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
+		$this->assertEquals($expected, $first_result);
+
+		$sql = 'DELETE FROM phpbb_config';
+		$result = $db->sql_query($sql);
+
+		// As null cache driver does not actually cache,
+		// this should return no results
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertSame(false, $db->sql_fetchrow($result));
+
+		$db->sql_close();
+	}
+}
diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php
new file mode 100644
index 0000000000..be8b518dca
--- /dev/null
+++ b/tests/cache/redis_driver_test.php
@@ -0,0 +1,89 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_cache_redis_driver_test extends phpbb_database_test_case
+{
+	protected static $config;
+	protected $driver;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+	}
+
+	static public function setUpBeforeClass()
+	{
+		if (!extension_loaded('redis'))
+		{
+			self::markTestSkipped('redis extension is not loaded');
+		}
+
+		$config = phpbb_test_case_helpers::get_test_config();
+		if (isset($config['redis_host']) || isset($config['redis_port']))
+		{
+			$host = isset($config['redis_host']) ? $config['redis_host'] : 'localhost';
+			$port = isset($config['redis_port']) ? $config['redis_port'] : 6379;
+			self::$config = array('host' => $host, 'port' => $port);
+		}
+		else
+		{
+			$this->markTestSkipped('Test redis host/port is not specified');
+		}
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->driver = new phpbb_cache_driver_redis(self::$config['host'], self::$config['port']);
+		$this->driver->purge();
+	}
+
+	public function test_cache_sql_redis()
+	{
+		global $db, $cache;
+		$db = $this->new_dbal();
+		$cache = new phpbb_cache_service($this->driver);
+
+		$redis = new Redis();
+		$ok = $redis->connect(self::$config['host'], self::$config['port']);
+		$this->assertTrue($ok);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+
+		$key = $this->driver->key_prefix . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql));
+		$this->assertFalse($redis->exists($key));
+
+		$result = $db->sql_query($sql, 300);
+		$first_result = $db->sql_fetchrow($result);
+		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
+		$this->assertEquals($expected, $first_result);
+
+		$this->assertTrue($redis->exists($key));
+
+		$sql = 'DELETE FROM phpbb_config';
+		$result = $db->sql_query($sql);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertEquals($expected, $db->sql_fetchrow($result));
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql);
+
+		$no_cache_result = $db->sql_fetchrow($result);
+		$this->assertSame(false, $no_cache_result);
+
+		$db->sql_close();
+	}
+}
-- 
cgit v1.2.1


From 829b75e5c8d7b053f3988db89f6f9505102c92b3 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 15:06:32 -0500
Subject: [ticket/9983] Create driver in setup in null driver test.

PHPBB3-9983
---
 tests/cache/null_driver_test.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'tests/cache')

diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php
index 7bf72931a0..45e53edaa1 100644
--- a/tests/cache/null_driver_test.php
+++ b/tests/cache/null_driver_test.php
@@ -9,18 +9,25 @@
 
 class phpbb_cache_null_driver_test extends phpbb_database_test_case
 {
+	protected $driver;
+
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
 	}
 
-	public function test_null_cache_sql()
+	protected function setUp()
 	{
-		$driver = new phpbb_cache_driver_null;
+		parent::setUp();
+
+		$this->driver = new phpbb_cache_driver_null;
+	}
 
+	public function test_null_cache_sql()
+	{
 		global $db, $cache;
 		$db = $this->new_dbal();
-		$cache = new phpbb_cache_service($driver);
+		$cache = new phpbb_cache_service($this->driver);
 
 		$sql = "SELECT * FROM phpbb_config
 			WHERE config_name = 'foo'";
-- 
cgit v1.2.1


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


From 90bd7858fdf418c45bac1b30a4dc634cd23f5247 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 18:52:04 -0500
Subject: [ticket/9983] Rename test methods.

PHPBB3-9983
---
 tests/cache/file_driver_test.php  | 2 +-
 tests/cache/null_driver_test.php  | 2 +-
 tests/cache/redis_driver_test.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/cache')

diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php
index 67408cc6d9..2353940277 100644
--- a/tests/cache/file_driver_test.php
+++ b/tests/cache/file_driver_test.php
@@ -67,7 +67,7 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case
 		rmdir($this->cache_dir);
 	}
 
-	public function test_cache_sql_file()
+	public function test_cache_sql()
 	{
 		global $db, $cache;
 		$db = $this->new_dbal();
diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php
index efa56762bf..a9b40c5f40 100644
--- a/tests/cache/null_driver_test.php
+++ b/tests/cache/null_driver_test.php
@@ -33,7 +33,7 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case
 		$this->assertSame(false, $this->driver->get('key'));
 	}
 
-	public function test_null_cache_sql()
+	public function test_cache_sql()
 	{
 		global $db, $cache;
 		$db = $this->new_dbal();
diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php
index bf8e49eb65..cd24e33baf 100644
--- a/tests/cache/redis_driver_test.php
+++ b/tests/cache/redis_driver_test.php
@@ -47,7 +47,7 @@ class phpbb_cache_redis_driver_test extends phpbb_cache_common_test_case
 		$this->driver->purge();
 	}
 
-	public function test_cache_sql_redis()
+	public function test_cache_sql()
 	{
 		global $db, $cache;
 		$db = $this->new_dbal();
-- 
cgit v1.2.1


From d9e636fab0b1c2de36e38e7bdd3498711108a0e6 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 18:53:13 -0500
Subject: [ticket/9983] Add a purge test.

PHPBB3-9983
---
 tests/cache/common_test_case.php | 15 +++++++++++++++
 tests/cache/null_driver_test.php |  6 ++++++
 2 files changed, 21 insertions(+)

(limited to 'tests/cache')

diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php
index 059ce25133..c44dbf5250 100644
--- a/tests/cache/common_test_case.php
+++ b/tests/cache/common_test_case.php
@@ -21,4 +21,19 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case
 			'File ACM put and get'
 		);
 	}
+
+	public function test_purge()
+	{
+		$this->driver->put('test_key', 'test_value');
+
+		$this->assertEquals(
+			'test_value',
+			$this->driver->get('test_key'),
+			'File ACM put and get'
+		);
+
+		$this->driver->purge();
+
+		$this->assertSame(false, $this->driver->get('test_key'));
+	}
 }
diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php
index a9b40c5f40..1e8b254294 100644
--- a/tests/cache/null_driver_test.php
+++ b/tests/cache/null_driver_test.php
@@ -33,6 +33,12 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case
 		$this->assertSame(false, $this->driver->get('key'));
 	}
 
+	public function test_purge()
+	{
+		// does nothing
+		$this->driver->purge();
+	}
+
 	public function test_cache_sql()
 	{
 		global $db, $cache;
-- 
cgit v1.2.1


From 8595b1f56018d0bfac0b83ac1511175c88a8b9cb Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 18:57:09 -0500
Subject: [ticket/9983] Exercise exists also.

PHPBB3-9983
---
 tests/cache/common_test_case.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/cache')

diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php
index c44dbf5250..5c387d98a1 100644
--- a/tests/cache/common_test_case.php
+++ b/tests/cache/common_test_case.php
@@ -9,12 +9,14 @@
 
 abstract class phpbb_cache_common_test_case extends phpbb_database_test_case
 {
-	public function test_get_put()
+	public function test_get_put_exists()
 	{
+		$this->assertFalse($this->driver->_exists('test_key'));
 		$this->assertSame(false, $this->driver->get('test_key'));
 
 		$this->driver->put('test_key', 'test_value');
 
+		$this->assertTrue($this->driver->_exists('test_key'));
 		$this->assertEquals(
 			'test_value',
 			$this->driver->get('test_key'),
-- 
cgit v1.2.1


From dd36b128e80112ba47ae51dca47702209e8aac18 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sat, 1 Dec 2012 18:59:28 -0500
Subject: [ticket/9983] Add a test for destroy.

PHPBB3-9983
---
 tests/cache/common_test_case.php | 23 +++++++++++++++++++++++
 tests/cache/null_driver_test.php |  6 ++++++
 2 files changed, 29 insertions(+)

(limited to 'tests/cache')

diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php
index 5c387d98a1..45cf80e424 100644
--- a/tests/cache/common_test_case.php
+++ b/tests/cache/common_test_case.php
@@ -38,4 +38,27 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case
 
 		$this->assertSame(false, $this->driver->get('test_key'));
 	}
+
+	public function test_destroy()
+	{
+		$this->driver->put('first_key', 'first_value');
+		$this->driver->put('second_key', 'second_value');
+
+		$this->assertEquals(
+			'first_value',
+			$this->driver->get('first_key')
+		);
+		$this->assertEquals(
+			'second_value',
+			$this->driver->get('second_key')
+		);
+
+		$this->driver->destroy('first_key');
+
+		$this->assertFalse($this->driver->_exists('first_key'));
+		$this->assertEquals(
+			'second_value',
+			$this->driver->get('second_key')
+		);
+	}
 }
diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php
index 1e8b254294..86553d4dc5 100644
--- a/tests/cache/null_driver_test.php
+++ b/tests/cache/null_driver_test.php
@@ -39,6 +39,12 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case
 		$this->driver->purge();
 	}
 
+	public function test_destroy()
+	{
+		// does nothing
+		$this->driver->destroy('foo');
+	}
+
 	public function test_cache_sql()
 	{
 		global $db, $cache;
-- 
cgit v1.2.1


From f2bee4b3831a09d09ba499bdf0dc90e9a590a85f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 3 Dec 2012 00:18:52 -0500
Subject: [ticket/9983] Test for apc cache driver.

PHPBB3-9983
---
 tests/cache/apc_driver_test.php | 79 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 tests/cache/apc_driver_test.php

(limited to 'tests/cache')

diff --git a/tests/cache/apc_driver_test.php b/tests/cache/apc_driver_test.php
new file mode 100644
index 0000000000..f6e001f705
--- /dev/null
+++ b/tests/cache/apc_driver_test.php
@@ -0,0 +1,79 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+// Important: apc.enable_cli=1 must be in php.ini.
+// http://forums.devshed.com/php-development-5/apc-problem-561290.html
+// http://php.net/manual/en/apc.configuration.php
+
+require_once dirname(__FILE__) . '/common_test_case.php';
+
+class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case
+{
+	protected static $config;
+	protected $driver;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
+	}
+
+	static public function setUpBeforeClass()
+	{
+		if (!extension_loaded('apc'))
+		{
+			self::markTestSkipped('apc extension is not loaded');
+		}
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->driver = new phpbb_cache_driver_apc;
+		$this->driver->purge();
+	}
+
+	public function test_cache_sql()
+	{
+		global $db, $cache;
+		$db = $this->new_dbal();
+		$cache = new phpbb_cache_service($this->driver);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+
+		$key = $this->driver->key_prefix . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql));
+		$this->assertFalse(apc_fetch($key));
+
+		$result = $db->sql_query($sql, 300);
+		$first_result = $db->sql_fetchrow($result);
+		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
+		$this->assertEquals($expected, $first_result);
+
+		$this->assertTrue((bool) apc_fetch($key));
+
+		$sql = 'DELETE FROM phpbb_config';
+		$result = $db->sql_query($sql);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertEquals($expected, $db->sql_fetchrow($result));
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql);
+
+		$no_cache_result = $db->sql_fetchrow($result);
+		$this->assertSame(false, $no_cache_result);
+
+		$db->sql_close();
+	}
+}
-- 
cgit v1.2.1


From 0b4b7e68a75438368868ede050bc6dd66fc80767 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 3 Dec 2012 14:17:34 +0100
Subject: [ticket/9983] Skip tests if APC is not enabled for CLI.

PHPBB3-9983
---
 tests/cache/apc_driver_test.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tests/cache')

diff --git a/tests/cache/apc_driver_test.php b/tests/cache/apc_driver_test.php
index f6e001f705..f7cf2119ed 100644
--- a/tests/cache/apc_driver_test.php
+++ b/tests/cache/apc_driver_test.php
@@ -29,6 +29,12 @@ class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case
 		{
 			self::markTestSkipped('apc extension is not loaded');
 		}
+
+		$php_ini = new phpbb_php_ini;
+		if (PHP_SAPI == 'cli' && !$php_ini->get_bool('apc.enable_cli'))
+		{
+			self::markTestSkipped('APC is not enabled for CLI. Set apc.enable_cli=1 in php.ini');
+		}
 	}
 
 	protected function setUp()
-- 
cgit v1.2.1


From 2e851baab90b0c9960eb7427acf41bfb8a848195 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 3 Dec 2012 14:18:05 +0100
Subject: [ticket/9983] Use APC instead of apc in error messages.

PHPBB3-9983
---
 tests/cache/apc_driver_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/cache')

diff --git a/tests/cache/apc_driver_test.php b/tests/cache/apc_driver_test.php
index f7cf2119ed..100ba76686 100644
--- a/tests/cache/apc_driver_test.php
+++ b/tests/cache/apc_driver_test.php
@@ -27,7 +27,7 @@ class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case
 	{
 		if (!extension_loaded('apc'))
 		{
-			self::markTestSkipped('apc extension is not loaded');
+			self::markTestSkipped('APC extension is not loaded');
 		}
 
 		$php_ini = new phpbb_php_ini;
-- 
cgit v1.2.1


From db6b11a3902c27b612d7d6d4696c4cd8cf1f0bdf Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Mon, 3 Dec 2012 14:35:59 +0100
Subject: [ticket/9983] Also check generic APC enable/disable.

PHPBB3-9983
---
 tests/cache/apc_driver_test.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tests/cache')

diff --git a/tests/cache/apc_driver_test.php b/tests/cache/apc_driver_test.php
index 100ba76686..c8b8f82b67 100644
--- a/tests/cache/apc_driver_test.php
+++ b/tests/cache/apc_driver_test.php
@@ -31,6 +31,12 @@ class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case
 		}
 
 		$php_ini = new phpbb_php_ini;
+
+		if (!$php_ini->get_bool('apc.enabled'))
+		{
+			self::markTestSkipped('APC is not enabled. Make sure apc.enabled=1 in php.ini');
+		}
+
 		if (PHP_SAPI == 'cli' && !$php_ini->get_bool('apc.enable_cli'))
 		{
 			self::markTestSkipped('APC is not enabled for CLI. Set apc.enable_cli=1 in php.ini');
-- 
cgit v1.2.1


From d93f582b04d2e6d0738cd6a2ffee739b8c987276 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Mon, 3 Dec 2012 21:47:29 -0500
Subject: [ticket/9983] Make sql cache test into a black box.

This makes it non-driver-specific and also makes it possible
to make prefix variable private on drivers.

PHPBB3-9983
---
 tests/cache/apc_driver_test.php   | 38 -----------------------------------
 tests/cache/common_test_case.php  | 33 ++++++++++++++++++++++++++++++
 tests/cache/file_driver_test.php  | 38 -----------------------------------
 tests/cache/redis_driver_test.php | 42 ---------------------------------------
 4 files changed, 33 insertions(+), 118 deletions(-)

(limited to 'tests/cache')

diff --git a/tests/cache/apc_driver_test.php b/tests/cache/apc_driver_test.php
index c8b8f82b67..3380762878 100644
--- a/tests/cache/apc_driver_test.php
+++ b/tests/cache/apc_driver_test.php
@@ -50,42 +50,4 @@ class phpbb_cache_apc_driver_test extends phpbb_cache_common_test_case
 		$this->driver = new phpbb_cache_driver_apc;
 		$this->driver->purge();
 	}
-
-	public function test_cache_sql()
-	{
-		global $db, $cache;
-		$db = $this->new_dbal();
-		$cache = new phpbb_cache_service($this->driver);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-
-		$key = $this->driver->key_prefix . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql));
-		$this->assertFalse(apc_fetch($key));
-
-		$result = $db->sql_query($sql, 300);
-		$first_result = $db->sql_fetchrow($result);
-		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
-		$this->assertEquals($expected, $first_result);
-
-		$this->assertTrue((bool) apc_fetch($key));
-
-		$sql = 'DELETE FROM phpbb_config';
-		$result = $db->sql_query($sql);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql, 300);
-
-		$this->assertEquals($expected, $db->sql_fetchrow($result));
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql);
-
-		$no_cache_result = $db->sql_fetchrow($result);
-		$this->assertSame(false, $no_cache_result);
-
-		$db->sql_close();
-	}
 }
diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php
index 45cf80e424..fa298ec9ae 100644
--- a/tests/cache/common_test_case.php
+++ b/tests/cache/common_test_case.php
@@ -61,4 +61,37 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case
 			$this->driver->get('second_key')
 		);
 	}
+
+	public function test_cache_sql()
+	{
+		global $db, $cache;
+		$db = $this->new_dbal();
+		$cache = new phpbb_cache_service($this->driver);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+
+		$result = $db->sql_query($sql, 300);
+		$first_result = $db->sql_fetchrow($result);
+		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
+		$this->assertEquals($expected, $first_result);
+
+		$sql = 'DELETE FROM phpbb_config';
+		$result = $db->sql_query($sql);
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertEquals($expected, $db->sql_fetchrow($result));
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql);
+
+		$no_cache_result = $db->sql_fetchrow($result);
+		$this->assertSame(false, $no_cache_result);
+
+		$db->sql_close();
+	}
 }
diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php
index 2353940277..745c6bb081 100644
--- a/tests/cache/file_driver_test.php
+++ b/tests/cache/file_driver_test.php
@@ -66,42 +66,4 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case
 		}
 		rmdir($this->cache_dir);
 	}
-
-	public function test_cache_sql()
-	{
-		global $db, $cache;
-		$db = $this->new_dbal();
-		$cache = new phpbb_cache_service($this->driver);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-
-		$cache_path = $this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php';
-		$this->assertFileNotExists($cache_path);
-
-		$result = $db->sql_query($sql, 300);
-		$first_result = $db->sql_fetchrow($result);
-		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
-		$this->assertEquals($expected, $first_result);
-
-		$this->assertFileExists($cache_path);
-
-		$sql = 'DELETE FROM phpbb_config';
-		$result = $db->sql_query($sql);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql, 300);
-
-		$this->assertEquals($expected, $db->sql_fetchrow($result));
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql);
-
-		$no_cache_result = $db->sql_fetchrow($result);
-		$this->assertSame(false, $no_cache_result);
-
-		$db->sql_close();
-	}
 }
diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php
index cd24e33baf..c59d5e1929 100644
--- a/tests/cache/redis_driver_test.php
+++ b/tests/cache/redis_driver_test.php
@@ -46,46 +46,4 @@ class phpbb_cache_redis_driver_test extends phpbb_cache_common_test_case
 		$this->driver = new phpbb_cache_driver_redis(self::$config['host'], self::$config['port']);
 		$this->driver->purge();
 	}
-
-	public function test_cache_sql()
-	{
-		global $db, $cache;
-		$db = $this->new_dbal();
-		$cache = new phpbb_cache_service($this->driver);
-
-		$redis = new Redis();
-		$ok = $redis->connect(self::$config['host'], self::$config['port']);
-		$this->assertTrue($ok);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-
-		$key = $this->driver->key_prefix . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql));
-		$this->assertFalse($redis->exists($key));
-
-		$result = $db->sql_query($sql, 300);
-		$first_result = $db->sql_fetchrow($result);
-		$expected = array('config_name' => 'foo', 'config_value' => '23', 'is_dynamic' => 0);
-		$this->assertEquals($expected, $first_result);
-
-		$this->assertTrue($redis->exists($key));
-
-		$sql = 'DELETE FROM phpbb_config';
-		$result = $db->sql_query($sql);
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql, 300);
-
-		$this->assertEquals($expected, $db->sql_fetchrow($result));
-
-		$sql = "SELECT * FROM phpbb_config
-			WHERE config_name = 'foo'";
-		$result = $db->sql_query($sql);
-
-		$no_cache_result = $db->sql_fetchrow($result);
-		$this->assertSame(false, $no_cache_result);
-
-		$db->sql_close();
-	}
 }
-- 
cgit v1.2.1


From cf3080b83ed6f90b24cfd99a9fc7dd71dddde827 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 4 Dec 2012 02:39:50 -0500
Subject: [ticket/9983] Correct incorrect markTestSkipped call.

PHPBB3-9983
---
 tests/cache/redis_driver_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/cache')

diff --git a/tests/cache/redis_driver_test.php b/tests/cache/redis_driver_test.php
index cd24e33baf..a90a750460 100644
--- a/tests/cache/redis_driver_test.php
+++ b/tests/cache/redis_driver_test.php
@@ -35,7 +35,7 @@ class phpbb_cache_redis_driver_test extends phpbb_cache_common_test_case
 		}
 		else
 		{
-			$this->markTestSkipped('Test redis host/port is not specified');
+			self::markTestSkipped('Test redis host/port is not specified');
 		}
 	}
 
-- 
cgit v1.2.1