From 8fde9e1a4477a795ce5ff276b1163d6fc2dd3140 Mon Sep 17 00:00:00 2001
From: mrulhania <mrulhania@google.com>
Date: Thu, 27 Feb 2025 10:34:04 -0800
Subject: Window transition wait isn't needed after permission grant/deny click

The test doesn't need to wait for (flaky) window transition
event after grant/deny button click in permission dailog.
The test waits for onRequestPermissionsResult callback
before asserting permission states, and that is good
enough. So, imo we doesn't need unnecessary window
transition assertion.

Bug: 396788297
Test: atest LocationAccuracyTest --iterations 10
Flag: EXEMPT test fix
Relnote: test fix
LOW_COVERAGE_REASON=TEST_ONLY
Change-Id: I532b51e0c76a33255f1a9bcca4ca6c39faedbe63
---
 .../permissionui/cts/LocationAccuracyTest.kt       | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'tests')

diff --git a/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt
index 4781fb895..db54d9db5 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt
@@ -25,7 +25,6 @@ import com.android.modules.utils.build.SdkLevel
 import org.junit.Assume.assumeFalse
 import org.junit.Assume.assumeTrue
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
 
 @FlakyTest
@@ -51,8 +50,6 @@ class LocationAccuracyTest : BaseUsePermissionTest() {
     }
 
     @Test
-    @Ignore("b/390440965")
-    // Ignore this test until the cause of flakiness is identified.
     fun testCoarsePermissionIsGranted() {
         installPackage(APP_APK_PATH_31)
 
@@ -62,7 +59,8 @@ class LocationAccuracyTest : BaseUsePermissionTest() {
 
         requestAppPermissionsAndAssertResult(
             ACCESS_FINE_LOCATION to false,
-            ACCESS_COARSE_LOCATION to true
+            ACCESS_COARSE_LOCATION to true,
+            waitForWindowTransition = false,
         ) {
             clickCoarseLocationRadioButton()
             clickPreciseLocationRadioButton()
@@ -72,20 +70,17 @@ class LocationAccuracyTest : BaseUsePermissionTest() {
     }
 
     @Test
-    @Ignore("b/396478581")
-    // Ignore this test until the cause of flakiness is identified.
     fun testPrecisePermissionIsGranted() {
         installPackage(APP_APK_PATH_31)
 
         assertAppHasPermission(ACCESS_FINE_LOCATION, false)
         assertAppHasPermission(ACCESS_COARSE_LOCATION, false)
         assertAppHasPermission(ACCESS_BACKGROUND_LOCATION, false)
-        val waitForWindowTransition = SdkLevel.isAtLeastB();
 
         requestAppPermissionsAndAssertResult(
             ACCESS_FINE_LOCATION to true,
             ACCESS_COARSE_LOCATION to true,
-            waitForWindowTransition = waitForWindowTransition
+            waitForWindowTransition = false,
         ) {
             clickPreciseLocationRadioButton()
             clickCoarseLocationRadioButton()
@@ -104,7 +99,8 @@ class LocationAccuracyTest : BaseUsePermissionTest() {
 
         requestAppPermissionsAndAssertResult(
             ACCESS_FINE_LOCATION to false,
-            ACCESS_COARSE_LOCATION to true
+            ACCESS_COARSE_LOCATION to true,
+            waitForWindowTransition = false,
         ) {
             clickCoarseLocationRadioButton()
             clickPreciseLocationRadioButton()
@@ -115,7 +111,8 @@ class LocationAccuracyTest : BaseUsePermissionTest() {
         // now request again to change to precise location
         requestAppPermissionsAndAssertResult(
             ACCESS_FINE_LOCATION to true,
-            ACCESS_COARSE_LOCATION to true
+            ACCESS_COARSE_LOCATION to true,
+            waitForWindowTransition = false,
         ) {
             clickPreciseLocationOnlyView()
             clickPermissionRequestAllowForegroundButton()
@@ -130,7 +127,10 @@ class LocationAccuracyTest : BaseUsePermissionTest() {
         assertAppHasPermission(ACCESS_COARSE_LOCATION, false)
         assertAppHasPermission(ACCESS_BACKGROUND_LOCATION, false)
 
-        requestAppPermissionsAndAssertResult(ACCESS_COARSE_LOCATION to true) {
+        requestAppPermissionsAndAssertResult(
+            ACCESS_COARSE_LOCATION to true,
+            waitForWindowTransition = false,
+        ) {
             clickCoarseLocationOnlyView()
             clickPermissionRequestAllowForegroundButton()
         }
@@ -143,13 +143,16 @@ class LocationAccuracyTest : BaseUsePermissionTest() {
     fun testPreSAppsAutograntFineIfCoarseGranted() {
         installPackage(APP_APK_PATH_30)
         assertAppHasPermission(ACCESS_COARSE_LOCATION, false)
-        requestAppPermissionsAndAssertResult(ACCESS_COARSE_LOCATION to true) {
+        requestAppPermissionsAndAssertResult(
+            ACCESS_COARSE_LOCATION to true,
+            waitForWindowTransition = false,
+        ) {
             clickPermissionRequestAllowForegroundButton()
         }
         assertAppHasPermission(ACCESS_FINE_LOCATION, false)
         requestAppPermissionsAndAssertResult(
             ACCESS_FINE_LOCATION to true,
-            waitForWindowTransition = false
+            waitForWindowTransition = false,
         ) {}
     }
 
-- 
cgit v1.2.3-59-g8ed1b