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

Commit c9087a30 authored by Felipe Leme's avatar Felipe Leme
Browse files

Refactored how CachedAppOptimizerTest uses ExtendedMockitoRule. 

The latter now supports StaticMockFixture.

Test: atest FrameworksMockingServicesTests:CachedAppOptimizerTest
Bug: 281577492

Change-Id: I16b15dbb984eae561a38e8b389ad8c4e36adfb59
parent d487c3b8

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,