makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'github-p/ticket/11174' into develop

Browse source 
* github-p/ticket/11174:
  [ticket/11174] Check common words, fix array equality assertion.
  [ticket/11174] Test for common words.
  [ticket/11174] More tests.
  [ticket/11174] Clarify why that is the way it is.
  [ticket/11174] Started on search tests - keyword splitting.
This commit is contained in:
Nils Adermann 2012-11-09 12:12:33 +01:00
commit 0282fe7024
3 changed files with 233 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/search/fulltext_native.php
View file

@ -59,6 +59,10 @@ class phpbb_search_fulltext_native extends phpbb_search_base
{
include($this->phpbb_root_path . 'includes/utf/utf_normalizer.' . $this->php_ext);
}
if (!function_exists('utf8_decode_ncr'))
{
include($this->phpbb_root_path . 'includes/utf/utf_tools.' . $this->php_ext);
}
$error = false;
}

43
tests/search/fixtures/posts.xml Normal file
View file

@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_posts">
<column>post_username</column>
<column>post_subject</column>
<column>post_text</column>
<row>
<value>foo</value>
<value>foo</value>
<value>foo</value>
</row>
<row>
<value>bar</value>
<value>bar</value>
<value>bar</value>
</row>
<row>
<value>commonword</value>
<value>commonword</value>
<value>commonword</value>
</row>
</table>
<table name="phpbb_search_wordlist">
<column>word_id</column>
<column>word_text</column>
<column>word_common</column>
<row>
<value>1</value>
<value>foo</value>
<value>0</value>
</row>
<row>
<value>2</value>
<value>bar</value>
<value>0</value>
</row>
<row>
<value>3</value>
<value>commonword</value>
<value>1</value>
</row>
</table>
</dataset>

186
tests/search/native_test.php Normal file
View file

@ -0,0 +1,186 @@
<?php
/**
*
* @package testing
* @copyright (c) 2012 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
function phpbb_search_wrapper($class)
{
$wrapped = $class . '_wrapper';
if (!class_exists($wrapped))
{
$code = "
class $wrapped extends $class
{
public function get_must_contain_ids() { return \$this->must_contain_ids; }
public function get_must_not_contain_ids() { return \$this->must_not_contain_ids; }
}
";
eval($code);
}
return $wrapped;
}
class phpbb_search_native_test extends phpbb_database_test_case
{
protected $db;
protected $search;
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/posts.xml');
}
protected function setUp()
{
global $phpbb_root_path, $phpEx, $config, $user, $cache;
parent::setUp();
// dbal uses cache
$cache = new phpbb_cache_driver_null;
$this->db = $this->new_dbal();
$error = null;
$class = phpbb_search_wrapper('phpbb_search_fulltext_native');
$this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user);
}
protected function tearDown()
{
parent::tearDown();
}
public function keywords()
{
return array(
// keywords
// terms
// ok
// must contain ids
// must not contain ids
// common words
array(
'foo',
'all',
true,
array(1),
array(),
array(),
),
array(
'foo bar',
'all',
true,
array(1, 2),
array(),
array(),
),
// leading, trailing and multiple spaces
array(
' foo bar ',
'all',
true,
array(1, 2),
array(),
array(),
),
// words too short
array(
'f',
'all',
false,
null,
null,
// short words count as "common" words
array('f'),
),
array(
'f o o',
'all',
false,
null,
null,
array('f', 'o', 'o'),
),
array(
'foo -bar',
'all',
true,
array(1),
array(2),
array(),
),
// all negative
array(
'-foo',
'all',
false,
null,
null,
array(),
),
array(
'-foo -bar',
'all',
false,
null,
null,
array(),
),
// all common
array(
'commonword',
'all',
false,
null,
null,
array('commonword'),
),
// some common
array(
'commonword foo',
'all',
true,
array(1),
array(),
array('commonword'),
),
);
}
/**
* @dataProvider keywords
*/
public function test_split_keywords($keywords, $terms, $ok, $must_contain, $must_not_contain, $common)
{
$rv = $this->search->split_keywords($keywords, $terms);
$this->assertEquals($ok, $rv);
if ($ok)
{
// only check criteria if the search is going to be performed
$this->assert_array_content_equals($must_contain, $this->search->get_must_contain_ids());
$this->assert_array_content_equals($must_not_contain, $this->search->get_must_not_contain_ids());
}
$this->assert_array_content_equals($common, $this->search->get_common_words());
}
public function assert_array_content_equals($one, $two)
{
// http://stackoverflow.com/questions/3838288/phpunit-assert-two-arrays-are-equal-but-order-of-elements-not-important
// but one array_diff is not enough!
if (sizeof(array_diff($one, $two)) || sizeof(array_diff($two, $one)))
{
// get a nice error message
$this->assertEquals($one, $two);
}
else
{
// increase assertion count
$this->assertTrue(true);
}
}
}