mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-55390 search: is_search_area unit tests

Browse Source 
Added extra checking for search manager get_search_area.
This commit is contained in:
David Monllao 2016-08-09 15:51:09 +08:00
parent 05a9c36edc
commit f3d38863fe
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
search/classes/manager.php
View File

@ -207,7 +207,8 @@ class manager {
}
$classname = static::get_area_classname($areaid);
if (class_exists($classname)) {
if (class_exists($classname) && static::is_search_area($classname)) {
return new $classname();
}
@ -730,12 +731,12 @@ class manager {
/**
* Checks whether a classname is of an actual search area.
*
* @param string $searchareaname
* @param string $classname
* @return bool
*/
protected static function is_search_area($searchareaname) {
if (is_subclass_of($searchareaname, 'core_search\base')) {
return (new \ReflectionClass($searchareaname))->isInstantiable();
protected static function is_search_area($classname) {
if (is_subclass_of($classname, 'core_search\base')) {
return (new \ReflectionClass($classname))->isInstantiable();
}
return false;

11
search/tests/fixtures/testable_core_search.php vendored
View File

@ -97,4 +97,15 @@ class testable_core_search extends \core_search\manager {
self::get_search_areas_list(false);
self::get_search_areas_list(true);
}
/**
* Changes visibility.
*
* @param string $classname
* @return bool
*/
public static function is_search_area($classname) {
return parent::is_search_area($classname);
}
}

15
search/tests/manager_test.php
View File

@ -253,4 +253,19 @@ class search_manager_testcase extends advanced_testcase {
$this->assertEquals($allcontexts, $contexts[$this->forumpostareaid]);
$this->assertEquals(array($course1ctx->id => $course1ctx->id), $contexts[$this->mycoursesareaid]);
}
/**
* test_is_search_area
*
* @return void
*/
public function test_is_search_area() {
$this->assertFalse(testable_core_search::is_search_area('\asd\asd'));
$this->assertFalse(testable_core_search::is_search_area('\mod_forum\search\posta'));
$this->assertFalse(testable_core_search::is_search_area('\core_search\base_mod'));
$this->assertTrue(testable_core_search::is_search_area('\mod_forum\search\post'));
$this->assertTrue(testable_core_search::is_search_area('\\mod_forum\\search\\post'));
$this->assertTrue(testable_core_search::is_search_area('mod_forum\\search\\post'));
}
}