Merge pull request #1312 from google/ben/permissions_test_fix

[Permissions] Fix tests not working on new emulator targets
google · Aug 31, 2022 · 4d367af · 4d367af
2 parents e956c89 + 3f3af30
commit 4d367af
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 19 deletions.
diff --git a/...c/androidTest/java/com/google/accompanist/permissions/MultipleAndSinglePermissionsTest.kt b/...c/androidTest/java/com/google/accompanist/permissions/MultipleAndSinglePermissionsTest.kt
@@ -36,11 +36,9 @@ import androidx.test.filters.SdkSuppress
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import com.google.accompanist.permissions.test.PermissionsTestActivity
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
-@Ignore
 @OptIn(ExperimentalPermissionsApi::class)
 @FlakyTest(detail = "https://github.com/google/accompanist/issues/490")
 @SdkSuppress(minSdkVersion = 23)

diff --git a/...s/src/androidTest/java/com/google/accompanist/permissions/MultiplePermissionsStateTest.kt b/...s/src/androidTest/java/com/google/accompanist/permissions/MultiplePermissionsStateTest.kt
@@ -21,14 +21,12 @@ import androidx.test.filters.SdkSuppress
 import androidx.test.rule.GrantPermissionRule
 import com.google.accompanist.permissions.test.EmptyPermissionsTestActivity
 import com.google.common.truth.Truth.assertThat
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
 /**
  * Simple tests that prove the data comes from the right place
  */
-@Ignore
 @OptIn(ExperimentalPermissionsApi::class)
 @SdkSuppress(minSdkVersion = 23)
 class MultiplePermissionsStateTest {

diff --git a/permissions/src/androidTest/java/com/google/accompanist/permissions/PermissionStateTest.kt b/permissions/src/androidTest/java/com/google/accompanist/permissions/PermissionStateTest.kt
@@ -21,14 +21,12 @@ import androidx.test.filters.SdkSuppress
 import androidx.test.rule.GrantPermissionRule
 import com.google.accompanist.permissions.test.EmptyPermissionsTestActivity
 import com.google.common.truth.Truth.assertThat
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
 /**
  * Simple tests that prove the data comes from the right place
  */
-@Ignore
 @OptIn(ExperimentalPermissionsApi::class)
 @SdkSuppress(minSdkVersion = 23)
 class PermissionStateTest {

diff --git a/...src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt b/...src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt
@@ -28,13 +28,10 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.filters.SdkSuppress
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
-@Ignore
 @OptIn(ExperimentalPermissionsApi::class)
 @SdkSuppress(minSdkVersion = 23)
 class RequestMultiplePermissionsTest {
@@ -89,7 +86,6 @@ class RequestMultiplePermissionsTest {
         composeTestRule.onNodeWithText("No permission").assertIsDisplayed()
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun permissionTest_grantInTheBackground() {
         composeTestRule.onNodeWithText("No permission").assertIsDisplayed()

diff --git a/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestPermissionTest.kt b/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestPermissionTest.kt
@@ -29,11 +29,9 @@ import androidx.compose.ui.test.performClick
 import androidx.test.filters.FlakyTest
 import androidx.test.filters.SdkSuppress
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
-@Ignore
 @OptIn(ExperimentalPermissionsApi::class)
 @SdkSuppress(minSdkVersion = 23)
 class RequestPermissionTest {

diff --git a/permissions/src/androidTest/java/com/google/accompanist/permissions/TestUtils.kt b/permissions/src/androidTest/java/com/google/accompanist/permissions/TestUtils.kt
@@ -78,20 +78,21 @@ internal fun grantPermissionInDialog(
 internal fun denyPermissionInDialog(
     instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
 ) {
-    UiDevice.getInstance(instrumentation).findPermissionButton(
-        when (Build.VERSION.SDK_INT) {
-            in 24..28 -> "DENY"
-            else -> "Deny"
-        }
-    ).clickForPermission(instrumentation)
+    val text = when (Build.VERSION.SDK_INT) {
+        in 24..28 -> "DENY"
+        in 29..30 -> "Deny"
+        else -> "Don’t allow"
+    }
+    val permissionButton = UiDevice.getInstance(instrumentation).findPermissionButton(text)
+    permissionButton.clickForPermission(instrumentation)
 }
 
 internal fun doNotAskAgainPermissionInDialog(
     instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
 ) {
     val uiDevice = UiDevice.getInstance(instrumentation)
     when {
-        Build.VERSION.SDK_INT == 30 -> {
+        Build.VERSION.SDK_INT >= 30 -> {
             denyPermissionInDialog(instrumentation)
         }
         Build.VERSION.SDK_INT > 28 -> {