From b0b13d07bcfd527438f2d4e97e52f305540df592 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Fri, 28 Jul 2023 18:21:04 +0200 Subject: [PATCH] Replace NiaNetworkDataSource with TopicsRepository to be closer to the actual source of data used by the instrumented app. --- .../samples/apps/nowinandroid/ui/NavigationTest.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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.kt index 1979624e9..e1eab4796 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 @@ -35,12 +35,13 @@ import androidx.test.espresso.Espresso import androidx.test.espresso.NoActivityResumedException import com.google.samples.apps.nowinandroid.MainActivity import com.google.samples.apps.nowinandroid.R -import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource -import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic +import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository +import com.google.samples.apps.nowinandroid.core.model.data.Topic import com.google.samples.apps.nowinandroid.core.rules.GrantPostNotificationsPermissionRule import dagger.hilt.android.testing.BindValue import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest +import kotlinx.coroutines.flow.first import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Rule @@ -86,7 +87,7 @@ class NavigationTest { val composeTestRule = createAndroidComposeRule() @Inject - lateinit var datasource: NiaNetworkDataSource + lateinit var topicsRepository: TopicsRepository private fun AndroidComposeTestRule<*, *>.stringResource(@StringRes resId: Int) = ReadOnlyProperty { _, _ -> activity.getString(resId) } @@ -269,7 +270,7 @@ class NavigationTest { onNodeWithText(interests).performClick() // Select the last topic - val topic = datasource.getTopics().sortedBy(NetworkTopic::name).last().name + val topic = topicsRepository.getTopics().first().sortedBy(Topic::name).last().name onNodeWithTag("interests:topics").performScrollToNode(hasText(topic)) onNodeWithText(topic).performClick()