diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-08 14:11:34 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-08 14:11:34 +0100 |
| commit | f043b14f79a11a256487eecfa53a131fb016274c (patch) | |
| tree | f1d523c0bfa05e646684de4c0c9eadf994f28186 /tests | |
| parent | b7b8fefdd084b51c93b15dfdfb34d2ef294f4d76 (diff) | |
| parent | 5af3d14af3c35e99c0eba75c43a411ead6191c79 (diff) | |
| download | forums-f043b14f79a11a256487eecfa53a131fb016274c.tar forums-f043b14f79a11a256487eecfa53a131fb016274c.tar.gz forums-f043b14f79a11a256487eecfa53a131fb016274c.tar.bz2 forums-f043b14f79a11a256487eecfa53a131fb016274c.tar.xz forums-f043b14f79a11a256487eecfa53a131fb016274c.zip | |
Merge remote-tracking branch 'p/ticket/11255' into develop
* p/ticket/11255:
[ticket/11255] Change search tests to use mock cache.
[ticket/11255] Fix dbal write sequence test to run standalone.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dbal/write_sequence_test.php | 4 | ||||
| -rw-r--r-- | tests/search/mysql_test.php | 2 | ||||
| -rw-r--r-- | tests/search/native_test.php | 2 | ||||
| -rw-r--r-- | tests/search/postgres_test.php | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/tests/dbal/write_sequence_test.php b/tests/dbal/write_sequence_test.php index 8975cfbfb1..f382a971a5 100644 --- a/tests/dbal/write_sequence_test.php +++ b/tests/dbal/write_sequence_test.php @@ -33,6 +33,10 @@ class phpbb_dbal_write_sequence_test extends phpbb_database_test_case { $db = $this->new_dbal(); + // dbal uses cache + global $cache; + $cache = new phpbb_mock_cache(); + $sql = 'INSERT INTO phpbb_users ' . $db->sql_build_array('INSERT', array( 'username' => $username, 'username_clean' => $username, diff --git a/tests/search/mysql_test.php b/tests/search/mysql_test.php index 3ba3915714..3ad15bd806 100644 --- a/tests/search/mysql_test.php +++ b/tests/search/mysql_test.php @@ -26,7 +26,7 @@ class phpbb_search_mysql_test extends phpbb_search_common_test_case parent::setUp(); // dbal uses cache - $cache = new phpbb_cache_service(new phpbb_cache_driver_null); + $cache = new phpbb_mock_cache(); // set config values $config['fulltext_mysql_min_word_len'] = 4; diff --git a/tests/search/native_test.php b/tests/search/native_test.php index eeee3a44f3..4a2c210013 100644 --- a/tests/search/native_test.php +++ b/tests/search/native_test.php @@ -26,7 +26,7 @@ class phpbb_search_native_test extends phpbb_search_test_case parent::setUp(); // dbal uses cache - $cache = new phpbb_cache_service(new phpbb_cache_driver_null); + $cache = new phpbb_mock_cache(); $this->db = $this->new_dbal(); $error = null; diff --git a/tests/search/postgres_test.php b/tests/search/postgres_test.php index 9c77e0c09e..923af6f854 100644 --- a/tests/search/postgres_test.php +++ b/tests/search/postgres_test.php @@ -26,7 +26,7 @@ class phpbb_search_postgres_test extends phpbb_search_common_test_case parent::setUp(); // dbal uses cache - $cache = new phpbb_cache_service(new phpbb_cache_driver_null); + $cache = new phpbb_mock_cache(); // set config values $config['fulltext_postgres_min_word_len'] = 4; |