diff options
-rw-r--r-- | tests/src/android/cts/statsd/alert/AnomalyDetectionTests.java | 15 | ||||
-rw-r--r-- | tests/src/android/cts/statsd/metadata/MetadataTests.java | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/tests/src/android/cts/statsd/alert/AnomalyDetectionTests.java b/tests/src/android/cts/statsd/alert/AnomalyDetectionTests.java index 69e626c2..f08a553e 100644 --- a/tests/src/android/cts/statsd/alert/AnomalyDetectionTests.java +++ b/tests/src/android/cts/statsd/alert/AnomalyDetectionTests.java @@ -36,7 +36,7 @@ import com.android.internal.os.StatsdConfigProto.ValueMetric; import com.android.os.AtomsProto.AnomalyDetected; import com.android.os.AtomsProto.AppBreadcrumbReported; import com.android.os.AtomsProto.Atom; -import com.android.os.AtomsProto.CpuActiveTime; +import com.android.os.AtomsProto.DebugElapsedClock; import com.android.os.StatsLog.EventMetricData; import com.android.tradefed.log.LogUtil.CLog; import java.util.List; @@ -370,10 +370,9 @@ public class AnomalyDetectionTests extends AtomTestCase { // Test that anomaly detection for pulled metrics work. public void testPulledAnomalyDetection() throws Exception { - final int ATOM_ID = Atom.CPU_ACTIVE_TIME_FIELD_NUMBER; // A pulled atom - final int SLICE_BY_FIELD = CpuActiveTime.UID_FIELD_NUMBER; + final int ATOM_ID = Atom.DEBUG_ELAPSED_CLOCK_FIELD_NUMBER; // A pulled atom final int VALUE_FIELD = - CpuActiveTime.TIME_MILLIS_FIELD_NUMBER; // Something that will be > 0. + DebugElapsedClock.ELAPSED_CLOCK_MILLIS_FIELD_NUMBER; // Something that will be > 0. final int ATOM_MATCHER_ID = 300; StatsdConfig.Builder config = getBaseConfig(10, 20, 0 /* threshold: value > 0 */) @@ -388,11 +387,6 @@ public class AnomalyDetectionTests extends AtomTestCase { .setWhat(ATOM_MATCHER_ID) .setBucket(TimeUnit.CTS) .setSamplingType(GaugeMetric.SamplingType.RANDOM_ONE_SAMPLE) - // Slice by SLICE_BY_FIELD (typical usecase) - .setDimensionsInWhat(FieldMatcher.newBuilder() - .setField(ATOM_ID) - .addChild(FieldMatcher.newBuilder().setField(SLICE_BY_FIELD)) - ) // Track the VALUE_FIELD (anomaly detection requires exactly one field here) .setGaugeFieldsFilter( FieldFilter.newBuilder().setFields(FieldMatcher.newBuilder() @@ -406,8 +400,7 @@ public class AnomalyDetectionTests extends AtomTestCase { Thread.sleep(6_000); // Wait long enough to ensure AlarmManager signals >= 1 pull List<EventMetricData> data = getEventMetricDataList(); - // There will likely be many anomalies (one for each dimension). There must be at least one. - assertThat(data.size()).isAtLeast(1); + assertThat(data.size()).isEqualTo(1); assertThat(data.get(0).getAtom().getAnomalyDetected().getAlertId()).isEqualTo(ALERT_ID); } diff --git a/tests/src/android/cts/statsd/metadata/MetadataTests.java b/tests/src/android/cts/statsd/metadata/MetadataTests.java index 70227329..5c59b611 100644 --- a/tests/src/android/cts/statsd/metadata/MetadataTests.java +++ b/tests/src/android/cts/statsd/metadata/MetadataTests.java @@ -73,7 +73,7 @@ public class MetadataTests extends MetadataTestCase { Thread.sleep(10); } doAppBreadcrumbReportedStart(/* irrelevant val */ 6); // Event, after TTL_TIME_SEC secs. - Thread.sleep(WAIT_TIME_SHORT); + Thread.sleep(WAIT_TIME_LONG); report = getStatsdStatsReport(); LogUtil.CLog.d("got following statsdstats report: " + report.toString()); foundActiveConfig = false; |