simpler ways to trigger cts
Bug: 73739025
Change-Id: I746bd7337630c48b5618bf72d83444b3ca6bee58
Fix: 73739025
Test: cts
diff --git a/tests/src/android/cts/statsd/atom/AtomTestCase.java b/tests/src/android/cts/statsd/atom/AtomTestCase.java
index 3853f7b..fc56ec8 100644
--- a/tests/src/android/cts/statsd/atom/AtomTestCase.java
+++ b/tests/src/android/cts/statsd/atom/AtomTestCase.java
@@ -311,21 +311,20 @@
@Nullable FieldMatcher.Builder dimension) throws Exception {
final String atomName = "Atom" + System.nanoTime();
final String gaugeName = "Gauge" + System.nanoTime();
- final String predicateName = "SCREEN_IS_ON";
+ final String predicateName = "APP_BREADCRUMB";
SimpleAtomMatcher.Builder sam = SimpleAtomMatcher.newBuilder().setAtomId(atomId);
conf.addAtomMatcher(AtomMatcher.newBuilder()
.setId(atomName.hashCode())
.setSimpleAtomMatcher(sam));
- // TODO: change this predicate to something simpler and easier
- final String predicateTrueName = "SCREEN_TURNED_ON";
- final String predicateFalseName = "SCREEN_TURNED_OFF";
+ final String predicateTrueName = "APP_BREADCRUMB_1";
+ final String predicateFalseName = "APP_BREADCRUMB_2";
conf.addAtomMatcher(AtomMatcher.newBuilder()
.setId(predicateTrueName.hashCode())
.setSimpleAtomMatcher(SimpleAtomMatcher.newBuilder()
- .setAtomId(Atom.SCREEN_STATE_CHANGED_FIELD_NUMBER)
+ .setAtomId(Atom.APP_BREADCRUMB_REPORTED_FIELD_NUMBER)
.addFieldValueMatcher(FieldValueMatcher.newBuilder()
- .setField(ScreenStateChanged.STATE_FIELD_NUMBER)
- .setEqInt(DisplayStateEnum.DISPLAY_STATE_ON_VALUE)
+ .setField(AppBreadcrumbReported.LABEL_FIELD_NUMBER)
+ .setEqInt(1)
)
)
)
@@ -333,10 +332,10 @@
.addAtomMatcher(AtomMatcher.newBuilder()
.setId(predicateFalseName.hashCode())
.setSimpleAtomMatcher(SimpleAtomMatcher.newBuilder()
- .setAtomId(Atom.SCREEN_STATE_CHANGED_FIELD_NUMBER)
+ .setAtomId(Atom.APP_BREADCRUMB_REPORTED_FIELD_NUMBER)
.addFieldValueMatcher(FieldValueMatcher.newBuilder()
- .setField(ScreenStateChanged.STATE_FIELD_NUMBER)
- .setEqInt(DisplayStateEnum.DISPLAY_STATE_OFF_VALUE)
+ .setField(AppBreadcrumbReported.LABEL_FIELD_NUMBER)
+ .setEqInt(2)
)
)
);
@@ -503,6 +502,14 @@
getDevice().executeShellCommand("cmd battery set wireless 1");
}
+ public void setAppBreadcrumbPredicate() throws Exception {
+ doAppBreadcrumbReportedStart(1);
+ }
+
+ public void clearAppBreadcrumbPredicate() throws Exception {
+ doAppBreadcrumbReportedStart(2);
+ }
+
public void doAppBreadcrumbReportedStart(int label) throws Exception {
doAppBreadcrumbReported(label, AppBreadcrumbReported.State.START.ordinal());
}
diff --git a/tests/src/android/cts/statsd/atom/HostAtomTests.java b/tests/src/android/cts/statsd/atom/HostAtomTests.java
index d3f3dbd..eba55a6 100644
--- a/tests/src/android/cts/statsd/atom/HostAtomTests.java
+++ b/tests/src/android/cts/statsd/atom/HostAtomTests.java
@@ -330,12 +330,10 @@
.setField(RemainingBatteryCapacity.CHARGE_UAH_FIELD_NUMBER));
addGaugeAtom(config, Atom.REMAINING_BATTERY_CAPACITY_FIELD_NUMBER, dimension);
- turnScreenOff();
-
uploadConfig(config);
Thread.sleep(WAIT_TIME_LONG);
- turnScreenOn();
+ setAppBreadcrumbPredicate();
Thread.sleep(WAIT_TIME_LONG);
List<Atom> data = getGaugeMetricDataList();
@@ -356,12 +354,10 @@
.setField(FullBatteryCapacity.CAPACITY_UAH_FIELD_NUMBER));
addGaugeAtom(config, Atom.FULL_BATTERY_CAPACITY_FIELD_NUMBER, dimension);
- turnScreenOff();
-
uploadConfig(config);
Thread.sleep(WAIT_TIME_LONG);
- turnScreenOn();
+ setAppBreadcrumbPredicate();
Thread.sleep(WAIT_TIME_LONG);
List<Atom> data = getGaugeMetricDataList();
@@ -384,12 +380,10 @@
.setField(Temperature.SENSOR_NAME_FIELD_NUMBER));
addGaugeAtom(config, Atom.TEMPERATURE_FIELD_NUMBER, dimension);
- turnScreenOff();
-
uploadConfig(config);
Thread.sleep(WAIT_TIME_LONG);
- turnScreenOn();
+ setAppBreadcrumbPredicate();
Thread.sleep(WAIT_TIME_LONG);
List<Atom> data = getGaugeMetricDataList();
@@ -417,12 +411,10 @@
.setField(KernelWakelock.NAME_FIELD_NUMBER));
addGaugeAtom(config, Atom.KERNEL_WAKELOCK_FIELD_NUMBER, dimension);
- turnScreenOff();
-
uploadConfig(config);
Thread.sleep(WAIT_TIME_LONG);
- turnScreenOn();
+ setAppBreadcrumbPredicate();
Thread.sleep(WAIT_TIME_LONG);
List<Atom> data = getGaugeMetricDataList();
@@ -444,13 +436,11 @@
.setField(CpuTimePerFreq.CLUSTER_FIELD_NUMBER));
addGaugeAtom(config, Atom.CPU_TIME_PER_FREQ_FIELD_NUMBER, dimension);
- turnScreenOff();
-
uploadConfig(config);
- Thread.sleep(2000);
- turnScreenOn();
- Thread.sleep(2000);
+ Thread.sleep(WAIT_TIME_LONG);
+ setAppBreadcrumbPredicate();
+ Thread.sleep(WAIT_TIME_LONG);
List<Atom> data = getGaugeMetricDataList();
@@ -468,12 +458,10 @@
.setField(SubsystemSleepState.SUBSYSTEM_NAME_FIELD_NUMBER));
addGaugeAtom(config, Atom.SUBSYSTEM_SLEEP_STATE_FIELD_NUMBER, dimension);
- turnScreenOff();
-
uploadConfig(config);
Thread.sleep(WAIT_TIME_LONG);
- turnScreenOn();
+ setAppBreadcrumbPredicate();
Thread.sleep(WAIT_TIME_LONG);
List<Atom> dataList = getGaugeMetricDataList();
@@ -490,12 +478,10 @@
StatsdConfig.Builder config = getPulledConfig();
addGaugeAtom(config, Atom.MODEM_ACTIVITY_INFO_FIELD_NUMBER, null);
- turnScreenOff();
-
uploadConfig(config);
Thread.sleep(WAIT_TIME_LONG);
- turnScreenOn();
+ setAppBreadcrumbPredicate();
Thread.sleep(WAIT_TIME_LONG);
List<Atom> dataList = getGaugeMetricDataList();
@@ -512,12 +498,10 @@
StatsdConfig.Builder config = getPulledConfig();
addGaugeAtom(config, Atom.WIFI_ACTIVITY_INFO_FIELD_NUMBER, null);
- turnScreenOff();
-
uploadConfig(config);
Thread.sleep(WAIT_TIME_LONG);
- turnScreenOn();
+ setAppBreadcrumbPredicate();
Thread.sleep(WAIT_TIME_LONG);
List<Atom> dataList = getGaugeMetricDataList();
@@ -537,12 +521,10 @@
StatsdConfig.Builder config = getPulledConfig();
addGaugeAtom(config, Atom.BLUETOOTH_ACTIVITY_INFO_FIELD_NUMBER, null);
- turnScreenOff();
-
uploadConfig(config);
Thread.sleep(WAIT_TIME_LONG);
- turnScreenOn();
+ setAppBreadcrumbPredicate();
Thread.sleep(WAIT_TIME_LONG);
List<Atom> dataList = getGaugeMetricDataList();
diff --git a/tests/src/android/cts/statsd/atom/UidAtomTests.java b/tests/src/android/cts/statsd/atom/UidAtomTests.java
index 1bfe778..13a9039 100644
--- a/tests/src/android/cts/statsd/atom/UidAtomTests.java
+++ b/tests/src/android/cts/statsd/atom/UidAtomTests.java
@@ -206,9 +206,8 @@
runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".AtomTests", "testSimpleCpu");
- turnScreenOff();
Thread.sleep(WAIT_TIME_SHORT);
- turnScreenOn();
+ setAppBreadcrumbPredicate();
Thread.sleep(WAIT_TIME_SHORT);
List<Atom> atomList = getGaugeMetricDataList();
@@ -239,14 +238,11 @@
uploadConfig(config);
- turnScreenOn();
- Thread.sleep(WAIT_TIME_SHORT);
+ Thread.sleep(WAIT_TIME_LONG);
runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".AtomTests", "testSimpleCpu");
Thread.sleep(WAIT_TIME_SHORT);
- turnScreenOff();
- Thread.sleep(WAIT_TIME_SHORT);
- turnScreenOn();
- Thread.sleep(WAIT_TIME_SHORT);
+ setAppBreadcrumbPredicate();
+ Thread.sleep(WAIT_TIME_LONG);
List<Atom> atomList = getGaugeMetricDataList();
