Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reduce flaky of whenCanDisplayLocalUi_displayed"

Browse Source
This commit is contained in:
Chaohui Wang
2022-12-07 06:14:48 +00:00
committed by Android (Google) Code Review
parent 09d471132d b4a8e4b314
commit 513827c5d5
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppLocalePreferenceTest.kt
View File

@@ -22,11 +22,9 @@ import android.content.pm.ApplicationInfo
import android.content.pm.PackageManager import android.content.pm.PackageManager
import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsNotDisplayed import androidx.compose.ui.test.assertIsNotDisplayed
import androidx.compose.ui.test.hasText import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.onRoot import androidx.compose.ui.test.onRoot
import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performClick
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
@@ -47,7 +45,6 @@ import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mockito.ArgumentCaptor import org.mockito.ArgumentCaptor
import org.mockito.ArgumentMatchers
import org.mockito.Mock import org.mockito.Mock
import org.mockito.Mockito.any import org.mockito.Mockito.any
import org.mockito.Mockito.doNothing import org.mockito.Mockito.doNothing
@@ -80,9 +77,8 @@ class AppLocalePreferenceTest {
.strictness(Strictness.LENIENT) .strictness(Strictness.LENIENT)
.startMocking() .startMocking()
whenever(context.packageManager).thenReturn(packageManager) whenever(context.packageManager).thenReturn(packageManager)
whenever(AppLocaleUtil.canDisplayLocaleUi(any(), ArgumentMatchers.eq(APP), any())) whenever(AppLocaleUtil.canDisplayLocaleUi(any(), eq(APP), any())).thenReturn(true)
.thenReturn(true) whenever(AppLocaleDetails.getSummary(any(), eq(APP))).thenReturn(SUMMARY)
whenever(AppLocaleDetails.getSummary(any(), ArgumentMatchers.eq(APP))).thenReturn(SUMMARY)
} }
@After @After
@@ -92,8 +88,7 @@ class AppLocalePreferenceTest {
@Test @Test
fun whenCanNotDisplayLocalUi_notDisplayed() { fun whenCanNotDisplayLocalUi_notDisplayed() {
whenever(AppLocaleUtil.canDisplayLocaleUi(any(), ArgumentMatchers.eq(APP), any())) whenever(AppLocaleUtil.canDisplayLocaleUi(any(), eq(APP), any())).thenReturn(false)
.thenReturn(false)
setContent() setContent()
@@ -104,8 +99,9 @@ class AppLocalePreferenceTest {
fun whenCanDisplayLocalUi_displayed() { fun whenCanDisplayLocalUi_displayed() {
setContent() setContent()
composeTestRule.onNodeWithText(context.getString(R.string.app_locale_preference_title)) composeTestRule.waitUntilExists(
.assertIsDisplayed() hasText(context.getString(R.string.app_locale_preference_title))
)
composeTestRule.waitUntilExists(hasText(SUMMARY)) composeTestRule.waitUntilExists(hasText(SUMMARY))
} }