diff --git a/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt b/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt index 74a3437ae..a253552dc 100644 --- a/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt +++ b/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt @@ -87,7 +87,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/TestUtils.kt b/permissions/src/androidTest/java/com/google/accompanist/permissions/TestUtils.kt index d70f5e9b4..4bc11c523 100644 --- a/permissions/src/androidTest/java/com/google/accompanist/permissions/TestUtils.kt +++ b/permissions/src/androidTest/java/com/google/accompanist/permissions/TestUtils.kt @@ -78,12 +78,13 @@ 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) + assert(permissionButton.clickForPermission(instrumentation)) { "Could not deny permission" } } internal fun doNotAskAgainPermissionInDialog( @@ -91,7 +92,7 @@ internal fun doNotAskAgainPermissionInDialog( ) { val uiDevice = UiDevice.getInstance(instrumentation) when { - Build.VERSION.SDK_INT == 30 -> { + Build.VERSION.SDK_INT >= 30 -> { denyPermissionInDialog(instrumentation) } Build.VERSION.SDK_INT > 28 -> {