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

Commit ef21a28f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Cleanup the mock local service instance after testing done." into... 

Merge "Cleanup the mock local service instance after testing done." into rvc-dev am: d2c06f9e am: 8a4ae168 am: 8cb170c4

Change-Id: I55b230bd5f7e4f8932475300d7637c41496f4317
parents 9d521164 8cb170c4

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -127,11 +127,14 @@ public class ApplicationExitInfoTest { 
        mAms.mAtmInternal = spy(mAms.mActivityTaskManager.getAtmInternal());

        mAms.mAtmInternal = spy(mAms.mActivityTaskManager.getAtmInternal());

        mAms.mPackageManagerInt = mPackageManagerInt;

        mAms.mPackageManagerInt = mPackageManagerInt;

        doReturn(new ComponentName("", "")).when(mPackageManagerInt).getSystemUiServiceComponent();

        doReturn(new ComponentName("", "")).when(mPackageManagerInt).getSystemUiServiceComponent();

        // Remove stale instance of PackageManagerInternal if there is any

        LocalServices.removeServiceForTest(PackageManagerInternal.class);

        LocalServices.addService(PackageManagerInternal.class, mPackageManagerInt);

        LocalServices.addService(PackageManagerInternal.class, mPackageManagerInt);

    }

    }





    @After

    @After

    public void tearDown() {

    public void tearDown() {

        LocalServices.removeServiceForTest(PackageManagerInternal.class);

        mHandlerThread.quit();

        mHandlerThread.quit();

    }

    }

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,7 @@ import com.android.server.wm.ActivityServiceConnectionsHolder; 
import com.android.server.wm.ActivityTaskManagerService;

import com.android.server.wm.ActivityTaskManagerService;

import com.android.server.wm.WindowProcessController;

import com.android.server.wm.WindowProcessController;





import org.junit.AfterClass;

import org.junit.BeforeClass;

import org.junit.BeforeClass;

import org.junit.Test;

import org.junit.Test;
@@ -141,6 +142,8 @@ public class MockingOomAdjusterTests { 
        sPackageManagerInternal = mock(PackageManagerInternal.class);

        sPackageManagerInternal = mock(PackageManagerInternal.class);

        doReturn(new ComponentName("", "")).when(sPackageManagerInternal)

        doReturn(new ComponentName("", "")).when(sPackageManagerInternal)

                .getSystemUiServiceComponent();

                .getSystemUiServiceComponent();

        // Remove stale instance of PackageManagerInternal if there is any

        LocalServices.removeServiceForTest(PackageManagerInternal.class);

        LocalServices.addService(PackageManagerInternal.class, sPackageManagerInternal);

        LocalServices.addService(PackageManagerInternal.class, sPackageManagerInternal);





        sService = mock(ActivityManagerService.class);

        sService = mock(ActivityManagerService.class);
@@ -172,6 +175,11 @@ public class MockingOomAdjusterTests { 
        sService.mOomAdjuster.mAdjSeq = 10000;

        sService.mOomAdjuster.mAdjSeq = 10000;

    }

    }





    @AfterClass

    public static void tearDownOnce() {

        LocalServices.removeServiceForTest(PackageManagerInternal.class);

    }



    private static <T> void setFieldValue(Class clazz, Object obj, String fieldName, T val) {

    private static <T> void setFieldValue(Class clazz, Object obj, String fieldName, T val) {

        try {

        try {

            Field field = clazz.getDeclaredField(fieldName);

            Field field = clazz.getDeclaredField(fieldName);