Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactored how CachedAppOptimizerTest uses ExtendedMockitoRule." into udc-dev-plus-aosp

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-05 16:36:16 +00:00
committed by Android (Google) Code Review
parent a2414e3104 37b1d1f845
commit f23ce1081b
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java
View File

@@ -85,22 +85,17 @@ public final class CachedAppOptimizerTest {
@Mock @Mock
private PackageManagerInternal mPackageManagerInt; private PackageManagerInternal mPackageManagerInt;
private final TestableDeviceConfig mDeviceConfig = new TestableDeviceConfig();
@Rule @Rule
public final ApplicationExitInfoTest.ServiceThreadRule public final ApplicationExitInfoTest.ServiceThreadRule
mServiceThreadRule = new ApplicationExitInfoTest.ServiceThreadRule(); mServiceThreadRule = new ApplicationExitInfoTest.ServiceThreadRule();
@Rule @Rule
public final ExtendedMockitoRule mExtendedMockitoRule = new ExtendedMockitoRule.Builder(this) public final ExtendedMockitoRule mExtendedMockitoRule = new ExtendedMockitoRule.Builder(this)
.configureSessionBuilder( .addStaticMockFixtures(TestableDeviceConfig::new).build();
sessionBuilder -> mDeviceConfig.setUpMockedClasses(sessionBuilder))
.build();
@Before @Before
public void setUp() { public void setUp() {
System.loadLibrary("mockingservicestestjni"); System.loadLibrary("mockingservicestestjni");
mDeviceConfig.setUpMockBehaviors();
mHandlerThread = new HandlerThread(""); mHandlerThread = new HandlerThread("");
mHandlerThread.start(); mHandlerThread.start();
mHandler = new Handler(mHandlerThread.getLooper()); mHandler = new Handler(mHandlerThread.getLooper());
@@ -131,7 +126,6 @@ public final class CachedAppOptimizerTest {
mHandlerThread.quit(); mHandlerThread.quit();
mThread.quit(); mThread.quit();
mCountDown = null; mCountDown = null;
mDeviceConfig.tearDown();
} }
private ProcessRecord makeProcessRecord(int pid, int uid, int packageUid, String processName, private ProcessRecord makeProcessRecord(int pid, int uid, int packageUid, String processName,