From 43dd2ba3981453f9bcaa762456708ba8c6918837 Mon Sep 17 00:00:00 2001 From: Brett Tasker Date: Sat, 22 Apr 2017 21:31:34 +1200 Subject: [PATCH] SS 4.0 - Replace inst()->update with modify()->set and hasOne with hasOneComponent --- tests/BatchedProcessorTest.php | 12 ++++++------ tests/SearchUpdaterTest.php | 3 ++- tests/SearchVariantVersionedTest.php | 2 +- tests/SolrIndexSubsitesTest.php | 4 ++-- tests/SolrIndexTest.php | 2 +- tests/SolrIndexVersionedTest.php | 4 ++-- tests/SolrReindexQueuedTest.php | 2 +- tests/SolrReindexTest.php | 2 +- .../SolrReindexTest_ItemExtension.php | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/tests/BatchedProcessorTest.php b/tests/BatchedProcessorTest.php index fcb96b3..54d384c 100644 --- a/tests/BatchedProcessorTest.php +++ b/tests/BatchedProcessorTest.php @@ -48,9 +48,9 @@ class BatchedProcessorTest extends SapphireTest SS_Datetime::set_mock_now('2015-05-07 06:00:00'); - Config::inst()->update('SearchUpdateBatchedProcessor', 'batch_size', 5); - Config::inst()->update('SearchUpdateBatchedProcessor', 'batch_soft_cap', 0); - Config::inst()->update('SearchUpdateCommitJobProcessor', 'cooldown', 600); + Config::modify()->set('SearchUpdateBatchedProcessor', 'batch_size', 5); + Config::modify()->set('SearchUpdateBatchedProcessor', 'batch_soft_cap', 0); + Config::modify()->set('SearchUpdateCommitJobProcessor', 'cooldown', 600); Versioned::reading_stage("Stage"); @@ -195,20 +195,20 @@ class BatchedProcessorTest extends SapphireTest $processor = $this->generateDirtyIds(); // 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(); $data = $processor->getJobData(); //Debug::dump($data);die; $this->assertEquals(8, $data->totalSteps); // 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(); $data = $processor->getJobData(); $this->assertEquals(9, $data->totalSteps); // 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(); $data = $processor->getJobData(); $this->assertEquals(8, $data->totalSteps); diff --git a/tests/SearchUpdaterTest.php b/tests/SearchUpdaterTest.php index 000283c..e786c2b 100644 --- a/tests/SearchUpdaterTest.php +++ b/tests/SearchUpdaterTest.php @@ -27,7 +27,7 @@ class SearchUpdaterTest extends SapphireTest SearchUpdater::bind_manipulation_capture(); - Config::inst()->update('Injector', 'SearchUpdateProcessor', array( + Config::modify()->set('Injector', 'SearchUpdateProcessor', array( 'class' => 'SearchUpdateImmediateProcessor' )); @@ -86,6 +86,7 @@ class SearchUpdaterTest extends SapphireTest SearchUpdater::flush_dirty_indexes(); $added = self::$index->getAdded(array('ID')); + // Some databases don't output $added in a consistent order; that's okay usort($added, function ($a, $b) {return $a['ID']-$b['ID']; }); diff --git a/tests/SearchVariantVersionedTest.php b/tests/SearchVariantVersionedTest.php index 1b73373..bff85c7 100644 --- a/tests/SearchVariantVersionedTest.php +++ b/tests/SearchVariantVersionedTest.php @@ -31,7 +31,7 @@ class SearchVariantVersionedTest extends SapphireTest SearchUpdater::bind_manipulation_capture(); - Config::inst()->update('Injector', 'SearchUpdateProcessor', array( + Config::modify()->set('Injector', 'SearchUpdateProcessor', array( 'class' => 'SearchUpdateImmediateProcessor' )); diff --git a/tests/SolrIndexSubsitesTest.php b/tests/SolrIndexSubsitesTest.php index 3534104..0d557df 100644 --- a/tests/SolrIndexSubsitesTest.php +++ b/tests/SolrIndexSubsitesTest.php @@ -51,7 +51,7 @@ class SolrIndexSubsitesTest extends SapphireTest { SearchUpdater::bind_manipulation_capture(); - Config::inst()->update('Injector', 'SearchUpdateProcessor', array( + Config::modify()->set('Injector', 'SearchUpdateProcessor', array( 'class' => 'SearchUpdateImmediateProcessor' )); @@ -86,7 +86,7 @@ class SolrIndexSubsitesTest extends SapphireTest { $variants = array(); // Check subsite - if(class_exists('Subsite') && $object->hasOne('Subsite')) { + if(class_exists('Subsite') && DataObject::getSchema()->hasOneComponent($object->getClassName(), 'Subsite')) { $variants[] = '"SearchVariantSubsites":"' . $subsiteID. '"'; } diff --git a/tests/SolrIndexTest.php b/tests/SolrIndexTest.php index c02d62c..154f960 100644 --- a/tests/SolrIndexTest.php +++ b/tests/SolrIndexTest.php @@ -209,7 +209,7 @@ class SolrIndexTest extends SapphireTest public function testAddFieldExtraOptions() { 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(); diff --git a/tests/SolrIndexVersionedTest.php b/tests/SolrIndexVersionedTest.php index 4533576..a0f7013 100644 --- a/tests/SolrIndexVersionedTest.php +++ b/tests/SolrIndexVersionedTest.php @@ -44,7 +44,7 @@ class SolrIndexVersionedTest extends SapphireTest SearchUpdater::bind_manipulation_capture(); - Config::inst()->update('Injector', 'SearchUpdateProcessor', array( + Config::modify()->set('Injector', 'SearchUpdateProcessor', array( 'class' => 'SearchUpdateImmediateProcessor' )); @@ -77,7 +77,7 @@ class SolrIndexVersionedTest extends SapphireTest $class = ClassInfo::baseDataClass($object); // Prevent subsites from breaking tests $subsites = ''; - if(class_exists('Subsite') && $object->hasOne('Subsite')) { + if(class_exists('Subsite') && DataObject::getSchema()->hasOneComponent($object->getClassName(), 'Subsite')) { $subsites = '"SearchVariantSubsites":"0",'; } return $id.'-'.$class.'-{'.$subsites.'"SearchVariantVersioned":"'.$stage.'"}'; diff --git a/tests/SolrReindexQueuedTest.php b/tests/SolrReindexQueuedTest.php index ed7aa0c..c048d5a 100644 --- a/tests/SolrReindexQueuedTest.php +++ b/tests/SolrReindexQueuedTest.php @@ -45,7 +45,7 @@ class SolrReindexQueuedTest extends SapphireTest } // Set queued handler for reindex - Config::inst()->update('Injector', 'SolrReindexHandler', array( + Config::modify()->set('Injector', 'SolrReindexHandler', array( 'class' => 'SolrReindexQueuedHandler' )); Injector::inst()->registerService(new SolrReindexQueuedHandler(), 'SolrReindexHandler'); diff --git a/tests/SolrReindexTest.php b/tests/SolrReindexTest.php index 1c2c2a6..340c135 100644 --- a/tests/SolrReindexTest.php +++ b/tests/SolrReindexTest.php @@ -41,7 +41,7 @@ class SolrReindexTest extends SapphireTest } // Set test handler for reindex - Config::inst()->update('Injector', 'SolrReindexHandler', array( + Config::modify()->set('Injector', 'SolrReindexHandler', array( 'class' => 'SolrReindexTest_TestHandler' )); Injector::inst()->registerService(new SolrReindexTest_TestHandler(), 'SolrReindexHandler'); diff --git a/tests/SolrReindexTest/SolrReindexTest_ItemExtension.php b/tests/SolrReindexTest/SolrReindexTest_ItemExtension.php index 9981932..faa2e22 100644 --- a/tests/SolrReindexTest/SolrReindexTest_ItemExtension.php +++ b/tests/SolrReindexTest/SolrReindexTest_ItemExtension.php @@ -17,7 +17,7 @@ class SolrReindexTest_ItemExtension extends DataExtension implements TestOnly /** * Filter records on the current variant * - * @param SQLQuery $query + * @param SQLSelect $query * @param DataQuery $dataQuery */ public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = NULL)