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

Commit 662d85b2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Refactored how CachedAppOptimizerTest uses ExtendedMockitoRule." into... 

Merge "Refactored how CachedAppOptimizerTest uses ExtendedMockitoRule." into udc-dev-plus-aosp am: f23ce108 am: 5d510aa1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23563189



Change-Id: I817f4c56c101dd31c3fe7eb37a0a00ef3351e8cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 656dc387 5d510aa1

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

+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,