[ticket/11608] Move markIncomplete to search backends test

PHPBB3-11608
This commit is contained in:
Dhruv 2013-09-01 22:25:27 +05:30
parent 72d939372f
commit 2b5311deac
4 changed files with 15 additions and 9 deletions

View file

@ -23,21 +23,12 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
{ {
$crawler = self::request('GET', 'search.php?keywords=' . $keywords); $crawler = self::request('GET', 'search.php?keywords=' . $keywords);
$this->assertEquals(0, $crawler->filter('.postbody')->count()); $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); $split_keywords_string = str_replace(array('+', '-'), ' ', $keywords);
$this->assertEquals($split_keywords_string, $crawler->filter('#keywords')->attr('value')); $this->assertEquals($split_keywords_string, $crawler->filter('#keywords')->attr('value'));
} }
public function test_search_backend() public function test_search_backend()
{ {
if ($this->search_backend == 'phpbb_search_fulltext_sphinx')
{
$this->markTestIncomplete('Sphinx Tests are not supported');
}
$this->login(); $this->login();
$this->admin_login(); $this->admin_login();

View file

@ -15,4 +15,9 @@ require_once dirname(__FILE__) . '/base.php';
class phpbb_functional_search_native_test extends phpbb_functional_search_base class phpbb_functional_search_native_test extends phpbb_functional_search_base
{ {
protected $search_backend = 'phpbb_search_fulltext_native'; 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');
}
} }

View file

@ -15,4 +15,9 @@ require_once dirname(__FILE__) . '/base.php';
class phpbb_functional_search_postgres_test extends phpbb_functional_search_base class phpbb_functional_search_postgres_test extends phpbb_functional_search_base
{ {
protected $search_backend = 'phpbb_search_fulltext_postgres'; 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');
}
} }

View file

@ -15,4 +15,9 @@ require_once dirname(__FILE__) . '/base.php';
class phpbb_functional_search_sphinx_test extends phpbb_functional_search_base class phpbb_functional_search_sphinx_test extends phpbb_functional_search_base
{ {
protected $search_backend = 'phpbb_search_fulltext_sphinx'; protected $search_backend = 'phpbb_search_fulltext_sphinx';
public function test_search_backend()
{
$this->markTestIncomplete('Sphinx Tests are not supported');
}
} }