Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Permissions] Fix tests not working on new emulator targets #1312

Merged
merged 3 commits into from Aug 31, 2022
Merged

[Permissions] Fix tests not working on new emulator targets #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3397a90
Revert "Mark permissions as ignore"
bentrengrove Aug 26, 2022
5df6acf
Upgrade permissions tests to work on API30+
bentrengrove Aug 26, 2022
3f3af30
Remove assert as it doesn't always work
bentrengrove Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...c/androidTest/java/com/google/accompanist/permissions/MultipleAndSinglePermissionsTest.kt
View file
Open in desktop
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions ...s/src/androidTest/java/com/google/accompanist/permissions/MultiplePermissionsStateTest.kt
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions permissions/src/androidTest/java/com/google/accompanist/permissions/PermissionStateTest.kt
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
4 changes: 0 additions & 4 deletions ...src/androidTest/java/com/google/accompanist/permissions/RequestMultiplePermissionsTest.kt
View file
Open in desktop
Expand Up @@ -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 {
Expand Down Expand Up @@ -89,7 +86,6 @@ class RequestMultiplePermissionsTest {
composeTestRule.onNodeWithText("No permission").assertIsDisplayed()
}

@OptIn(ExperimentalCoroutinesApi::class)
@Test
fun permissionTest_grantInTheBackground() {
composeTestRule.onNodeWithText("No permission").assertIsDisplayed()
Expand Down
2 changes: 0 additions & 2 deletions permissions/src/androidTest/java/com/google/accompanist/permissions/RequestPermissionTest.kt
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
15 changes: 8 additions & 7 deletions permissions/src/androidTest/java/com/google/accompanist/permissions/TestUtils.kt
View file
Open in desktop
Expand Up @@ -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 -> {
Expand Down