diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php index c6a5a18c94..28327da914 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -23,21 +23,12 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case { $crawler = self::request('GET', 'search.php?keywords=' . $keywords); $this->assertEquals(0, $crawler->filter('.postbody')->count()); - if ($this->search_backend == 'phpbb_search_fulltext_native' || $this->search_backend == 'phpbb_search_fulltext_postgres') - { - $this->markTestIncomplete('Native and Postgres search when fails doesn\'t show the search query'); - } $split_keywords_string = str_replace(array('+', '-'), ' ', $keywords); $this->assertEquals($split_keywords_string, $crawler->filter('#keywords')->attr('value')); } public function test_search_backend() { - if ($this->search_backend == 'phpbb_search_fulltext_sphinx') - { - $this->markTestIncomplete('Sphinx Tests are not supported'); - } - $this->login(); $this->admin_login(); diff --git a/tests/functional/search/native_test.php b/tests/functional/search/native_test.php index cefe87eb15..63e7085308 100644 --- a/tests/functional/search/native_test.php +++ b/tests/functional/search/native_test.php @@ -15,4 +15,9 @@ require_once dirname(__FILE__) . '/base.php'; class phpbb_functional_search_native_test extends phpbb_functional_search_base { protected $search_backend = 'phpbb_search_fulltext_native'; + + protected function assert_search_not_found($keywords) + { + $this->markTestIncomplete('Native search when fails doesn\'t show the search query'); + } } diff --git a/tests/functional/search/postgres_test.php b/tests/functional/search/postgres_test.php index 900e01da2a..f733238c8f 100644 --- a/tests/functional/search/postgres_test.php +++ b/tests/functional/search/postgres_test.php @@ -15,4 +15,9 @@ require_once dirname(__FILE__) . '/base.php'; class phpbb_functional_search_postgres_test extends phpbb_functional_search_base { protected $search_backend = 'phpbb_search_fulltext_postgres'; + + protected function assert_search_not_found($keywords) + { + $this->markTestIncomplete('Postgres search when fails doesn\'t show the search query'); + } } diff --git a/tests/functional/search/sphinx_test.php b/tests/functional/search/sphinx_test.php index cc387d33a7..9db4138714 100644 --- a/tests/functional/search/sphinx_test.php +++ b/tests/functional/search/sphinx_test.php @@ -15,4 +15,9 @@ require_once dirname(__FILE__) . '/base.php'; class phpbb_functional_search_sphinx_test extends phpbb_functional_search_base { protected $search_backend = 'phpbb_search_fulltext_sphinx'; + + public function test_search_backend() + { + $this->markTestIncomplete('Sphinx Tests are not supported'); + } }