2 files changed, 58 insertions, 1 deletions
diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php
index 564bd35863..c5f5fac88c 100644
--- a/tests/cache/cache_test.php
+++ b/tests/cache/cache_test.php
@@ -9,7 +9,7 @@
 
 require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
-class phpbb_cache_test extends phpbb_test_case
+class phpbb_cache_test extends phpbb_database_test_case
 {
 	private $cache_dir;
 
@@ -18,8 +18,15 @@ class phpbb_cache_test extends phpbb_test_case
 		$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
@@ -35,6 +42,8 @@ class phpbb_cache_test extends phpbb_test_case
 		{
 			$this->remove_cache_dir();
 		}
+
+		parent::tearDown();
 	}
 
 	private function create_cache_dir()
@@ -67,4 +76,34 @@ class phpbb_cache_test extends phpbb_test_case
 			'File ACM put and get'
 		);
 	}
+
+	public function test_cache_sql()
+	{
+		$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'";
+		$result = $db->sql_query($sql, 300);
+		$first_result = $db->sql_fetchrow($result);
+
+		$this->assertFileExists($this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php');
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'foo'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertEquals($first_result, $db->sql_fetchrow($result));
+
+		$sql = "SELECT * FROM phpbb_config
+			WHERE config_name = 'bar'";
+		$result = $db->sql_query($sql, 300);
+
+		$this->assertNotEquals($first_result, $db->sql_fetchrow($result));
+
+		$db->sql_close();
+	}
 }
diff --git a/tests/cache/fixtures/config.xml b/tests/cache/fixtures/config.xml
new file mode 100644
index 0000000000..9d395b685c
--- /dev/null
+++ b/tests/cache/fixtures/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_config">
+		<column>config_name</column>
+		<column>config_value</column>
+		<column>is_dynamic</column>
+		<row>
+			<value>foo</value>
+			<value>23</value>
+			<value>0</value>
+		</row>
+		<row>
+			<value>bar</value>
+			<value>42</value>
+			<value>1</value>
+		</row>
+	</table>
+</dataset>