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

Commit 9e927808 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable binder caches for unit tests" into rvc-dev

parents 84a84ac6 78d60a6e

services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import static org.junit.Assert.assertTrue; 
import static org.junit.Assert.fail;



import android.annotation.NonNull;

import android.app.PropertyInvalidatedCache;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;
@@ -91,6 +92,12 @@ public class PackageManagerSettingsTests { 
        MockitoAnnotations.initMocks(this);

    }



    @Before

    public void setup() {

        // Disable binder caches in this process.

        PropertyInvalidatedCache.disableForTestMode();

    }



    /** make sure our initialized KeySetManagerService metadata matches packages.xml */

    @Test

    public void testReadKeySetSettings()

services/tests/servicestests/src/com/android/server/pm/UserManagerServiceCreateProfileTest.java

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;



import android.app.PropertyInvalidatedCache;

import android.content.pm.UserInfo;

import android.os.Looper;

import android.os.ServiceSpecificException;
@@ -60,6 +61,9 @@ public class UserManagerServiceCreateProfileTest { 
        if (Looper.myLooper() == null) {

            Looper.prepare();

        }

        // Disable binder caches in this process.

        PropertyInvalidatedCache.disableForTestMode();



        LocalServices.removeServiceForTest(UserManagerInternal.class);

        mUserManagerService = new UserManagerService(InstrumentationRegistry.getContext());

services/tests/servicestests/src/com/android/server/pm/UserManagerServiceIdRecyclingTest.java

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals; 
import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;



import android.app.PropertyInvalidatedCache;

import android.content.pm.UserInfo;

import android.os.Looper;

import android.os.UserManagerInternal;
@@ -57,6 +58,9 @@ public class UserManagerServiceIdRecyclingTest { 
        if (Looper.myLooper() == null) {

            Looper.prepare();

        }

        // Disable binder caches in this process.

        PropertyInvalidatedCache.disableForTestMode();



        LocalServices.removeServiceForTest(UserManagerInternal.class);

        mUserManagerService = new UserManagerService(InstrumentationRegistry.getContext());

    }
@@ -122,4 +126,3 @@ public class UserManagerServiceIdRecyclingTest { 
        return new UserInfo(userId, "User " + userId, 0);

    }

}

services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import static org.junit.Assert.assertFalse; 
import static org.junit.Assert.assertTrue;



import android.annotation.UserIdInt;

import android.app.PropertyInvalidatedCache;

import android.content.pm.UserInfo;

import android.content.pm.UserInfo.UserInfoFlag;

import android.os.Looper;
@@ -78,6 +79,9 @@ public class UserManagerServiceUserInfoTest { 
        if (Looper.myLooper() == null) {

            Looper.prepare();

        }

        // Disable binder caches in this process.

        PropertyInvalidatedCache.disableForTestMode();



        LocalServices.removeServiceForTest(UserManagerInternal.class);

        mUserManagerService = new UserManagerService(InstrumentationRegistry.getContext());