PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reduce flaky of AppStoragePreferenceTest"

Browse Source
This commit is contained in:
Chaohui Wang
2022-11-29 04:10:00 +00:00
committed by Android (Google) Code Review
parent 2ca0fb13a3 a43b2b5df4
commit 1b9e346fa9
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppStoragePreferenceTest.kt
View File

@@ -24,12 +24,14 @@ 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.assertIsDisplayed
import androidx.compose.ui.test.assertIsNotDisplayed import androidx.compose.ui.test.assertIsNotDisplayed
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.onNodeWithText
import androidx.compose.ui.test.onRoot import androidx.compose.ui.test.onRoot
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.R import com.android.settings.R
import com.android.settingslib.spa.testutils.waitUntilExists
import com.android.settingslib.spaprivileged.framework.common.storageStatsManager import com.android.settingslib.spaprivileged.framework.common.storageStatsManager
import java.util.UUID import java.util.UUID
import org.junit.Before import org.junit.Before
@@ -70,11 +72,7 @@ class AppStoragePreferenceTest {
fun notInstalledApp_notDisplayed() { fun notInstalledApp_notDisplayed() {
val notInstalledApp = ApplicationInfo() val notInstalledApp = ApplicationInfo()
composeTestRule.setContent { setContent(notInstalledApp)
CompositionLocalProvider(LocalContext provides context) {
AppStoragePreference(notInstalledApp)
}
}
composeTestRule.onRoot().assertIsNotDisplayed() composeTestRule.onRoot().assertIsNotDisplayed()
} }
@@ -87,15 +85,11 @@ class AppStoragePreferenceTest {
storageUuid = STORAGE_UUID storageUuid = STORAGE_UUID
} }
composeTestRule.setContent { setContent(internalApp)
CompositionLocalProvider(LocalContext provides context) {
AppStoragePreference(internalApp)
}
}
composeTestRule.onNodeWithText(context.getString(R.string.storage_settings_for_app)) composeTestRule.onNodeWithText(context.getString(R.string.storage_settings_for_app))
.assertIsDisplayed() .assertIsDisplayed()
composeTestRule.onNodeWithText("123 B used in internal storage").assertIsDisplayed() composeTestRule.waitUntilExists(hasText("123 B used in internal storage"))
} }
@Test @Test
@@ -106,15 +100,19 @@ class AppStoragePreferenceTest {
storageUuid = STORAGE_UUID storageUuid = STORAGE_UUID
} }
composeTestRule.setContent { setContent(externalApp)
CompositionLocalProvider(LocalContext provides context) {
AppStoragePreference(externalApp)
}
}
composeTestRule.onNodeWithText(context.getString(R.string.storage_settings_for_app)) composeTestRule.onNodeWithText(context.getString(R.string.storage_settings_for_app))
.assertIsDisplayed() .assertIsDisplayed()
composeTestRule.onNodeWithText("123 B used in external storage").assertIsDisplayed() composeTestRule.waitUntilExists(hasText("123 B used in external storage"))
}
private fun setContent(app: ApplicationInfo) {
composeTestRule.setContent {
CompositionLocalProvider(LocalContext provides context) {
AppStoragePreference(app)
}
}
} }
companion object { companion object {