Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2195 from Elsensee/ticket/10423
[ticket/10423] Remove * from search or highlight string * Elsensee/ticket/10423: [ticket/10423] Replace foreach with function in viewtopic.php [ticket/10423] Remove unnecessary include in test [ticket/10423] Match multiple wildcards [ticket/10423] Move code into a function and add tests for it [ticket/10423] Remove * from search or highlight string
- Loading branch information
Showing
4 changed files
with
66 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
tests/functions_content/phpbb_clean_search_string_test.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
<?php | ||
/** | ||
* | ||
* @package testing | ||
* @copyright (c) 2014 phpBB Group | ||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 | ||
* | ||
*/ | ||
|
||
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php'; | ||
|
||
class phpbb_functions_content_phpbb_clean_search_string_test extends phpbb_test_case | ||
{ | ||
public function phpbb_clean_search_string_data() | ||
{ | ||
return array( | ||
array('*', ''), | ||
array('* *', ''), | ||
array('test', 'test'), | ||
array(' test ', 'test'), | ||
array(' test * ', 'test'), | ||
array('test* *', 'test*'), | ||
array('* *test*', '*test*'), | ||
array('test test * test', 'test test test'), | ||
array(' some wild*cards * between wo*rds ', 'some wild*cards between wo*rds'), | ||
array(' we * now have*** multiple wild***cards * ', 'we now have* multiple wild*cards'), | ||
array('pi is *** . * **** * *****', 'pi is .'), | ||
); | ||
} | ||
|
||
/** | ||
* @dataProvider phpbb_clean_search_string_data | ||
*/ | ||
public function test_phpbb_clean_search_string($search_string, $expected) | ||
{ | ||
$this->assertEquals($expected, phpbb_clean_search_string($search_string)); | ||
} | ||
} |