From e10c3d8c08974f2f543e41e6b12d9eb7b0c6b984 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 15:16:35 +0200 Subject: [ticket/11700] Fix config namespace mishap in cache tests PHPBB3-11700 --- tests/cache/common_test_case.php | 10 +++++----- tests/cache/null_driver_test.php | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/cache') diff --git a/tests/cache/common_test_case.php b/tests/cache/common_test_case.php index 09190abc95..3fe10c63e1 100644 --- a/tests/cache/common_test_case.php +++ b/tests/cache/common_test_case.php @@ -65,11 +65,11 @@ abstract class phpbb_cache_common_test_case extends phpbb_database_test_case public function test_cache_sql() { global $db, $cache, $phpbb_root_path, $phpEx; - $config = new \phpbb\config\config(array()); + $config = new phpbb\config\config(array()); $db = $this->new_dbal(); $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx); - $sql = "SELECT * FROM \phpbb\config\config + $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); @@ -77,16 +77,16 @@ abstract class phpbb_cache_common_test_case 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\config'; + $sql = 'DELETE FROM phpbb_config'; $result = $db->sql_query($sql); - $sql = "SELECT * FROM \phpbb\config\config + $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\config + $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; $result = $db->sql_query($sql); diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php index ce78f333dd..58e57f2b3a 100644 --- a/tests/cache/null_driver_test.php +++ b/tests/cache/null_driver_test.php @@ -48,23 +48,23 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case public function test_cache_sql() { global $db, $cache, $phpbb_root_path, $phpEx; - $config = new \phpbb\config\config(array()); + $config = new phpbb\config\config(array()); $db = $this->new_dbal(); $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx); - $sql = "SELECT * FROM \phpbb\config\config + $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\config'; + $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\config + $sql = "SELECT * FROM phpbb_config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); -- cgit v1.2.1