Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable binder caches for unit tests" into rvc-dev am: 9e92780857 am: d8f8a8fff0

Browse Source 
Change-Id: I526b0051c1637fc506e7d815e7c8aade4be2da73
This commit is contained in:
TreeHugger Robot
2020-04-28 23:56:16 +00:00
committed by Automerger Merge Worker
parent 85fb075804 d8f8a8fff0
commit 59a2b1efaa
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()

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

@@ -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());

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

@@ -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);
}
}

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

@@ -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());