commit e98a7d396a1ca68003dca29e00ea10b2e7a5359e
author Jeffrey Huang <jeffreyhuang@google.com> Wed Aug 11 15:36:45 2021 -0700
committer Jeffrey Huang <jeffreyhuang@google.com> Wed Aug 11 19:15:52 2021 -0700
tree aeff7569b5dd82895395cfeb7d87d0e5cf234182
parent 0f7b9b0ccd5d0adc1d0bb8ad4047f6d6bf723132

Backfill MetricActivationTests

Bug: 193167534
Test: TH
Change-Id: I0cacc99684743330ce1cb90995b37617b0307170

tests/src/android/cts/statsd/atom/AtomTestCase.java

diff --git a/tests/src/android/cts/statsd/atom/AtomTestCase.java b/tests/src/android/cts/statsd/atom/AtomTestCase.java
index 95f12e1..1aeee92 100644
--- a/tests/src/android/cts/statsd/atom/AtomTestCase.java
+++ b/tests/src/android/cts/statsd/atom/AtomTestCase.java
@@ -337,7 +337,7 @@
             if (metricData.hasAtom()) {
               data.add(metricData);
             } else {
-              data.addAll(backfillAggregatedAtomsinEventMetric(metricData));
+              data.addAll(backfillAggregatedAtomsInEventMetric(metricData));
             }
           }
         }
@@ -1176,8 +1176,8 @@
                 .that(timestampNs % fiveMinutesInNs).isEqualTo(0);
     }
 
-    private List<EventMetricData>
-    backfillAggregatedAtomsinEventMetric(EventMetricData metricData) {
+    protected List<EventMetricData> backfillAggregatedAtomsInEventMetric(
+            EventMetricData metricData) {
       if (!metricData.hasAggregatedAtomInfo()) {
         return Collections.emptyList();
       }

tests/src/android/cts/statsd/metric/MetricActivationTests.java

diff --git a/tests/src/android/cts/statsd/metric/MetricActivationTests.java b/tests/src/android/cts/statsd/metric/MetricActivationTests.java
index 339970a..25fa031 100644
--- a/tests/src/android/cts/statsd/metric/MetricActivationTests.java
+++ b/tests/src/android/cts/statsd/metric/MetricActivationTests.java
@@ -31,9 +31,11 @@
 import com.android.os.AtomsProto.Atom;
 import com.android.os.StatsLog.ConfigMetricsReport;
 import com.android.os.StatsLog.ConfigMetricsReportList;
+import com.android.os.StatsLog.EventMetricData;
 import com.android.os.StatsLog.StatsLogReport;
 import com.android.tradefed.log.LogUtil;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -557,9 +559,13 @@
         assertThat(metricReport.hasEventMetrics()).isEqualTo(dataCount > 0);
 
         StatsLogReport.EventMetricDataWrapper eventData = metricReport.getEventMetrics();
-        assertThat(eventData.getDataCount()).isEqualTo(dataCount);
-        for (int i = 0; i < eventData.getDataCount(); i++) {
-            AppBreadcrumbReported atom = eventData.getData(i).getAtom().getAppBreadcrumbReported();
+        List<EventMetricData> eventMetricDataList = new ArrayList<>();
+        for (EventMetricData eventMetricData : eventData.getDataList()) {
+            eventMetricDataList.addAll(backfillAggregatedAtomsInEventMetric(eventMetricData));
+        }
+        assertThat(eventMetricDataList).hasSize(dataCount);
+        for (EventMetricData eventMetricData : eventMetricDataList) {
+            AppBreadcrumbReported atom = eventMetricData.getAtom().getAppBreadcrumbReported();
             assertThat(atom.getLabel()).isEqualTo(metricMatcherLabel);
         }
     }