Removed obsolete testProcessStatePssValue test
- atoms #3 and #18 are deprecated and logging is removed
Bug: 300268706
Bug: 301067968
Test: build, flash & review statsdstats
Change-Id: I799681cd3678dd3b85ac5fd7fd39e53ca8cc0563
diff --git a/tests/PROCSTATSQ_PROCS_STATE_CACHED_EMPTY_DURATION.pbtxt b/tests/PROCSTATSQ_PROCS_STATE_CACHED_EMPTY_DURATION.pbtxt
deleted file mode 100644
index 6655599..0000000
--- a/tests/PROCSTATSQ_PROCS_STATE_CACHED_EMPTY_DURATION.pbtxt
+++ /dev/null
@@ -1,70 +0,0 @@
-# DURATION_PROCESS_STATE_IN_CACHED_EMPTY_PER_PROC_NAME_PACKAGE_NAME_VERSION
-id: -6109199674574072698
-duration_metric {
- id: -7871805656933174442
- what: -4194528603977557137
- aggregation_type: SUM
- dimensions_in_what {
- field: 3
- child {
- field: 2
- }
- child {
- field: 3
- }
- child {
- field: 5
- }
- }
- bucket: ONE_MINUTE
-}
-# PROC_STATE NOT IN CACHED_EMPTY
-atom_matcher {
- id: -2354884036751182872
- combination {
- operation: NOT
- matcher: -7794766650955623092
- }
-}
-# PROC_STATE IN CACHED_EMPTY
-atom_matcher {
- id: -7794766650955623092
- simple_atom_matcher {
- atom_id: 3
- field_value_matcher {
- field: 4
- eq_int: 1018
- }
- }
-}
-predicate {
- id: -4194528603977557137
- simple_predicate {
- start: -7794766650955623092
- stop: -2354884036751182872
- count_nesting: false
- dimensions {
- field: 3
- child {
- field: 2
- }
- child {
- field: 3
- }
- child {
- field: 5
- }
- }
- }
-}
-allowed_log_source: "AID_GRAPHICS"
-allowed_log_source: "AID_INCIDENTD"
-allowed_log_source: "AID_STATSD"
-allowed_log_source: "AID_RADIO"
-allowed_log_source: "com.android.systemui"
-allowed_log_source: "com.android.vending"
-allowed_log_source: "AID_SYSTEM"
-allowed_log_source: "AID_ROOT"
-allowed_log_source: "AID_BLUETOOTH"
-default_pull_packages: "AID_SYSTEM"
-hash_strings_in_metric_report: false
diff --git a/tests/PROCSTATSQ_PROCS_STATE_PSS_VALUE.pbtxt b/tests/PROCSTATSQ_PROCS_STATE_PSS_VALUE.pbtxt
deleted file mode 100644
index 7f071e3..0000000
--- a/tests/PROCSTATSQ_PROCS_STATE_PSS_VALUE.pbtxt
+++ /dev/null
@@ -1,45 +0,0 @@
-# VALUE_MAX_PSS_PER_PROC_NAME_PACKAGE_NAME_VERSION
-id: -6109199674574072698
-value_metric {
- id: 1867856787681329178
- what: -3480158308153459853
- value_field {
- field: 18
- child {
- field: 4
- }
- }
- dimensions_in_what {
- field: 18
- child {
- field: 2
- }
- child {
- field: 3
- }
- child {
- field: 9
- }
- }
- bucket: ONE_MINUTE
- aggregation_type: MAX
-}
-# PROCESS_MEMORY_STAT_REPORTED
-atom_matcher {
- id: -3480158308153459853
- simple_atom_matcher {
- atom_id: 18
- }
-}
-allowed_log_source: "AID_GRAPHICS"
-allowed_log_source: "AID_INCIDENTD"
-allowed_log_source: "AID_STATSD"
-allowed_log_source: "AID_RADIO"
-allowed_log_source: "com.android.systemui"
-allowed_log_source: "com.android.vending"
-allowed_log_source: "AID_SYSTEM"
-allowed_log_source: "AID_ROOT"
-allowed_log_source: "AID_BLUETOOTH"
-default_pull_packages: "AID_SYSTEM"
-
-hash_strings_in_metric_report: false
diff --git a/tests/PROCSTATSQ_PROCS_STATE_TOP_DURATION.pbtxt b/tests/PROCSTATSQ_PROCS_STATE_TOP_DURATION.pbtxt
deleted file mode 100644
index e388d54..0000000
--- a/tests/PROCSTATSQ_PROCS_STATE_TOP_DURATION.pbtxt
+++ /dev/null
@@ -1,91 +0,0 @@
-# DURATION_PROCESS_STATE_IN_TOP_PER_PROC_NAME_PACKAGE_NAME_VERSION
-id: -6109199674574072698
-duration_metric {
- id: -1365360216258753370
- what: -8800411078553365796
- aggregation_type: SUM
- dimensions_in_what {
- field: 3
- child {
- field: 2
- }
- child {
- field: 3
- }
- child {
- field: 5
- }
- }
- bucket: ONE_MINUTE
-}
-# PROC_STATE NOT IN TOP
-atom_matcher {
- id: -7829668247086356765
- combination {
- operation: NOT
- matcher: -2987742411590785849
- }
-}
-# PROCESS_STATE TOP
-atom_matcher {
- id: 509484152027467470
- simple_atom_matcher {
- atom_id: 3
- field_value_matcher {
- field: 4
- eq_int: 1002
- }
- }
-}
-# PROCESS_STATE TOP_SLEEPING
-atom_matcher {
- id: -3293304223207806916
- simple_atom_matcher {
- atom_id: 3
- field_value_matcher {
- field: 4
- eq_int: 1011
- }
- }
-}
-# PROC_STATE IN TOP
-atom_matcher {
- id: -2987742411590785849
- combination {
- operation: OR
- matcher: 509484152027467470
- matcher: -3293304223207806916
- }
-}
-predicate {
- id: -8800411078553365796
- simple_predicate {
- start: -2987742411590785849
- stop: -7829668247086356765
- count_nesting: false
- dimensions {
- field: 3
- child {
- field: 2
- }
- child {
- field: 3
- }
- child {
- field: 5
- }
- }
- }
-}
-allowed_log_source: "AID_GRAPHICS"
-allowed_log_source: "AID_INCIDENTD"
-allowed_log_source: "AID_STATSD"
-allowed_log_source: "AID_RADIO"
-allowed_log_source: "com.android.systemui"
-allowed_log_source: "com.android.vending"
-allowed_log_source: "AID_SYSTEM"
-allowed_log_source: "AID_ROOT"
-allowed_log_source: "AID_BLUETOOTH"
-default_pull_packages: "AID_SYSTEM"
-
-hash_strings_in_metric_report: false
diff --git a/tests/src/android/cts/statsd/validation/ProcStatsValidationTests.java b/tests/src/android/cts/statsd/validation/ProcStatsValidationTests.java
index b5baa36..1ca4c5c 100644
--- a/tests/src/android/cts/statsd/validation/ProcStatsValidationTests.java
+++ b/tests/src/android/cts/statsd/validation/ProcStatsValidationTests.java
@@ -44,69 +44,6 @@
private static final int EXTRA_WAIT_TIME_MS = 1_000; // as buffer when proc state changing.
- public void testProcessStatePssValue() throws Exception {
- if(isPssProfilingDisabled()) {
- LogUtil.CLog.i("testProcessStatePssValue is ignored when PSS profiling is disabled");
- return;
- }
- final String fileName = "PROCSTATSQ_PROCS_STATE_PSS_VALUE.pbtxt";
- StatsdConfig config = createValidationUtil().getConfig(fileName);
- LogUtil.CLog.d("Updating the following config:\n" + config.toString());
- uploadConfig(config);
- clearProcStats();
- toggleScreenAndSleep(WAIT_TIME_SHORT);
-
- // foreground service
- executeForegroundService();
- toggleScreenAndSleep(SLEEP_OF_FOREGROUND_SERVICE + EXTRA_WAIT_TIME_MS);
- // background
- executeBackgroundService(ACTION_BACKGROUND_SLEEP);
- toggleScreenAndSleep(SLEEP_OF_ACTION_BACKGROUND_SLEEP + EXTRA_WAIT_TIME_MS);
- // top
- executeForegroundActivity(ACTION_LONG_SLEEP_WHILE_TOP);
- toggleScreenAndSleep(SLEEP_OF_ACTION_LONG_SLEEP_WHILE_TOP + EXTRA_WAIT_TIME_MS);
- // Start extremely short-lived activity, so app goes into cache state (#1 - #3 above).
- executeBackgroundService(ACTION_END_IMMEDIATELY);
- final int cacheTime = 2_000; // process should be in cached state for up to this long
- toggleScreenAndSleep(cacheTime);
- // foreground
- // overlay should take 2 sec to appear. So this makes it 4 sec in TOP
- executeForegroundActivity(ACTION_SHOW_APPLICATION_OVERLAY);
- toggleScreenAndSleep(EXTRA_WAIT_TIME_MS + 5_000);
-
- // Sorted list of events in order in which they occurred.
- List<ValueMetricData> statsdData = getValueMetricDataList();
-
- List<ProcessStatsProto> processStatsProtoList = getProcStatsProto();
-
- LogUtil.CLog.d("======================");
-
- String statsdPkgName = "com.android.server.cts.device.statsd";
- double valueInStatsd = 0;
- for (ValueMetricData d : statsdData) {
- List<DimensionsValue> dimensionsValuesInWhat = d.getDimensionLeafValuesInWhatList();
- if (dimensionsValuesInWhat.get(0).getValueStr().equals(statsdPkgName)
- && dimensionsValuesInWhat.get(1).getValueStr().equals(statsdPkgName)) {
- LogUtil.CLog.d(d.toString());
- for (ValueBucketInfo bucket : d.getBucketInfoList()) {
- valueInStatsd = Math.max(bucket.getValues(0).getValueLong(), valueInStatsd);
- }
- }
- }
-
- double valueInProcStats = 0;
- for (ProcessStatsProto p : processStatsProtoList) {
- if (p.getProcess().equals(statsdPkgName)) {
- LogUtil.CLog.d(p.toString());
- for (ProcessStatsStateProto s : p.getStatesList()) {
- valueInProcStats = Math.max(s.getPss().getMax(), valueInProcStats);
- }
- }
- }
- assertThat(valueInProcStats).isGreaterThan(0d);
- assertThat(valueInStatsd).isWithin(1e-10).of(valueInProcStats);
- }
-
private void toggleScreenAndSleep(final long duration) throws Exception {
final long half = duration >> 1;
Thread.sleep(half);
