refactor CMetricDataGathererTest.cc

Author: valeriy42

lib/model/unittest/CEventRateDataGathererTest.cc

@@ -63,60 +63,7 @@ namespace {
 const CSearchKey key;
 const std::string EMPTY_STRING;
 
-class CDataGathererBuilder {
-public:
-    CDataGathererBuilder(const TFeatureVec& features, const SModelParams& params, const CSearchKey& searchKey,
-                         const core_t::TTime startTime
-    ): m_Features(features), m_Params(params),  m_StartTime(startTime), m_SearchKey(searchKey) {}
-
-    CDataGatherer build() const {
-        return {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& personFieldName(const std::string& personFieldName) {
-        m_PersonFieldName = personFieldName;
-        return *this;
-    }
-
-    CDataGathererBuilder& valueFieldName(const std::string& valueFieldName) {
-        m_ValueFieldName = valueFieldName;
-        return *this;
-    }
-
-    CDataGathererBuilder& influenceFieldNames(const TStrVec& influenceFieldName) {
-        m_InfluenceFieldNames = influenceFieldName;
-        return *this;
-    }
 
-    CDataGathererBuilder& attributeFieldName(const std::string& attributeFieldName) {
-        m_AttributeFieldName = attributeFieldName;
-        return *this;
-    }
-
-    CDataGathererBuilder& gathererType(model_t::EAnalysisCategory gathererType) {
-        m_GathererType = gathererType;
-        return *this;
-    }
-
-private:
-    const TFeatureVec& m_Features;
-    const SModelParams& m_Params;
-    core_t::TTime m_StartTime;
-    const CSearchKey& m_SearchKey;
-    model_t::EAnalysisCategory m_GathererType{model_t::E_EventRate};
-    model_t::ESummaryMode m_SummaryMode{model_t::E_None};
-    std::string m_SummaryCountFieldName{EMPTY_STRING};
-    std::string m_PartitionFieldValue{EMPTY_STRING};
-    std::string m_PersonFieldName{EMPTY_STRING};
-    std::string m_AttributeFieldName{EMPTY_STRING};
-    std::string m_ValueFieldName{EMPTY_STRING};
-    TStrVec m_InfluenceFieldNames;
-    int m_SampleCountOverride{0};
-
-};
 
 std::size_t addPerson(CDataGatherer& gatherer,
                       CResourceMonitor& resourceMonitor,
@@ -221,7 +168,7 @@ void testInfluencerPerFeature(const model_t::EFeature feature,
     features.push_back(feature);
     TStrVec influencerFieldNames;
     influencerFieldNames.emplace_back("IF1");
-    CDataGatherer gatherer = CDataGathererBuilder(features, params, key, startTime)
+    CDataGatherer gatherer = CDataGathererBuilder(model_t::E_EventRate, features, params, key, startTime)
                                  .influenceFieldNames(influencerFieldNames)
                                  .valueFieldName(valueField)
                                  .build();

lib/model/unittest/CMetricDataGathererTest.cc

@@ -1128,10 +1128,7 @@ BOOST_FIXTURE_TEST_CASE(testResetBucketGivenMultipleSeries, CTestFixture) {
     features.push_back(model_t::E_IndividualMinByPerson);
     features.push_back(model_t::E_IndividualMaxByPerson);
     features.push_back(model_t::E_IndividualSumByBucketAndPerson);
-    CDataGatherer gatherer =
-        CDataGathererBuilder(model_t::E_Metric, features, params, KEY, startTime)
-            .sampleCountOverride(2U)
-            .build();
+    CDataGatherer gatherer = CDataGathererBuilder(model_t::E_Metric,features, params, KEY, startTime).sampleCountOverride(2U).build();
     addPerson("p1", gatherer, m_ResourceMonitor);
     addPerson("p2", gatherer, m_ResourceMonitor);
     addPerson("p3", gatherer, m_ResourceMonitor);
@@ -1604,9 +1601,9 @@ BOOST_FIXTURE_TEST_CASE(testMultivariate, CTestFixture) {
     {
         TFeatureVec features;
         features.push_back(model_t::E_IndividualMeanLatLongByPerson);
-        CDataGatherer gatherer = CDataGathererBuilder(model_t::E_Metric, features,
-                                                      params, KEY, startTime)
-                                     .build();
+        CDataGatherer gatherer(model_t::E_Metric, model_t::E_None, params,
+                               EMPTY_STRING, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING,
+                               EMPTY_STRING, {}, KEY, features, startTime, 0);
         BOOST_REQUIRE_EQUAL(0, addPerson("p", gatherer, m_ResourceMonitor));
 
         TTimeDoubleDoubleTupleVecVec buckets;