mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-53516-integration' of https://github.com/merrill-oakland/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-03-30 09:10:09 +08:00
commit a3e3b696ef
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
search/engine/solr/tests/engine_test.php
View File

@ -23,7 +23,6 @@
* - define('TEST_SEARCH_SOLR_INDEXNAME', 'unittest'); * - define('TEST_SEARCH_SOLR_INDEXNAME', 'unittest');
* *
* Optional params: * Optional params:
* - define('TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING', 1);
* - define('TEST_SEARCH_SOLR_USERNAME', ''); * - define('TEST_SEARCH_SOLR_USERNAME', '');
* - define('TEST_SEARCH_SOLR_PASSWORD', ''); * - define('TEST_SEARCH_SOLR_PASSWORD', '');
* - define('TEST_SEARCH_SOLR_SSLCERT', ''); * - define('TEST_SEARCH_SOLR_SSLCERT', '');
@ -100,11 +99,7 @@ class search_solr_engine_testcase extends advanced_testcase {
set_config('ssl_cainfo', TEST_SEARCH_SOLR_CAINFOCERT, 'search_solr'); set_config('ssl_cainfo', TEST_SEARCH_SOLR_CAINFOCERT, 'search_solr');
} }
if (defined('TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING') && (TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING == 1)) {
set_config('fileindexing', 0, 'search_solr');
} else {
set_config('fileindexing', 1, 'search_solr'); set_config('fileindexing', 1, 'search_solr');
}
// We are only test indexing small string files, so setting this as low as we can. // We are only test indexing small string files, so setting this as low as we can.
set_config('maxindexfilekb', 1, 'search_solr'); set_config('maxindexfilekb', 1, 'search_solr');
@ -309,11 +304,6 @@ class search_solr_engine_testcase extends advanced_testcase {
} }
public function test_index_file() { public function test_index_file() {
if (defined('TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING') && (TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING == 1)) {
$this->markTestSkipped('Solr file indexing not enabled.');
return;
}
// Very simple test. // Very simple test.
$this->search->index(); $this->search->index();
$querydata = new stdClass(); $querydata = new stdClass();
@ -323,11 +313,6 @@ class search_solr_engine_testcase extends advanced_testcase {
} }
public function test_reindexing_files() { public function test_reindexing_files() {
if (defined('TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING') && (TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING == 1)) {
$this->markTestSkipped('Solr file indexing not enabled.');
return;
}
// Get engine and area to work with. // Get engine and area to work with.
$engine = $this->search->get_engine(); $engine = $this->search->get_engine();
$areaid = \core_search\manager::generate_areaid('core_mocksearch', 'role_capabilities'); $areaid = \core_search\manager::generate_areaid('core_mocksearch', 'role_capabilities');
@ -429,11 +414,6 @@ class search_solr_engine_testcase extends advanced_testcase {
} }
public function test_index_filtered_file() { public function test_index_filtered_file() {
if (defined('TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING') && (TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING == 1)) {
$this->markTestSkipped('Solr file indexing not enabled.');
return;
}
// Get engine and area to work with. // Get engine and area to work with.
$engine = $this->search->get_engine(); $engine = $this->search->get_engine();
$areaid = \core_search\manager::generate_areaid('core_mocksearch', 'role_capabilities'); $areaid = \core_search\manager::generate_areaid('core_mocksearch', 'role_capabilities');
@ -497,11 +477,6 @@ class search_solr_engine_testcase extends advanced_testcase {
} }
public function test_delete_by_id() { public function test_delete_by_id() {
if (defined('TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING') && (TEST_SEARCH_SOLR_DISABLE_FILE_INDEXING == 1)) {
$this->markTestSkipped('Solr file indexing not enabled.');
return;
}
// First get files in the index. // First get files in the index.
$this->search->index(); $this->search->index();
$engine = $this->search->get_engine(); $engine = $this->search->get_engine();

6
search/templates/result.mustache
View File

@ -52,6 +52,12 @@
"contexturl": "https://example.com/mod/example/view.php?id=2" "contexturl": "https://example.com/mod/example/view.php?id=2"
"userurl": "https://example.com/user/profile.php?id=3", "userurl": "https://example.com/user/profile.php?id=3",
"userfullname": "Example User Full Name", "userfullname": "Example User Full Name",
"multiplefiles": true,
"filenames":
{
"file1.txt",
"file2.txt"
}
} }
}} }}
<div class="result"> <div class="result">