summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vaibhav Goyal <vagoyal@google.com> 2024-06-20 23:05:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-06-20 23:05:49 +0000
commitd6b2abee6cb6c4ba3bcd5dce6edc43e2313d3861 (patch)
tree7a431ce86ec3ca6cb31e6da8816a0ac27b794f5c
parentd05bca68cb02fa17660e2117070f7387eebc8d40 (diff)
parent5283eedb4edd5c98bc38b7e8e534be890309d193 (diff)
Merge "Skip tests on automotive until scrolling is fixed on portrait ui" into main
-rw-r--r--tests/cts/permissionui/Android.bp1
-rw-r--r--tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30WithBluetooth.kt13
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/cts/permissionui/Android.bp b/tests/cts/permissionui/Android.bp
index c4ff0e069..c1ec017ff 100644
--- a/tests/cts/permissionui/Android.bp
+++ b/tests/cts/permissionui/Android.bp
@@ -44,6 +44,7 @@ android_test {
"platform-test-annotations",
"android.content.pm.flags-aconfig-java-export",
"android.permission.flags-aconfig-java-export",
+ "Harrier",
],
data: [
":CtsPermissionPolicyApp25",
diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30WithBluetooth.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30WithBluetooth.kt
index 1ed01b83e..8d3b9d3d4 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30WithBluetooth.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30WithBluetooth.kt
@@ -33,6 +33,9 @@ import android.util.Log
import androidx.test.InstrumentationRegistry
import androidx.test.filters.FlakyTest
import androidx.test.filters.SdkSuppress
+import com.android.bedstead.harrier.BedsteadJUnit4
+import com.android.bedstead.harrier.DeviceState
+import com.android.bedstead.harrier.annotations.RequireNotAutomotive
import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
import junit.framework.Assert.assertEquals
import junit.framework.Assert.assertTrue
@@ -42,14 +45,20 @@ import org.junit.Assert.assertNotEquals
import org.junit.Assume.assumeTrue
import org.junit.Before
import org.junit.ClassRule
+import org.junit.Rule
import org.junit.Test
+import org.junit.runner.RunWith
private const val LOG_TAG = "PermissionTest30WithBluetooth"
/** Runtime Bluetooth-permission behavior of apps targeting API 30 */
@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
+@RunWith(BedsteadJUnit4::class)
@FlakyTest
class PermissionTest30WithBluetooth : BaseUsePermissionTest() {
+ @ClassRule
+ @Rule
+ val sDeviceState: DeviceState = DeviceState()
companion object {
@get:ClassRule @JvmStatic val enableBluetooth = EnableBluetoothRule(true)
}
@@ -102,7 +111,9 @@ class PermissionTest30WithBluetooth : BaseUsePermissionTest() {
}
// TODO:(b/220030722) Remove verbose logging (after test is stabilized)
+ // TODO:(b/317442167) Fix permission scroll on auto portrait
@Test
+ @RequireNotAutomotive(reason = "Permission scroll is not working on auto portrait")
fun testGivenBluetoothIsDeniedWhenScanIsAttemptedThenThenGetEmptyScanResult() {
assumeTrue(supportsBluetoothLe())
@@ -151,7 +162,9 @@ class PermissionTest30WithBluetooth : BaseUsePermissionTest() {
}
}
+ // TODO:(b/317442167) Fix permission scroll on auto portrait
@Test
+ @RequireNotAutomotive(reason = "Permission scroll is not working on auto portrait")
fun testRevokedCompatPersistsOnReinstall() {
assertBluetoothRevokedCompatState(revoked = false)
revokeAppPermissionsByUi(BLUETOOTH_SCAN, isLegacyApp = true)