tonyair/silverstripe-fulltextsearch
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch synced 2024-10-22 12:05:29 +00:00
Code Issues Projects Releases Wiki Activity

SS 4.0 - Replace inst()->update with modify()->set and hasOne with hasOneComponent

Browse Source
This commit is contained in:
Brett Tasker 2017-04-22 21:31:34 +12:00
parent faacb6bc47
commit 43dd2ba398
9 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/BatchedProcessorTest.php
View File

@ -48,9 +48,9 @@ class BatchedProcessorTest extends SapphireTest
SS_Datetime::set_mock_now('2015-05-07 06:00:00'); SS_Datetime::set_mock_now('2015-05-07 06:00:00');
Config::inst()->update('SearchUpdateBatchedProcessor', 'batch_size', 5); Config::modify()->set('SearchUpdateBatchedProcessor', 'batch_size', 5);
Config::inst()->update('SearchUpdateBatchedProcessor', 'batch_soft_cap', 0); Config::modify()->set('SearchUpdateBatchedProcessor', 'batch_soft_cap', 0);
Config::inst()->update('SearchUpdateCommitJobProcessor', 'cooldown', 600); Config::modify()->set('SearchUpdateCommitJobProcessor', 'cooldown', 600);
Versioned::reading_stage("Stage"); Versioned::reading_stage("Stage");
@ -195,20 +195,20 @@ class BatchedProcessorTest extends SapphireTest
$processor = $this->generateDirtyIds(); $processor = $this->generateDirtyIds();
// Test that increasing the soft cap to 2 will reduce the number of batches // Test that increasing the soft cap to 2 will reduce the number of batches
Config::inst()->update('SearchUpdateBatchedProcessor', 'batch_soft_cap', 2); Config::modify()->set('SearchUpdateBatchedProcessor', 'batch_soft_cap', 2);
$processor->batchData(); $processor->batchData();
$data = $processor->getJobData(); $data = $processor->getJobData();
//Debug::dump($data);die; //Debug::dump($data);die;
$this->assertEquals(8, $data->totalSteps); $this->assertEquals(8, $data->totalSteps);
// A soft cap of 1 should not fit in the hanging two items // A soft cap of 1 should not fit in the hanging two items
Config::inst()->update('SearchUpdateBatchedProcessor', 'batch_soft_cap', 1); Config::modify()->set('SearchUpdateBatchedProcessor', 'batch_soft_cap', 1);
$processor->batchData(); $processor->batchData();
$data = $processor->getJobData(); $data = $processor->getJobData();
$this->assertEquals(9, $data->totalSteps); $this->assertEquals(9, $data->totalSteps);
// Extra large soft cap should fit both items // Extra large soft cap should fit both items
Config::inst()->update('SearchUpdateBatchedProcessor', 'batch_soft_cap', 4); Config::modify()->set('SearchUpdateBatchedProcessor', 'batch_soft_cap', 4);
$processor->batchData(); $processor->batchData();
$data = $processor->getJobData(); $data = $processor->getJobData();
$this->assertEquals(8, $data->totalSteps); $this->assertEquals(8, $data->totalSteps);

3
tests/SearchUpdaterTest.php
View File

@ -27,7 +27,7 @@ class SearchUpdaterTest extends SapphireTest
SearchUpdater::bind_manipulation_capture(); SearchUpdater::bind_manipulation_capture();
Config::inst()->update('Injector', 'SearchUpdateProcessor', array( Config::modify()->set('Injector', 'SearchUpdateProcessor', array(
'class' => 'SearchUpdateImmediateProcessor' 'class' => 'SearchUpdateImmediateProcessor'
)); ));
@ -86,6 +86,7 @@ class SearchUpdaterTest extends SapphireTest
SearchUpdater::flush_dirty_indexes(); SearchUpdater::flush_dirty_indexes();
$added = self::$index->getAdded(array('ID')); $added = self::$index->getAdded(array('ID'));
// Some databases don't output $added in a consistent order; that's okay // Some databases don't output $added in a consistent order; that's okay
usort($added, function ($a, $b) {return $a['ID']-$b['ID']; }); usort($added, function ($a, $b) {return $a['ID']-$b['ID']; });

2
tests/SearchVariantVersionedTest.php
View File

@ -31,7 +31,7 @@ class SearchVariantVersionedTest extends SapphireTest
SearchUpdater::bind_manipulation_capture(); SearchUpdater::bind_manipulation_capture();
Config::inst()->update('Injector', 'SearchUpdateProcessor', array( Config::modify()->set('Injector', 'SearchUpdateProcessor', array(
'class' => 'SearchUpdateImmediateProcessor' 'class' => 'SearchUpdateImmediateProcessor'
)); ));

4
tests/SolrIndexSubsitesTest.php
View File

@ -51,7 +51,7 @@ class SolrIndexSubsitesTest extends SapphireTest {
SearchUpdater::bind_manipulation_capture(); SearchUpdater::bind_manipulation_capture();
Config::inst()->update('Injector', 'SearchUpdateProcessor', array( Config::modify()->set('Injector', 'SearchUpdateProcessor', array(
'class' => 'SearchUpdateImmediateProcessor' 'class' => 'SearchUpdateImmediateProcessor'
)); ));
@ -86,7 +86,7 @@ class SolrIndexSubsitesTest extends SapphireTest {
$variants = array(); $variants = array();
// Check subsite // Check subsite
if(class_exists('Subsite') && $object->hasOne('Subsite')) { if(class_exists('Subsite') && DataObject::getSchema()->hasOneComponent($object->getClassName(), 'Subsite')) {
$variants[] = '"SearchVariantSubsites":"' . $subsiteID. '"'; $variants[] = '"SearchVariantSubsites":"' . $subsiteID. '"';
} }

2
tests/SolrIndexTest.php
View File

@ -209,7 +209,7 @@ class SolrIndexTest extends SapphireTest
public function testAddFieldExtraOptions() public function testAddFieldExtraOptions()
{ {
Config::inst()->nest(); Config::inst()->nest();
Config::inst()->update('Director', 'environment_type', 'live'); // dev mode sets stored=true for everything Config::modify()->set('Director', 'environment_type', 'live'); // dev mode sets stored=true for everything
$index = new SolrIndexTest_FakeIndex(); $index = new SolrIndexTest_FakeIndex();

4
tests/SolrIndexVersionedTest.php
View File

@ -44,7 +44,7 @@ class SolrIndexVersionedTest extends SapphireTest
SearchUpdater::bind_manipulation_capture(); SearchUpdater::bind_manipulation_capture();
Config::inst()->update('Injector', 'SearchUpdateProcessor', array( Config::modify()->set('Injector', 'SearchUpdateProcessor', array(
'class' => 'SearchUpdateImmediateProcessor' 'class' => 'SearchUpdateImmediateProcessor'
)); ));
@ -77,7 +77,7 @@ class SolrIndexVersionedTest extends SapphireTest
$class = ClassInfo::baseDataClass($object); $class = ClassInfo::baseDataClass($object);
// Prevent subsites from breaking tests // Prevent subsites from breaking tests
$subsites = ''; $subsites = '';
if(class_exists('Subsite') && $object->hasOne('Subsite')) { if(class_exists('Subsite') && DataObject::getSchema()->hasOneComponent($object->getClassName(), 'Subsite')) {
$subsites = '"SearchVariantSubsites":"0",'; $subsites = '"SearchVariantSubsites":"0",';
} }
return $id.'-'.$class.'-{'.$subsites.'"SearchVariantVersioned":"'.$stage.'"}'; return $id.'-'.$class.'-{'.$subsites.'"SearchVariantVersioned":"'.$stage.'"}';

2
tests/SolrReindexQueuedTest.php
View File

@ -45,7 +45,7 @@ class SolrReindexQueuedTest extends SapphireTest
} }
// Set queued handler for reindex // Set queued handler for reindex
Config::inst()->update('Injector', 'SolrReindexHandler', array( Config::modify()->set('Injector', 'SolrReindexHandler', array(
'class' => 'SolrReindexQueuedHandler' 'class' => 'SolrReindexQueuedHandler'
)); ));
Injector::inst()->registerService(new SolrReindexQueuedHandler(), 'SolrReindexHandler'); Injector::inst()->registerService(new SolrReindexQueuedHandler(), 'SolrReindexHandler');

2
tests/SolrReindexTest.php
View File

@ -41,7 +41,7 @@ class SolrReindexTest extends SapphireTest
} }
// Set test handler for reindex // Set test handler for reindex
Config::inst()->update('Injector', 'SolrReindexHandler', array( Config::modify()->set('Injector', 'SolrReindexHandler', array(
'class' => 'SolrReindexTest_TestHandler' 'class' => 'SolrReindexTest_TestHandler'
)); ));
Injector::inst()->registerService(new SolrReindexTest_TestHandler(), 'SolrReindexHandler'); Injector::inst()->registerService(new SolrReindexTest_TestHandler(), 'SolrReindexHandler');

2
tests/SolrReindexTest/SolrReindexTest_ItemExtension.php
View File

@ -17,7 +17,7 @@ class SolrReindexTest_ItemExtension extends DataExtension implements TestOnly
/** /**
* Filter records on the current variant * Filter records on the current variant
* *
* @param SQLQuery $query * @param SQLSelect $query
* @param DataQuery $dataQuery * @param DataQuery $dataQuery
*/ */
public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = NULL) public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = NULL)