Refactored how CachedAppOptimizerTest uses ExtendedMockitoRule.
The latter now supports StaticMockFixture.
Test: atest FrameworksMockingServicesTests:CachedAppOptimizerTest
Bug: 281577492
Change-Id: I16b15dbb984eae561a38e8b389ad8c4e36adfb59
diff --git a/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java b/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java
index 13e16d6..22ad7c4 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java
@@ -85,22 +85,17 @@
@Mock
private PackageManagerInternal mPackageManagerInt;
- private final TestableDeviceConfig mDeviceConfig = new TestableDeviceConfig();
-
@Rule
public final ApplicationExitInfoTest.ServiceThreadRule
mServiceThreadRule = new ApplicationExitInfoTest.ServiceThreadRule();
@Rule
public final ExtendedMockitoRule mExtendedMockitoRule = new ExtendedMockitoRule.Builder(this)
- .configureSessionBuilder(
- sessionBuilder -> mDeviceConfig.setUpMockedClasses(sessionBuilder))
- .build();
+ .addStaticMockFixtures(TestableDeviceConfig::new).build();
@Before
public void setUp() {
System.loadLibrary("mockingservicestestjni");
- mDeviceConfig.setUpMockBehaviors();
mHandlerThread = new HandlerThread("");
mHandlerThread.start();
mHandler = new Handler(mHandlerThread.getLooper());
@@ -131,7 +126,6 @@
mHandlerThread.quit();
mThread.quit();
mCountDown = null;
- mDeviceConfig.tearDown();
}
private ProcessRecord makeProcessRecord(int pid, int uid, int packageUid, String processName,
