[statsd] Removed obsolete FRIEND_TEST statements am: 6fa5d40538
Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/2860845
Change-Id: I3b98923e1900a2dfd9ffbf886163e90cf1503b29
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/statsd/src/anomaly/AnomalyTracker.h b/statsd/src/anomaly/AnomalyTracker.h
index 281c1f6..92a7173 100644
--- a/statsd/src/anomaly/AnomalyTracker.h
+++ b/statsd/src/anomaly/AnomalyTracker.h
@@ -217,7 +217,6 @@
FRIEND_TEST(AnomalyTrackerTest, TestConsecutiveBuckets);
FRIEND_TEST(AnomalyTrackerTest, TestSparseBuckets);
- FRIEND_TEST(GaugeMetricProducerTest, TestAnomalyDetection);
FRIEND_TEST(CountMetricProducerTest, TestAnomalyDetectionUnSliced);
FRIEND_TEST(AnomalyDurationDetectionE2eTest, TestDurationMetric_SUM_single_bucket);
FRIEND_TEST(AnomalyDurationDetectionE2eTest, TestDurationMetric_SUM_partial_bucket);
diff --git a/statsd/src/flags/FlagProvider.h b/statsd/src/flags/FlagProvider.h
index 28d45f4..7b77c04 100644
--- a/statsd/src/flags/FlagProvider.h
+++ b/statsd/src/flags/FlagProvider.h
@@ -136,11 +136,9 @@
FRIEND_TEST(RestrictedEventMetricE2eTest, TestFlagDisabled);
FRIEND_TEST(LogEventTest, TestRestrictionCategoryAnnotation);
FRIEND_TEST(LogEventTest, TestInvalidRestrictionCategoryAnnotation);
- FRIEND_TEST(LogEventTest, TestRestrictionCategoryAnnotationFlagDisabled);
FRIEND_TEST(LogEvent_FieldRestrictionTest, TestFieldRestrictionAnnotation);
FRIEND_TEST(LogEvent_FieldRestrictionTest, TestInvalidAnnotationIntType);
FRIEND_TEST(LogEvent_FieldRestrictionTest, TestInvalidAnnotationAtomLevel);
- FRIEND_TEST(LogEvent_FieldRestrictionTest, TestRestrictionCategoryAnnotationFlagDisabled);
};
} // namespace statsd
diff --git a/statsd/src/metrics/DurationMetricProducer.h b/statsd/src/metrics/DurationMetricProducer.h
index 59dedf9..a366292 100644
--- a/statsd/src/metrics/DurationMetricProducer.h
+++ b/statsd/src/metrics/DurationMetricProducer.h
@@ -186,7 +186,6 @@
FRIEND_TEST(DurationMetricTrackerTest, TestNoCondition);
FRIEND_TEST(DurationMetricTrackerTest, TestNonSlicedCondition);
FRIEND_TEST(DurationMetricTrackerTest, TestNonSlicedConditionUnknownState);
- FRIEND_TEST(WakelockDurationE2eTest, TestAggregatedPredicates);
FRIEND_TEST(DurationMetricTrackerTest, TestFirstBucket);
FRIEND_TEST(DurationMetricProducerTest, TestSumDurationAppUpgradeSplitDisabled);
diff --git a/statsd/src/metrics/MetricsManager.h b/statsd/src/metrics/MetricsManager.h
index e4bd165..4674a85 100644
--- a/statsd/src/metrics/MetricsManager.h
+++ b/statsd/src/metrics/MetricsManager.h
@@ -368,7 +368,6 @@
// The memory limit in bytes for triggering get data.
size_t mTriggerGetDataBytes;
- FRIEND_TEST(WakelockDurationE2eTest, TestAggregatedPredicateDimensions);
FRIEND_TEST(MetricConditionLinkE2eTest, TestMultiplePredicatesAndLinks);
FRIEND_TEST(AttributionE2eTest, TestAttributionMatchAndSliceByFirstUid);
FRIEND_TEST(AttributionE2eTest, TestAttributionMatchAndSliceByChain);
@@ -403,7 +402,6 @@
FRIEND_TEST(MetricsManagerTest, TestLogSources);
FRIEND_TEST(MetricsManagerTest, TestLogSourcesOnConfigUpdate);
- FRIEND_TEST(MetricsManagerTest, TestOnMetricRemoveCalled);
FRIEND_TEST(MetricsManagerTest_SPlus, TestRestrictedMetricsConfig);
FRIEND_TEST(MetricsManagerTest_SPlus, TestRestrictedMetricsConfigUpdate);
FRIEND_TEST(MetricsManagerUtilTest, TestSampledMetrics);
@@ -430,7 +428,6 @@
FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedState);
FRIEND_TEST(DurationMetricE2eTest, TestWithConditionAndSlicedState);
FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedStateMapped);
- FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedStatePrimaryFieldsSuperset);
FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedStatePrimaryFieldsSubset);
FRIEND_TEST(DurationMetricE2eTest, TestUploadThreshold);
diff --git a/statsd/src/socket/LogEventFilter.h b/statsd/src/socket/LogEventFilter.h
index aec91ef..941e359 100644
--- a/statsd/src/socket/LogEventFilter.h
+++ b/statsd/src/socket/LogEventFilter.h
@@ -114,15 +114,12 @@
FRIEND_TEST(LogEventFilterTest, TestEmptyFilter);
FRIEND_TEST(LogEventFilterTest, TestRemoveNonExistingEmptyFilter);
FRIEND_TEST(LogEventFilterTest, TestEmptyFilterDisabled);
- FRIEND_TEST(LogEventFilterTest, TestEmptyFilterDisabledSetter);
FRIEND_TEST(LogEventFilterTest, TestNonEmptyFilterFullOverlap);
FRIEND_TEST(LogEventFilterTest, TestNonEmptyFilterPartialOverlap);
FRIEND_TEST(LogEventFilterTest, TestNonEmptyFilterDisabled);
FRIEND_TEST(LogEventFilterTest, TestNonEmptyFilterDisabledPartialOverlap);
FRIEND_TEST(LogEventFilterTest, TestMultipleConsumerOverlapIds);
- FRIEND_TEST(LogEventFilterTest, TestMultipleConsumerNonOverlapIds);
FRIEND_TEST(LogEventFilterTest, TestMultipleConsumerOverlapIdsRemoved);
- FRIEND_TEST(LogEventFilterTest, TestMultipleConsumerNonOverlapIdsRemoved);
FRIEND_TEST(LogEventFilterTest, TestMultipleConsumerEmptyFilter);
};
diff --git a/statsd/src/utils/MultiConditionTrigger.h b/statsd/src/utils/MultiConditionTrigger.h
index 51f6029..9a0314b 100644
--- a/statsd/src/utils/MultiConditionTrigger.h
+++ b/statsd/src/utils/MultiConditionTrigger.h
@@ -47,9 +47,8 @@
std::set<std::string> mRemainingConditionNames;
std::function<void()> mTrigger;
bool mCompleted;
-
- FRIEND_TEST(MultiConditionTriggerTest, TestCountDownCalledBySameEventName);
};
+
} // namespace statsd
} // namespace os
} // namespace android
