A fully functional Android app built entirely with Kotlin and Jetpack Compose
Simplify String resource loading in NavigationTest.kt
Simon Marquis091abad348bc
diff --git a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.ktindex a37eb7a77..382bd9a46 100644--- a/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt+++ b/app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt@@ -16,12 +16,14 @@package com.google.samples.apps.nowinandroid.ui+import androidx.annotation.StringResimport androidx.compose.ui.test.assertCountEqualsimport androidx.compose.ui.test.assertIsOnimport androidx.compose.ui.test.assertIsSelectedimport androidx.compose.ui.test.hasAnyAncestorimport androidx.compose.ui.test.hasTestTagimport androidx.compose.ui.test.hasText+import androidx.compose.ui.test.junit4.AndroidComposeTestRuleimport androidx.compose.ui.test.junit4.createAndroidComposeRuleimport androidx.compose.ui.test.onAllNodesWithTextimport androidx.compose.ui.test.onNodeWithContentDescription@@ -34,10 +36,10 @@ import com.google.samples.apps.nowinandroid.Rimport dagger.hilt.android.testing.BindValueimport dagger.hilt.android.testing.HiltAndroidRuleimport dagger.hilt.android.testing.HiltAndroidTest-import org.junit.Beforeimport org.junit.Ruleimport org.junit.Testimport org.junit.rules.TemporaryFolder+import kotlin.properties.ReadOnlyPropertyimport com.google.samples.apps.nowinandroid.feature.bookmarks.R as BookmarksRimport com.google.samples.apps.nowinandroid.feature.foryou.R as FeatureForyouRimport com.google.samples.apps.nowinandroid.feature.interests.R as FeatureInterestsR@@ -69,35 +71,21 @@ class NavigationTest {@get:Rule(order = 2)val composeTestRule = createAndroidComposeRule<MainActivity>()- // The strings used for matching in these tests- private lateinit var done: String- private lateinit var navigateUp: String- private lateinit var forYouLoading: String- private lateinit var forYou: String- private lateinit var interests: String- private lateinit var sampleTopic: String- private lateinit var appName: String- private lateinit var saved: String- private lateinit var settings: String- private lateinit var brand: String- private lateinit var ok: String+ private fun AndroidComposeTestRule<*, *>.stringResource(@StringRes resId: Int) =+ ReadOnlyProperty<Any?, String> { _, _ -> activity.getString(resId) }- @Before- fun setup() {- composeTestRule.activity.apply {- done = getString(FeatureForyouR.string.done)- navigateUp = getString(FeatureForyouR.string.navigate_up)- forYouLoading = getString(FeatureForyouR.string.for_you_loading)- forYou = getString(FeatureForyouR.string.for_you)- interests = getString(FeatureInterestsR.string.interests)- sampleTopic = "Headlines"- appName = getString(R.string.app_name)- saved = getString(BookmarksR.string.saved)- settings = getString(SettingsR.string.top_app_bar_action_icon_description)- brand = getString(SettingsR.string.brand_android)- ok = getString(SettingsR.string.dismiss_dialog_button_text)- }- }+ // The strings used for matching in these tests+ private val done by composeTestRule.stringResource(FeatureForyouR.string.done)+ private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.navigate_up)+ private val forYouLoading by composeTestRule.stringResource(FeatureForyouR.string.for_you_loading)+ private val forYou by composeTestRule.stringResource(FeatureForyouR.string.for_you)+ private val interests by composeTestRule.stringResource(FeatureInterestsR.string.interests)+ private val sampleTopic = "Headlines"+ private val appName by composeTestRule.stringResource(R.string.app_name)+ private val saved by composeTestRule.stringResource(BookmarksR.string.saved)+ private val settings by composeTestRule.stringResource(SettingsR.string.top_app_bar_action_icon_description)+ private val brand by composeTestRule.stringResource(SettingsR.string.brand_android)+ private val ok by composeTestRule.stringResource(SettingsR.string.dismiss_dialog_button_text)@Testfun firstScreen_isForYou() {