From 3397a908c3735ec8db6af84ea8a58098b15dca56 Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Fri, 26 Aug 2022 10:40:41 +1000 Subject: [PATCH 1/3] Revert "Mark permissions as ignore" c693a0f3e1fce92898b94616f522585389e8fe98 --- .../accompanist/permissions/MultipleAndSinglePermissionsTest.kt | 2 -- .../accompanist/permissions/MultiplePermissionsStateTest.kt | 2 -- .../com/google/accompanist/permissions/PermissionStateTest.kt | 2 -- .../accompanist/permissions/RequestMultiplePermissionsTest.kt | 2 -- .../com/google/accompanist/permissions/RequestPermissionTest.kt | 2 -- 5 files changed, 10 deletions(-) diff --git a/permissions/src/androidTest/java/com/google/accompanist/permissions/MultipleAndSinglePermissionsTest.kt b/permissions/src/androidTest/java/com/google/accompanist/permissions/MultipleAndSinglePermissionsTest.kt index ddc286a49..0e7cd0edd 100644 --- a/permissions/src/androidTest/java/com/google/accompanist/permissions/MultipleAndSinglePermissionsTest.kt +++ b/permissions/src/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/permissions/src/androidTest/java/com/google/accompanist/permissions/MultiplePermissionsStateTest.kt b/permissions/src/androidTest/java/com/google/accompanist/permissions/MultiplePermissionsStateTest.kt index eda23f07c..c50db2cc9 100644 --- a/permissions/src/androidTest/java/com/google/accompanist/permissions/MultiplePermissionsStateTest.kt +++ b/permissions/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 index eb5641f3f..ae7623fb1 100644 --- 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/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt b/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt index 0696832d1..74a3437ae 100644 --- a/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt +++ b/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt @@ -30,11 +30,9 @@ 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 { diff --git a/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestPermissionTest.kt b/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestPermissionTest.kt index 765493d65..25a29704f 100644 --- 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 { From 5df6acf8f077c805fa9bb4bc265553d746985c4b Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Fri, 26 Aug 2022 11:15:05 +1000 Subject: [PATCH 2/3] Upgrade permissions tests to work on API30+ --- .../permissions/RequestMultiplePermissionsTest.kt | 2 -- .../google/accompanist/permissions/TestUtils.kt | 15 ++++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) 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..2c9f76a4c 100644 --- a/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt +++ b/permissions/src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt @@ -28,7 +28,6 @@ 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.Rule import org.junit.Test @@ -87,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/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 -> { From 3f3af3000d5295f4229019a542b0d16e52c80417 Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Fri, 26 Aug 2022 12:02:43 +1000 Subject: [PATCH 3/3] Remove assert as it doesn't always work --- .../java/com/google/accompanist/permissions/TestUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4bc11c523..caf8bfa1f 100644 --- a/permissions/src/androidTest/java/com/google/accompanist/permissions/TestUtils.kt +++ b/permissions/src/androidTest/java/com/google/accompanist/permissions/TestUtils.kt @@ -84,7 +84,7 @@ internal fun denyPermissionInDialog( else -> "Don’t allow" } val permissionButton = UiDevice.getInstance(instrumentation).findPermissionButton(text) - assert(permissionButton.clickForPermission(instrumentation)) { "Could not deny permission" } + permissionButton.clickForPermission(instrumentation) } internal fun doNotAskAgainPermissionInDialog(