refactor tests to remove direct construction call to CDataGatherer

Author: valeriy42

lib/model/unittest/CDetectionRuleTest.cc

@@ -794,6 +794,41 @@ BOOST_FIXTURE_TEST_CASE(testRuleActions, CTestFixture) {
                                   0, 0, 100));
 }
 
+TMockModelPtr initializeModel(ml::model::CResourceMonitor& resourceMonitor) {
+    core_t::TTime bucketLength{600};
+    model::SModelParams params{bucketLength};
+    model::CSearchKey key;
+    model_t::TFeatureVec features;
+    // Initialize mock model
+    model::CAnomalyDetectorModel::TDataGathererPtr gatherer;
+
+    features.assign(1, model_t::E_IndividualSumByBucketAndPerson);
+
+    gatherer = std::make_shared<model::CDataGatherer>(
+        model_t::analysisCategory(features[0]), model_t::E_None, params, EMPTY_STRING,
+        EMPTY_STRING, "p", EMPTY_STRING, EMPTY_STRING, TStrVec{}, key, features, 0, 0);
+
+    std::string person("p1");
+    bool addedPerson{false};
+    gatherer->addPerson(person, resourceMonitor, addedPerson);
+
+    TMockModelPtr model{new model::CMockModel(
+        params, gatherer, {/* we don't care about influence */})};
+
+    maths::time_series::CTimeSeriesDecomposition trend;
+    maths::common::CNormalMeanPrecConjugate prior{
+        maths::common::CNormalMeanPrecConjugate::nonInformativePrior(maths_t::E_ContinuousData)};
+    maths::common::CModelParams timeSeriesModelParams{
+        bucketLength, 1.0, 0.001, 0.2, 6 * core::constants::HOUR, 24 * core::constants::HOUR};
+    std::unique_ptr<maths::time_series::CUnivariateTimeSeriesModel> timeSeriesModel =
+        std::make_unique<maths::time_series::CUnivariateTimeSeriesModel>(
+            timeSeriesModelParams, 0, trend, prior);
+    model::CMockModel::TMathsModelUPtrVec models;
+    models.emplace_back(std::move(timeSeriesModel));
+    model->mockTimeSeriesModels(std::move(models));
+    return model;
+}
+
 BOOST_FIXTURE_TEST_CASE(testRuleTimeShiftShouldShiftTimeSeriesModelState, CTestFixture) {
 
     test::CRandomNumbers rng;

lib/model/unittest/CEventRatePopulationDataGathererTest.cc

@@ -475,11 +475,11 @@ BOOST_FIXTURE_TEST_CASE(testCompressedLength, CTestFixture) {
 
     CDataGatherer::TFeatureVec features;
     features.push_back(model_t::E_PopulationInfoContentByBucketPersonAndAttribute);
-    SModelParams const params(bucketLength);
+    SModelParams constparams(bucketLength);
     CDataGatherer dataGatherer = CDataGathererBuilder(model_t::E_PopulationEventRate,
-                                                      features, params, searchKey, startTime)
-                                     .valueFieldName("value")
-                                     .build();
+                                                       features, params, searchKey, startTime)
+                                      .valueFieldName("value")
+                                      .build();
     core_t::TTime time = startTime;
     for (std::size_t i = 0; i < numberBuckets; ++i, time += bucketLength) {
         TMessageVec messages;

lib/model/unittest/CHierarchicalResultsTest.cc

@@ -1446,12 +1446,13 @@ BOOST_AUTO_TEST_CASE(testWriter) {
         model::SModelParams const params(modelConfig.bucketLength());
         auto interimBucketCorrector =
             std::make_shared<model::CInterimBucketCorrector>(modelConfig.bucketLength());
-        model::CSearchKey const key;
-        auto dataGatherer =
-            model::CDataGathererBuilder(model_t::E_EventRate,
-                                        {model_t::E_IndividualCountByBucketAndPerson},
-                                        params, key, modelConfig.bucketLength())
-                .buildSharedPtr();
+        model::CSearchKey key;
+        model::CAnomalyDetectorModel::TDataGathererPtr dataGatherer(
+            std::make_shared<model::CDataGatherer>(
+                model_t::E_EventRate, model_t::E_None, params, EMPTY_STRING,
+                EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, TStrVec{}, key,
+                model_t::TFeatureVec{model_t::E_IndividualCountByBucketAndPerson},
+                modelConfig.bucketLength(), 0));
         model::CEventData dummy;
         dataGatherer->addArrival(TStrCPtrVec(1, &EMPTY_STRING), dummy, resourceMonitor);
         dummy.clear();

lib/model/unittest/ModelTestHelpers.h

@@ -124,6 +124,18 @@ class CDataGathererBuilder {
         return *this;
     }
 
+    std::shared_ptr<CDataGatherer> buildSharedPtr() const {
+        return std::make_shared<CDataGatherer>(m_GathererType, m_SummaryMode, m_Params, m_SummaryCountFieldName,
+                             m_PartitionFieldValue, m_PersonFieldName, m_AttributeFieldName,
+                             m_ValueFieldName, m_InfluenceFieldNames, m_SearchKey, m_Features,
+                             m_StartTime, m_SampleCountOverride);
+    }
+
+    CDataGathererBuilder& partitionFieldValue(const std::string& partitionFieldValue) {
+        m_PartitionFieldValue = partitionFieldValue;
+        return *this;
+    }
+
     CDataGathererBuilder& personFieldName(std::string_view personFieldName) {
         m_PersonFieldName = personFieldName;
         return *this;