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

Commit 37b1d1f8 authored by Felipe Leme's avatar Felipe Leme Committed by Cherrypicker Worker
Browse files

Refactored how CachedAppOptimizerTest uses ExtendedMockitoRule. 

The latter now supports StaticMockFixture.

Test: atest FrameworksMockingServicesTests:CachedAppOptimizerTest
Bug: 281577492
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c9087a3022925d30f167cfca5465fbd8ab267fa1)
Merged-In: I16b15dbb984eae561a38e8b389ad8c4e36adfb59
Change-Id: I16b15dbb984eae561a38e8b389ad8c4e36adfb59
parent dd3c3d09

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -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,