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: [PATCH] [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(-)
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();
}