Merge branch 'github/main'

.github/workflows/Build.yaml

@@ -89,6 +89,9 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
+      - name: Build AndroidTest apps
+        run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest --daemon
+
       - name: Run instrumentation tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
@@ -97,7 +100,7 @@ jobs:
           disable-animations: true
           disk-size: 6000M
           heap-size: 600M
-          script: ./gradlew connectedDemoDebugAndroidTest -x :benchmark:connectedDemoBenchmarkAndroidTest
+          script: ./gradlew connectedDemoDebugAndroidTest -x :benchmark:connectedDemoBenchmarkAndroidTest --daemon
 
       - name: Upload test reports
         if: always()

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.StringRes
 import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.assertIsOn
 import androidx.compose.ui.test.assertIsSelected
 import androidx.compose.ui.test.hasAnyAncestor
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onAllNodesWithText
 import androidx.compose.ui.test.onNodeWithContentDescription
@@ -34,10 +36,10 @@ import com.google.samples.apps.nowinandroid.R
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
+import kotlin.properties.ReadOnlyProperty
 import com.google.samples.apps.nowinandroid.feature.bookmarks.R as BookmarksR
 import com.google.samples.apps.nowinandroid.feature.foryou.R as FeatureForyouR
 import com.google.samples.apps.nowinandroid.feature.interests.R as FeatureInterestsR
@@ -69,35 +71,19 @@ class NavigationTest {
     @get:Rule(order = 2)
     val composeTestRule = createAndroidComposeRule<MainActivity>()
 
-    // The strings used for matching in these tests
+    private fun AndroidComposeTestRule<*, *>.stringResource(@StringRes resId: Int) =
-    private lateinit var done: String
+        ReadOnlyProperty<Any?, String> { _, _ -> activity.getString(resId) }
-    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
 
-    @Before
+    // The strings used for matching in these tests
-    fun setup() {
+    private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.navigate_up)
-        composeTestRule.activity.apply {
+    private val forYou by composeTestRule.stringResource(FeatureForyouR.string.for_you)
-            done = getString(FeatureForyouR.string.done)
+    private val interests by composeTestRule.stringResource(FeatureInterestsR.string.interests)
-            navigateUp = getString(FeatureForyouR.string.navigate_up)
+    private val sampleTopic = "Headlines"
-            forYouLoading = getString(FeatureForyouR.string.for_you_loading)
+    private val appName by composeTestRule.stringResource(R.string.app_name)
-            forYou = getString(FeatureForyouR.string.for_you)
+    private val saved by composeTestRule.stringResource(BookmarksR.string.saved)
-            interests = getString(FeatureInterestsR.string.interests)
+    private val settings by composeTestRule.stringResource(SettingsR.string.top_app_bar_action_icon_description)
-            sampleTopic = "Headlines"
+    private val brand by composeTestRule.stringResource(SettingsR.string.brand_android)
-            appName = getString(R.string.app_name)
+    private val ok by composeTestRule.stringResource(SettingsR.string.dismiss_dialog_button_text)
-            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)
-        }
-    }
 
     @Test
     fun firstScreen_isForYou() {