From b95fdacdd378877d277e261465da73deb06e50da Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 10 Sep 2013 14:01:09 +0200 Subject: [ticket/11700] Move all recent code to namespaces PHPBB3-11700 --- tests/cache/null_driver_test.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/cache/null_driver_test.php') diff --git a/tests/cache/null_driver_test.php b/tests/cache/null_driver_test.php index 43a0cc806c..ce78f333dd 100644 --- a/tests/cache/null_driver_test.php +++ b/tests/cache/null_driver_test.php @@ -20,7 +20,7 @@ class phpbb_cache_null_driver_test extends phpbb_database_test_case { parent::setUp(); - $this->driver = new phpbb_cache_driver_null; + $this->driver = new \phpbb\cache\driver\null; } public function test_get_put() @@ -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(array()); + $config = new \phpbb\config\config(array()); $db = $this->new_dbal(); - $cache = new phpbb_cache_service($this->driver, $config, $db, $phpbb_root_path, $phpEx); + $cache = new \phpbb\cache\service($this->driver, $config, $db, $phpbb_root_path, $phpEx); - $sql = "SELECT * FROM phpbb_config + $sql = "SELECT * FROM \phpbb\config\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'; + $sql = 'DELETE FROM \phpbb\config\config'; $result = $db->sql_query($sql); // As null cache driver does not actually cache, // this should return no results - $sql = "SELECT * FROM phpbb_config + $sql = "SELECT * FROM \phpbb\config\config WHERE config_name = 'foo'"; $result = $db->sql_query($sql, 300); -- cgit v1.2.1 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/null_driver_test.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/cache/null_driver_test.php') 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