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

Merge "Disable test until APK prebuilts udpated" into rvc-dev-plus-aosp am: 21b305f096

Browse Source 
Change-Id: I5b655d9608854632871c1a735c5021863626319f
This commit is contained in:
Winson Chiu
2020-05-08 23:19:09 +00:00
committed by Automerger Merge Worker
parent 5ca1e09d09 21b305f096
commit 4bf50fb65c
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageInfoFlagBehaviorTest.kt
View File

@@ -26,6 +26,7 @@ import com.android.server.pm.parsing.AndroidPackageInfoFlagBehaviorTest.Companio
import com.android.server.pm.parsing.pkg.AndroidPackage import com.android.server.pm.parsing.pkg.AndroidPackage
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import com.google.common.truth.Truth.assertWithMessage import com.google.common.truth.Truth.assertWithMessage
import org.junit.Ignore
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.junit.runners.Parameterized import org.junit.runners.Parameterized
@@ -102,6 +103,7 @@ class AndroidPackageInfoFlagBehaviorTest : AndroidPackageParsingTestBase() {
lateinit var param: Param<Any> lateinit var param: Param<Any>
@Test @Test
@Ignore("b/155935153")
fun fieldPresence() { fun fieldPresence() {
oldPackages.asSequence().zip(newPackages.asSequence()) oldPackages.asSequence().zip(newPackages.asSequence())
.forEach { (old, new) -> .forEach { (old, new) ->
@@ -124,6 +126,7 @@ class AndroidPackageInfoFlagBehaviorTest : AndroidPackageParsingTestBase() {
} }
@Test @Test
@Ignore("b/155935153")
fun fieldAbsence() { fun fieldAbsence() {
newPackages.forEach { newPackages.forEach {
val newWithoutFlag = param.newPkgFunction(it, 0) val newWithoutFlag = param.newPkgFunction(it, 0)

3
services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageParsingEquivalenceTest.kt
View File

@@ -20,6 +20,7 @@ import android.content.pm.PackageManager
import android.platform.test.annotations.Presubmit import android.platform.test.annotations.Presubmit
import com.google.common.truth.Expect import com.google.common.truth.Expect
import com.google.common.truth.Truth.assertWithMessage import com.google.common.truth.Truth.assertWithMessage
import org.junit.Ignore
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
@@ -34,6 +35,7 @@ class AndroidPackageParsingEquivalenceTest : AndroidPackageParsingTestBase() {
val expect = Expect.create() val expect = Expect.create()
@Test @Test
@Ignore("b/155935153")
fun applicationInfoEquality() { fun applicationInfoEquality() {
val flags = PackageManager.GET_META_DATA or PackageManager.GET_SHARED_LIBRARY_FILES val flags = PackageManager.GET_META_DATA or PackageManager.GET_SHARED_LIBRARY_FILES
val oldAppInfo = oldPackages.asSequence().map { oldAppInfo(it, flags) } val oldAppInfo = oldPackages.asSequence().map { oldAppInfo(it, flags) }
@@ -53,6 +55,7 @@ class AndroidPackageParsingEquivalenceTest : AndroidPackageParsingTestBase() {
} }
@Test @Test
@Ignore("b/155935153")
fun packageInfoEquality() { fun packageInfoEquality() {
val flags = PackageManager.GET_ACTIVITIES or val flags = PackageManager.GET_ACTIVITIES or
PackageManager.GET_CONFIGURATIONS or PackageManager.GET_CONFIGURATIONS or