Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f23ce108 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents a2414e31 37b1d1f8
Loading
Loading
Loading
Loading
+1 −7
Original line number Diff line number Diff line
@@ -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,