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

Merge "Fix PackageParser tests" into pi-dev

Browse Source
This commit is contained in:
Adrian Roos
2018-03-19 18:02:22 +00:00
committed by Android (Google) Code Review
parent 1639c330fc c8af604700
commit 65a84cafaf
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/tests/servicestests/src/com/android/server/pm/PackageParserTest.java
View File

@@ -27,8 +27,10 @@ import android.content.pm.ServiceInfo;
import android.content.pm.Signature; import android.content.pm.Signature;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcel; import android.os.Parcel;
import android.platform.test.annotations.Presubmit;
import android.support.test.filters.MediumTest;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4; import android.support.test.runner.AndroidJUnit4;
import android.test.suitebuilder.annotation.MediumTest;
import java.io.File; import java.io.File;
import java.lang.reflect.Array; import java.lang.reflect.Array;
@@ -126,6 +128,8 @@ public class PackageParserTest {
} }
@Test @Test
@SmallTest
@Presubmit
public void test_roundTripKnownFields() throws Exception { public void test_roundTripKnownFields() throws Exception {
PackageParser.Package pkg = new PackageParser.Package("foo"); PackageParser.Package pkg = new PackageParser.Package("foo");
setKnownFields(pkg); setKnownFields(pkg);
@@ -266,6 +270,9 @@ public class PackageParserTest {
assertEquals(a.mRestrictedAccountType, b.mRestrictedAccountType); assertEquals(a.mRestrictedAccountType, b.mRestrictedAccountType);
assertEquals(a.mRequiredAccountType, b.mRequiredAccountType); assertEquals(a.mRequiredAccountType, b.mRequiredAccountType);
assertEquals(a.mOverlayTarget, b.mOverlayTarget); assertEquals(a.mOverlayTarget, b.mOverlayTarget);
assertEquals(a.mOverlayCategory, b.mOverlayCategory);
assertEquals(a.mOverlayPriority, b.mOverlayPriority);
assertEquals(a.mOverlayIsStatic, b.mOverlayIsStatic);
assertEquals(a.mSigningDetails.publicKeys, b.mSigningDetails.publicKeys); assertEquals(a.mSigningDetails.publicKeys, b.mSigningDetails.publicKeys);
assertEquals(a.mUpgradeKeySets, b.mUpgradeKeySets); assertEquals(a.mUpgradeKeySets, b.mUpgradeKeySets);
assertEquals(a.mKeySetMapping, b.mKeySetMapping); assertEquals(a.mKeySetMapping, b.mKeySetMapping);
@@ -524,6 +531,15 @@ public class PackageParserTest {
pkg.mCompileSdkVersionCodename = "foo23"; pkg.mCompileSdkVersionCodename = "foo23";
pkg.mCompileSdkVersion = 100; pkg.mCompileSdkVersion = 100;
pkg.mVersionCodeMajor = 100; pkg.mVersionCodeMajor = 100;
pkg.mOverlayCategory = "foo24";
pkg.mOverlayIsStatic = true;
pkg.baseHardwareAccelerated = true;
pkg.coreApp = true;
pkg.mRequiredForAllUsers = true;
pkg.visibleToInstantApps = true;
pkg.use32bitAbi = true;
} }
private static void assertAllFieldsExist(PackageParser.Package pkg) throws Exception { private static void assertAllFieldsExist(PackageParser.Package pkg) throws Exception {
@@ -532,6 +548,7 @@ public class PackageParserTest {
Set<String> nonSerializedFields = new HashSet<>(); Set<String> nonSerializedFields = new HashSet<>();
nonSerializedFields.add("mExtras"); nonSerializedFields.add("mExtras");
nonSerializedFields.add("packageUsageTimeMillis"); nonSerializedFields.add("packageUsageTimeMillis");
nonSerializedFields.add("isStub");
for (Field f : fields) { for (Field f : fields) {
final Class<?> fieldType = f.getType(); final Class<?> fieldType = f.getType();
@@ -560,6 +577,10 @@ public class PackageParserTest {
// int fields: Check that they're set to 100. // int fields: Check that they're set to 100.
int value = (int) f.get(pkg); int value = (int) f.get(pkg);
assertEquals("Bad value for field: " + f, 100, value); assertEquals("Bad value for field: " + f, 100, value);
} else if (fieldType == boolean.class) {
// boolean fields: Check that they're set to true.
boolean value = (boolean) f.get(pkg);
assertEquals("Bad value for field: " + f, true, value);
} else { } else {
// All other fields: Check that they're set. // All other fields: Check that they're set.
Object o = f.get(pkg); Object o = f.get(pkg);