From dcefa16318f6dc1058595a7ba221b75ed6a2504b Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 6 Aug 2012 16:26:55 -0500 Subject: [ticket/10875] Return $query_id from sql_save Have to return the $query_id from sql_save so that the results can be pulled Updated cache test to do some basic sql cache testing. PHPBB3-10875 --- tests/cache/cache_test.php | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'tests/cache/cache_test.php') diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php index 564bd35863..81ce9ac1aa 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,6 +18,11 @@ class phpbb_cache_test extends phpbb_test_case $this->cache_dir = dirname(__FILE__) . '/../tmp/cache/'; } + public function getDataSet() + { + return array(); + } + protected function setUp() { if (file_exists($this->cache_dir)) @@ -67,4 +72,29 @@ 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 = \'board_disable\''; + $result = $db->sql_query($sql, 300); + $first_result = $db->sql_fetchrow($result); + + $this->assertFileExists($this->cache_dir . 'sql_' . md5($sql) . '.php'); + + $sql = 'SELECT * FROM phpbb_config WHERE config_name = \'board_disable\''; + $result = $db->sql_query($sql, 300); + + $this->assertEquals($first_result, $db->sql_fetchrow($result)); + + $sql = 'SELECT * FROM phpbb_config WHERE config_name = \'version\''; + $result = $db->sql_query($sql, 300); + + $this->assertNotEquals($first_result, $db->sql_fetchrow($result)); + } } -- cgit v1.2.1 From b64ac12bd566a08ff7d4ff3a257dfbb2f8168a56 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 30 Jul 2012 19:41:00 -0500 Subject: [ticket/10875] Use fixtures for sql cache test PHPBB3-10875 --- tests/cache/cache_test.php | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'tests/cache/cache_test.php') diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php index 81ce9ac1aa..c73d36973e 100644 --- a/tests/cache/cache_test.php +++ b/tests/cache/cache_test.php @@ -20,11 +20,13 @@ class phpbb_cache_test extends phpbb_database_test_case public function getDataSet() { - return array(); + 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 @@ -40,6 +42,8 @@ class phpbb_cache_test extends phpbb_database_test_case { $this->remove_cache_dir(); } + + parent::tearDown(); } private function create_cache_dir() @@ -72,29 +76,29 @@ class phpbb_cache_test extends phpbb_database_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 = \'board_disable\''; + + $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($sql) . '.php'); - - $sql = 'SELECT * FROM phpbb_config WHERE config_name = \'board_disable\''; + + $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 = \'version\''; + + $sql = 'SELECT * FROM phpbb_config WHERE config_name = \'bar\''; $result = $db->sql_query($sql, 300); - + $this->assertNotEquals($first_result, $db->sql_fetchrow($result)); } } -- cgit v1.2.1 From 44e48817c387ff5ee26746a00a00f900bdd375dd Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Tue, 31 Jul 2012 14:43:22 -0500 Subject: [ticket/10875] Close $db connection at end of test Fixes a pgSQL issue PHPBB3-10875 --- tests/cache/cache_test.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/cache/cache_test.php') diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php index c73d36973e..06d9d89f68 100644 --- a/tests/cache/cache_test.php +++ b/tests/cache/cache_test.php @@ -100,5 +100,7 @@ class phpbb_cache_test extends phpbb_database_test_case $result = $db->sql_query($sql, 300); $this->assertNotEquals($first_result, $db->sql_fetchrow($result)); + + $db->sql_close(); } } -- cgit v1.2.1 From 1db91af0000a56b676bf593aab1852190d1d6a7b Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 6 Aug 2012 16:28:56 -0500 Subject: [ticket/10875] Break queries onto separate lines and use double quotes Coding guidelines PHPBB3-10875 --- tests/cache/cache_test.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/cache/cache_test.php') diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php index 06d9d89f68..336c009ebe 100644 --- a/tests/cache/cache_test.php +++ b/tests/cache/cache_test.php @@ -85,18 +85,21 @@ class phpbb_cache_test extends phpbb_database_test_case $db = $this->new_dbal(); $cache = new phpbb_cache_service($driver); - $sql = 'SELECT * FROM phpbb_config WHERE config_name = \'foo\''; + $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($sql) . '.php'); - $sql = 'SELECT * FROM phpbb_config WHERE config_name = \'foo\''; + $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\''; + $sql = "SELECT * FROM phpbb_config + WHERE config_name = 'bar'"; $result = $db->sql_query($sql, 300); $this->assertNotEquals($first_result, $db->sql_fetchrow($result)); -- cgit v1.2.1 From 4b7cdd4264b2669aaf0a0f99db2a9b00b2b58c4e Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 6 Aug 2012 18:43:46 -0500 Subject: [ticket/10875] Fix cache test Check for the correct filename based on the way the cache driver creates it PHPBB3-10875 --- tests/cache/cache_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/cache/cache_test.php') diff --git a/tests/cache/cache_test.php b/tests/cache/cache_test.php index 336c009ebe..c5f5fac88c 100644 --- a/tests/cache/cache_test.php +++ b/tests/cache/cache_test.php @@ -90,7 +90,7 @@ class phpbb_cache_test extends phpbb_database_test_case $result = $db->sql_query($sql, 300); $first_result = $db->sql_fetchrow($result); - $this->assertFileExists($this->cache_dir . 'sql_' . md5($sql) . '.php'); + $this->assertFileExists($this->cache_dir . 'sql_' . md5(preg_replace('/[\n\r\s\t]+/', ' ', $sql)) . '.php'); $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; -- cgit v1.2.1