tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix PHP errors in test

This commit is contained in:
Brett Tasker 2017-04-21 13:26:07 +12:00
parent 2c653daa9d
commit 0ee34e49e2
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Solr4ServiceTest/Solr4ServiceTest_RecordingService.php
View File

@ -2,7 +2,7 @@
namespace SilverStripe\FullTextSearch\Tests\Solr4ServiceTest; namespace SilverStripe\FullTextSearch\Tests\Solr4ServiceTest;
use SilverStripe\FullTextSearch\Solr\Solr4Service_Core; use SilverStripe\FullTextSearch\Solr\Services\Solr4Service_Core;
class Solr4ServiceTest_RecordingService extends Solr4Service_Core class Solr4ServiceTest_RecordingService extends Solr4Service_Core
{ {

3
tests/SolrReindexQueuedTest.php
View File

@ -2,6 +2,9 @@
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\FullTextSearch\Search\FullTextSearch;
use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Variant;
/** /**
* Additional tests of solr reindexing processes when run with queuedjobs * Additional tests of solr reindexing processes when run with queuedjobs
*/ */

3
tests/SolrReindexTest.php
View File

@ -2,6 +2,9 @@
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\FullTextSearch\Search\FullTextSearch;
use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Variant;
if (class_exists('Phockito')) { if (class_exists('Phockito')) {
Phockito::include_hamcrest(false); Phockito::include_hamcrest(false);
} }

4
tests/SolrReindexTest/SolrReindexTest_ItemExtension.php
View File

@ -4,6 +4,8 @@ namespace SilverStripe\FullTextSearch\Tests\SolrReindexTest;
use SilverStripe\ORM\DataExtension; use SilverStripe\ORM\DataExtension;
use SilverStripe\Dev\TestOnly; use SilverStripe\Dev\TestOnly;
use SilverStripe\ORM\Queries\SQLSelect;
use SilverStripe\ORM\DataQuery;
use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Variant; use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Variant;
use SilverStripe\Core\Convert; use SilverStripe\Core\Convert;
@ -18,7 +20,7 @@ class SolrReindexTest_ItemExtension extends DataExtension implements TestOnly
* @param SQLQuery $query * @param SQLQuery $query
* @param DataQuery $dataQuery * @param DataQuery $dataQuery
*/ */
public function augmentSQL(SilverStripe\ORM\Queries\SQLSelect $query, SilverStripe\ORM\DataQuery $dataQuery = NULL) public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = NULL)
{ {
$variant = SolrReindexTest_Variant::get_current(); $variant = SolrReindexTest_Variant::get_current();
if ($variant !== null && !$query->filtersOnID()) { if ($variant !== null && !$query->filtersOnID()) {