Merge "Refactored how CachedAppOptimizerTest uses ExtendedMockitoRule." into udc-dev-plus-aosp am: f23ce1081b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23563189 Change-Id: I0c42a0856b16f055d6b5019b74c8b2ce722cbbeb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -85,22 +85,17 @@ public final class CachedAppOptimizerTest {
|
||||
@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 @@ public final class CachedAppOptimizerTest {
|
||||
mHandlerThread.quit();
|
||||
mThread.quit();
|
||||
mCountDown = null;
|
||||
mDeviceConfig.tearDown();
|
||||
}
|
||||
|
||||
private ProcessRecord makeProcessRecord(int pid, int uid, int packageUid, String processName,
|
||||
|
||||
Reference in New Issue
Block a user