Fix AppCompactorTest and add a presubmit TEST_RULE
Test will run as presubmit if AppCompactor.java is modified.
Modifying server/TEST_MAPPING to add "include-filter":
"com.android.server." to make sure it still runs as expected.
Bug: 128613287
Bug: 129341058
Test: atest --test-mapping [while in com/android/server/am/]
Test: atest FrameworksMockingServicesTests:AppCompactorTest
Change-Id: I6238f83c0f94d9a9ca593ddab5169667150a5583
diff --git a/services/core/java/com/android/server/TEST_MAPPING b/services/core/java/com/android/server/TEST_MAPPING
index 1870f8d..5522396 100644
--- a/services/core/java/com/android/server/TEST_MAPPING
+++ b/services/core/java/com/android/server/TEST_MAPPING
@@ -5,6 +5,9 @@
"file_patterns": ["AlarmManagerService\\.java"],
"options": [
{
+ "include-filter": "com.android.server."
+ },
+ {
"include-annotation": "android.platform.test.annotations.Presubmit"
},
{
diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING
index 117174a..f198464 100644
--- a/services/core/java/com/android/server/am/TEST_MAPPING
+++ b/services/core/java/com/android/server/am/TEST_MAPPING
@@ -27,6 +27,21 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
+ },
+ {
+ "name": "FrameworksMockingServicesTests",
+ "file_patterns": ["AppCompactor\\.java"],
+ "options": [
+ {
+ "include-filter": "com.android.server.am."
+ },
+ {
+ "include-annotation": "android.platform.test.annotations.Presubmit"
+ },
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
}
],
"postsubmit": [
diff --git a/services/tests/mockingservicestests/src/com/android/server/am/AppCompactorTest.java b/services/tests/mockingservicestests/src/com/android/server/am/AppCompactorTest.java
index da439b8..b0c97d1 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/AppCompactorTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/AppCompactorTest.java
@@ -23,6 +23,7 @@
import android.os.Handler;
import android.os.HandlerThread;
+import android.platform.test.annotations.Presubmit;
import android.provider.DeviceConfig;
import com.android.server.appop.AppOpsService;
@@ -46,6 +47,7 @@
* Build/Install/Run:
* atest FrameworksMockingServicesTests:AppCompactorTest
*/
+@Presubmit
@RunWith(MockitoJUnitRunner.class)
public final class AppCompactorTest {
@@ -129,6 +131,12 @@
AppCompactor.KEY_COMPACT_THROTTLE_4,
Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_4 + 1), false);
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
+ AppCompactor.KEY_COMPACT_THROTTLE_5,
+ Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_5 + 1), false);
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
+ AppCompactor.KEY_COMPACT_THROTTLE_6,
+ Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_6 + 1), false);
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
AppCompactor.KEY_COMPACT_STATSD_SAMPLE_RATE,
Float.toString(AppCompactor.DEFAULT_STATSD_SAMPLE_RATE + 0.1f), false);
@@ -151,6 +159,10 @@
AppCompactor.DEFAULT_COMPACT_THROTTLE_4 + 1);
assertThat(mCompactorUnderTest.mStatsdSampleRate).isEqualTo(
AppCompactor.DEFAULT_STATSD_SAMPLE_RATE + 0.1f);
+ assertThat(mCompactorUnderTest.mCompactThrottleBFGS).isEqualTo(
+ AppCompactor.DEFAULT_COMPACT_THROTTLE_5 + 1);
+ assertThat(mCompactorUnderTest.mCompactThrottlePersistent).isEqualTo(
+ AppCompactor.DEFAULT_COMPACT_THROTTLE_6 + 1);
}
@Test
@@ -254,7 +266,7 @@
mCompactorUnderTest.init();
// When we override new reasonable throttle values after init...
- mCountDown = new CountDownLatch(4);
+ mCountDown = new CountDownLatch(6);
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
AppCompactor.KEY_COMPACT_THROTTLE_1,
Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_1 + 1), false);
@@ -267,6 +279,12 @@
DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
AppCompactor.KEY_COMPACT_THROTTLE_4,
Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_4 + 1), false);
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
+ AppCompactor.KEY_COMPACT_THROTTLE_5,
+ Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_5 + 1), false);
+ DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
+ AppCompactor.KEY_COMPACT_THROTTLE_6,
+ Long.toString(AppCompactor.DEFAULT_COMPACT_THROTTLE_6 + 1), false);
assertThat(mCountDown.await(5, TimeUnit.SECONDS)).isTrue();
// Then those flags values are reflected in the compactor.
@@ -278,6 +296,10 @@
AppCompactor.DEFAULT_COMPACT_THROTTLE_3 + 1);
assertThat(mCompactorUnderTest.mCompactThrottleFullFull).isEqualTo(
AppCompactor.DEFAULT_COMPACT_THROTTLE_4 + 1);
+ assertThat(mCompactorUnderTest.mCompactThrottleBFGS).isEqualTo(
+ AppCompactor.DEFAULT_COMPACT_THROTTLE_5 + 1);
+ assertThat(mCompactorUnderTest.mCompactThrottlePersistent).isEqualTo(
+ AppCompactor.DEFAULT_COMPACT_THROTTLE_6 + 1);
}
@Test