From 40cd7570e6f4da7cc60d83a3e99c72a2fb99e3f7 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 1 Oct 2014 11:38:45 +0200 Subject: [ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224" This reverts commit d26436944173d1fa28a1abd96bca861381246860, reversing changes made to 75fcfb1c1d68f1632e7beae3f59699ddff8e5292. PHPBB3-11224 --- tests/cache/cache_memory_test.php | 125 -------------------------------------- 1 file changed, 125 deletions(-) delete mode 100644 tests/cache/cache_memory_test.php (limited to 'tests/cache/cache_memory_test.php') diff --git a/tests/cache/cache_memory_test.php b/tests/cache/cache_memory_test.php deleted file mode 100644 index 7a529c1d04..0000000000 --- a/tests/cache/cache_memory_test.php +++ /dev/null @@ -1,125 +0,0 @@ -createXMLDataSet(dirname(__FILE__).'/fixtures/cache_memory.xml'); - } - - protected function setUp() - { - global $db; - parent::setUp(); - - $this->cache = new phpbb_cache_memory(); - $db = $this->new_dbal(); - } - - static public function cache_single_query_data() - { - return array( - array( - array( - array( - 'SELECT * FROM ' . POSTS_TABLE, - 3, - ), - ), - POSTS_TABLE, - ), - array( - array( - array( - 'SELECT * FROM ' . POSTS_TABLE, - 3, - ), - array( - 'SELECT * FROM ' . POSTS_TABLE . ' p - LEFT JOIN ' . TOPICS_TABLE . ' t ON p.topic_id = t.topic_id', - 3, - ), - ), - POSTS_TABLE, - ), - array( - array( - array( - 'SELECT * FROM ' . POSTS_TABLE, - 3, - ), - array( - 'SELECT * FROM ' . POSTS_TABLE . ' p - LEFT JOIN ' . TOPICS_TABLE . ' t ON p.topic_id = t.topic_id', - 3, - ), - array( - 'SELECT * FROM ' . POSTS_TABLE . ' p - LEFT JOIN ' . TOPICS_TABLE . ' t ON p.topic_id = t.topic_id - LEFT JOIN ' . USERS_TABLE . ' u ON p.poster_id = u.user_id', - 3, - ), - ), - POSTS_TABLE, - ), - array( - array( - array( - 'SELECT * FROM ' . POSTS_TABLE . ' p - LEFT JOIN ' . TOPICS_TABLE . ' t ON p.topic_id = t.topic_id', - 3, - ), - array( - 'SELECT * FROM ' . POSTS_TABLE . ' p - LEFT JOIN ' . TOPICS_TABLE . ' t ON p.topic_id = t.topic_id - LEFT JOIN ' . USERS_TABLE . ' u ON p.poster_id = u.user_id', - 3, - ), - ), - TOPICS_TABLE, - ), - ); - } - - /** - * @dataProvider cache_single_query_data - */ - public function test_cache_single_query($sql_queries, $table) - { - global $db; - - foreach ($sql_queries as $query) - { - $sql_request_res = $db->sql_query($query[0]); - - $this->cache->sql_save($query[0], $sql_request_res, 1); - - $results = array(); - $query_id = $this->cache->sql_load($query[0]); - while ($row = $this->cache->sql_fetchrow($query_id)) - { - $results[] = $row; - } - $this->cache->sql_freeresult($query_id); - $this->assertEquals($query[1], sizeof($results)); - } - - $this->cache->destroy('sql', $table); - - foreach ($sql_queries as $query) - { - $this->assertNotEquals(false, $this->cache->sql_load($query[0])); - } - } -} -- cgit v1.2.1