Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ValueMetricProducer_test on hwasan" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-25 17:32:55 +00:00
committed by Android (Google) Code Review
parent f903ef10e5 547f46331c
commit 8910bf95c6
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp
View File

@@ -1582,9 +1582,9 @@ TEST(ValueMetricProducerTest, TestUseZeroDefaultBaseWithPullFailures) {
ValueMetricProducerTestHelper::createValueProducerNoConditions(pullerManager, metric); ValueMetricProducerTestHelper::createValueProducerNoConditions(pullerManager, metric);
EXPECT_EQ(1UL, valueProducer->mCurrentSlicedBucket.size()); EXPECT_EQ(1UL, valueProducer->mCurrentSlicedBucket.size());
auto it = valueProducer->mCurrentSlicedBucket.begin(); const auto& it = valueProducer->mCurrentSlicedBucket.begin();
auto& interval1 = it->second[0]; ValueMetricProducer::Interval& interval1 = it->second[0];
auto& baseInfo1 = ValueMetricProducer::BaseInfo& baseInfo1 =
valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat())->second[0]; valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat())->second[0];
EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); EXPECT_EQ(1, it->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value);
EXPECT_EQ(true, baseInfo1.hasBase); EXPECT_EQ(true, baseInfo1.hasBase);
@@ -1611,16 +1611,9 @@ TEST(ValueMetricProducerTest, TestUseZeroDefaultBaseWithPullFailures) {
break; break;
} }
} }
// auto itBase = valueProducer->mCurrentBaseInfo.begin();
// for (; itBase != valueProducer->mCurrentBaseInfo.end(); it++) {
// if (itBase != iterBase) {
// break;
// }
// }
EXPECT_TRUE(it2 != it); EXPECT_TRUE(it2 != it);
// EXPECT_TRUE(itBase != iterBase); ValueMetricProducer::Interval& interval2 = it2->second[0];
auto& interval2 = it2->second[0]; ValueMetricProducer::BaseInfo& baseInfo2 =
auto& baseInfo2 =
valueProducer->mCurrentBaseInfo.find(it2->first.getDimensionKeyInWhat())->second[0]; valueProducer->mCurrentBaseInfo.find(it2->first.getDimensionKeyInWhat())->second[0];
EXPECT_EQ(2, it2->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value); EXPECT_EQ(2, it2->first.getDimensionKeyInWhat().getValues()[0].mValue.int_value);
EXPECT_EQ(true, baseInfo2.hasBase); EXPECT_EQ(true, baseInfo2.hasBase);
@@ -1647,23 +1640,28 @@ TEST(ValueMetricProducerTest, TestUseZeroDefaultBaseWithPullFailures) {
valueProducer->onDataPulled(allData, /** succeed */ true, bucket5StartTimeNs); valueProducer->onDataPulled(allData, /** succeed */ true, bucket5StartTimeNs);
EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size()); EXPECT_EQ(2UL, valueProducer->mCurrentSlicedBucket.size());
it = valueProducer->mCurrentSlicedBucket.begin(); // Get new references now that entries have been deleted from the map
it2 = std::next(valueProducer->mCurrentSlicedBucket.begin()); const auto& it3 = valueProducer->mCurrentSlicedBucket.begin();
interval1 = it->second[0]; const auto& it4 = std::next(valueProducer->mCurrentSlicedBucket.begin());
interval2 = it2->second[0]; EXPECT_EQ(it3->second.size(), 1);
baseInfo1 = valueProducer->mCurrentBaseInfo.find(it->first.getDimensionKeyInWhat())->second[0]; EXPECT_EQ(it4->second.size(), 1);
baseInfo2 = valueProducer->mCurrentBaseInfo.find(it2->first.getDimensionKeyInWhat())->second[0]; ValueMetricProducer::Interval& interval3 = it3->second[0];
ValueMetricProducer::Interval& interval4 = it4->second[0];
ValueMetricProducer::BaseInfo& baseInfo3 =
valueProducer->mCurrentBaseInfo.find(it3->first.getDimensionKeyInWhat())->second[0];
ValueMetricProducer::BaseInfo& baseInfo4 =
valueProducer->mCurrentBaseInfo.find(it4->first.getDimensionKeyInWhat())->second[0];
EXPECT_EQ(true, baseInfo1.hasBase); EXPECT_EQ(true, baseInfo3.hasBase);
EXPECT_EQ(5, baseInfo1.base.long_value); EXPECT_EQ(5, baseInfo3.base.long_value);
EXPECT_EQ(false, interval1.hasValue); EXPECT_EQ(false, interval3.hasValue);
EXPECT_EQ(5, interval1.value.long_value); EXPECT_EQ(5, interval3.value.long_value);
EXPECT_EQ(true, valueProducer->mHasGlobalBase); EXPECT_EQ(true, valueProducer->mHasGlobalBase);
EXPECT_EQ(true, baseInfo2.hasBase); EXPECT_EQ(true, baseInfo4.hasBase);
EXPECT_EQ(13, baseInfo2.base.long_value); EXPECT_EQ(13, baseInfo4.base.long_value);
EXPECT_EQ(false, interval2.hasValue); EXPECT_EQ(false, interval4.hasValue);
EXPECT_EQ(8, interval2.value.long_value); EXPECT_EQ(8, interval4.value.long_value);
EXPECT_EQ(2UL, valueProducer->mPastBuckets.size()); EXPECT_EQ(2UL, valueProducer->mPastBuckets.size());
} }