diff --git a/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsStreamUseCaseTest.kt b/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsStreamUseCaseTest.kt index 9f11a0b33..e30dfdaca 100644 --- a/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsStreamUseCaseTest.kt +++ b/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsStreamUseCaseTest.kt @@ -18,11 +18,10 @@ package com.google.samples.apps.nowinandroid.core.domain import com.google.samples.apps.nowinandroid.core.domain.TopicSortField.NAME import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeTopic +import com.google.samples.apps.nowinandroid.core.model.data.fakeTopic import com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule -import kotlin.random.Random import kotlin.test.assertEquals import kotlinx.coroutines.flow.first import kotlinx.coroutines.test.runTest @@ -88,7 +87,7 @@ class GetFollowableTopicsStreamUseCaseTest { } private val testTopics = listOf( - Random.nextFakeTopic(id = "1", name = "Headlines"), - Random.nextFakeTopic(id = "2", name = "Android Studio"), - Random.nextFakeTopic(id = "3", name = "Compose"), + fakeTopic(id = "1", name = "Headlines"), + fakeTopic(id = "2", name = "Android Studio"), + fakeTopic(id = "3", name = "Compose"), ) diff --git a/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetSaveableNewsResourcesStreamUseCaseTest.kt b/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetSaveableNewsResourcesStreamUseCaseTest.kt index cbe17f7c4..e5e4a604a 100644 --- a/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetSaveableNewsResourcesStreamUseCaseTest.kt +++ b/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetSaveableNewsResourcesStreamUseCaseTest.kt @@ -17,13 +17,12 @@ package com.google.samples.apps.nowinandroid.core.domain import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeAuthor -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeNewsResource -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeTopic +import com.google.samples.apps.nowinandroid.core.model.data.fakeAuthor +import com.google.samples.apps.nowinandroid.core.model.data.fakeNewsResource +import com.google.samples.apps.nowinandroid.core.model.data.fakeTopic import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule -import kotlin.random.Random import kotlin.test.assertEquals import kotlinx.coroutines.flow.first import kotlinx.coroutines.test.runTest @@ -124,23 +123,23 @@ class GetSaveableNewsResourcesStreamUseCaseTest { } } -private val sampleTopic1 = Random.nextFakeTopic(id = "1", name = "Headlines") -private val sampleTopic2 = Random.nextFakeTopic(id = "2", name = "UI") -private val sampleAuthor1 = Random.nextFakeAuthor(id = "1") -private val sampleAuthor2 = Random.nextFakeAuthor(id = "2") +private val sampleTopic1 = fakeTopic(id = "1", name = "Headlines") +private val sampleTopic2 = fakeTopic(id = "2", name = "UI") +private val sampleAuthor1 = fakeAuthor(id = "1") +private val sampleAuthor2 = fakeAuthor(id = "2") private val sampleNewsResources = listOf( - Random.nextFakeNewsResource( + fakeNewsResource( id = "1", authors = listOf(sampleAuthor1), topics = listOf(sampleTopic1) ), - Random.nextFakeNewsResource( + fakeNewsResource( id = "2", authors = listOf(sampleAuthor1), topics = listOf(sampleTopic1, sampleTopic2) ), - Random.nextFakeNewsResource( + fakeNewsResource( id = "3", authors = listOf(sampleAuthor2), topics = listOf(sampleTopic2) diff --git a/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetSortedFollowableAuthorsStreamUseCaseTest.kt b/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetSortedFollowableAuthorsStreamUseCaseTest.kt index ef8e66e90..7ee7498ba 100644 --- a/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetSortedFollowableAuthorsStreamUseCaseTest.kt +++ b/core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetSortedFollowableAuthorsStreamUseCaseTest.kt @@ -17,11 +17,10 @@ package com.google.samples.apps.nowinandroid.core.domain import com.google.samples.apps.nowinandroid.core.domain.model.FollowableAuthor -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeAuthor +import com.google.samples.apps.nowinandroid.core.model.data.fakeAuthor import com.google.samples.apps.nowinandroid.core.testing.repository.TestAuthorsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule -import kotlin.random.Random import kotlin.test.assertEquals import kotlinx.coroutines.flow.first import kotlinx.coroutines.test.runTest @@ -65,8 +64,8 @@ class GetSortedFollowableAuthorsStreamUseCaseTest { } } -private val sampleAuthor1 = Random.nextFakeAuthor(id = "1", name = "Mandy") -private val sampleAuthor2 = Random.nextFakeAuthor(id = "2", name = "Andy") -private val sampleAuthor3 = Random.nextFakeAuthor(id = "3", name = "Sandy") +private val sampleAuthor1 = fakeAuthor(id = "1", name = "Mandy") +private val sampleAuthor2 = fakeAuthor(id = "2", name = "Andy") +private val sampleAuthor3 = fakeAuthor(id = "3", name = "Sandy") private val sampleAuthors = listOf(sampleAuthor1, sampleAuthor2, sampleAuthor3) diff --git a/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/AuthorFixtures.kt b/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/AuthorFixtures.kt index 8a9bd80e1..a97efc149 100644 --- a/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/AuthorFixtures.kt +++ b/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/AuthorFixtures.kt @@ -16,10 +16,8 @@ package com.google.samples.apps.nowinandroid.core.model.data -import kotlin.random.Random - -fun Random.nextFakeAuthor( - id: String = nextLong().toString(), +fun fakeAuthor( + id: String, name: String = "Android Dev $id", imageUrl: String = "https://example.org/dev-android/$id.png", twitter: String = "@dev-android-$id", diff --git a/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/NewsResourceFixtures.kt b/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/NewsResourceFixtures.kt index 768b47fe2..67cf8516c 100644 --- a/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/NewsResourceFixtures.kt +++ b/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/NewsResourceFixtures.kt @@ -17,11 +17,10 @@ package com.google.samples.apps.nowinandroid.core.model.data import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Unknown -import kotlin.random.Random import kotlinx.datetime.Instant -fun Random.nextFakeNewsResource( - id: String = nextLong().toString(), +fun fakeNewsResource( + id: String, title: String = "News resource $id", content: String = "", url: String = "https://example.org/news/$id", diff --git a/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/TopicFixtures.kt b/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/TopicFixtures.kt index 0428a493d..06f13a007 100644 --- a/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/TopicFixtures.kt +++ b/core/model/src/testFixtures/kotlin/com/google/samples/apps/nowinandroid/core/model/data/TopicFixtures.kt @@ -16,10 +16,8 @@ package com.google.samples.apps.nowinandroid.core.model.data -import kotlin.random.Random - -fun Random.nextFakeTopic( - id: String = nextLong().toString(), +fun fakeTopic( + id: String, name: String = "Topic $id", shortDescription: String = "At vero eos et accusamus.", longDescription: String = "At vero eos et accusamus et iusto odio dignissimos ducimus qui.", diff --git a/feature/author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt b/feature/author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt index b2b65c2c5..527bfbefc 100644 --- a/feature/author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt +++ b/feature/author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt @@ -22,9 +22,8 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import com.google.samples.apps.nowinandroid.core.domain.model.FollowableAuthor import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeAuthor -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeNewsResource -import kotlin.random.Random +import com.google.samples.apps.nowinandroid.core.model.data.fakeAuthor +import com.google.samples.apps.nowinandroid.core.model.data.fakeNewsResource import org.junit.Before import org.junit.Rule import org.junit.Test @@ -142,11 +141,11 @@ class AuthorScreenTest { } private val testAuthors = listOf( - FollowableAuthor(Random.nextFakeAuthor(id = "1"), isFollowed = true), - FollowableAuthor(Random.nextFakeAuthor(id = "2"), isFollowed = false), - FollowableAuthor(Random.nextFakeAuthor(id = "3"), isFollowed = false), + FollowableAuthor(fakeAuthor(id = "1"), isFollowed = true), + FollowableAuthor(fakeAuthor(id = "2"), isFollowed = false), + FollowableAuthor(fakeAuthor(id = "3"), isFollowed = false), ) private val sampleNewsResources = listOf( - Random.nextFakeNewsResource(id = "1", authors = listOf(testAuthors.first().author)), + fakeNewsResource(id = "1", authors = listOf(testAuthors.first().author)), ) diff --git a/feature/author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt b/feature/author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt index 69b00750a..26e59a1cf 100644 --- a/feature/author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt +++ b/feature/author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt @@ -19,15 +19,14 @@ package com.google.samples.apps.nowinandroid.feature.author import androidx.lifecycle.SavedStateHandle import com.google.samples.apps.nowinandroid.core.domain.GetSaveableNewsResourcesStreamUseCase import com.google.samples.apps.nowinandroid.core.domain.model.FollowableAuthor -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeAuthor -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeNewsResource +import com.google.samples.apps.nowinandroid.core.model.data.fakeAuthor +import com.google.samples.apps.nowinandroid.core.model.data.fakeNewsResource import com.google.samples.apps.nowinandroid.core.testing.decoder.FakeStringDecoder import com.google.samples.apps.nowinandroid.core.testing.repository.TestAuthorsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule import com.google.samples.apps.nowinandroid.feature.author.navigation.authorIdArg -import kotlin.random.Random import kotlin.test.assertEquals import kotlin.test.assertIs import kotlin.test.assertTrue @@ -208,9 +207,9 @@ class AuthorViewModelTest { } private val testInputAuthors = listOf( - FollowableAuthor(Random.nextFakeAuthor(id = "1"), isFollowed = true), - FollowableAuthor(Random.nextFakeAuthor(id = "2"), isFollowed = false), - FollowableAuthor(Random.nextFakeAuthor(id = "3"), isFollowed = false), + FollowableAuthor(fakeAuthor(id = "1"), isFollowed = true), + FollowableAuthor(fakeAuthor(id = "2"), isFollowed = false), + FollowableAuthor(fakeAuthor(id = "3"), isFollowed = false), ) private val testOutputAuthors = listOf( @@ -220,5 +219,5 @@ private val testOutputAuthors = listOf( ) private val sampleNewsResources = listOf( - Random.nextFakeNewsResource(id = "1", authors = listOf(testInputAuthors[0].author)), + fakeNewsResource(id = "1", authors = listOf(testInputAuthors[0].author)), ) diff --git a/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt b/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt index fb39fef3e..991821d03 100644 --- a/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt +++ b/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt @@ -31,11 +31,10 @@ import androidx.compose.ui.test.performScrollToNode import com.google.samples.apps.nowinandroid.core.domain.model.FollowableAuthor import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeAuthor -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeTopic +import com.google.samples.apps.nowinandroid.core.model.data.fakeAuthor +import com.google.samples.apps.nowinandroid.core.model.data.fakeTopic import com.google.samples.apps.nowinandroid.core.model.data.previewNewsResources import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState -import kotlin.random.Random import org.junit.Rule import org.junit.Test @@ -342,11 +341,11 @@ class ForYouScreenTest { } } -private val testAuthor = Random.nextFakeAuthor() +private val testAuthor = fakeAuthor(id = "0") private val testTopics = listOf( - FollowableTopic(topic = Random.nextFakeTopic(id = "1", name = "Headlines"), isFollowed = false), - FollowableTopic(topic = Random.nextFakeTopic(id = "2", name = "UI"), isFollowed = false), - FollowableTopic(topic = Random.nextFakeTopic(id = "3", name = "Tools"), isFollowed = false), + FollowableTopic(topic = fakeTopic(id = "1", name = "Headlines"), isFollowed = false), + FollowableTopic(topic = fakeTopic(id = "2", name = "UI"), isFollowed = false), + FollowableTopic(topic = fakeTopic(id = "3", name = "Tools"), isFollowed = false), ) private val testAuthors = listOf( FollowableAuthor(author = testAuthor.copy(id = "1", name = "Android Dev"), isFollowed = false), diff --git a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt index e8a71be49..c6c870a23 100644 --- a/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt +++ b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt @@ -22,9 +22,9 @@ import com.google.samples.apps.nowinandroid.core.domain.GetSortedFollowableAutho import com.google.samples.apps.nowinandroid.core.domain.model.FollowableAuthor import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeAuthor -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeNewsResource -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeTopic +import com.google.samples.apps.nowinandroid.core.model.data.fakeAuthor +import com.google.samples.apps.nowinandroid.core.model.data.fakeNewsResource +import com.google.samples.apps.nowinandroid.core.model.data.fakeTopic import com.google.samples.apps.nowinandroid.core.testing.repository.TestAuthorsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsRepository @@ -33,7 +33,6 @@ import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule import com.google.samples.apps.nowinandroid.core.testing.util.TestNetworkMonitor import com.google.samples.apps.nowinandroid.core.testing.util.TestSyncStatusMonitor import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState -import kotlin.random.Random import kotlin.test.assertEquals import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch @@ -466,29 +465,29 @@ class ForYouViewModelTest { } private val sampleAuthors = listOf( - Random.nextFakeAuthor(id = "1"), - Random.nextFakeAuthor(id = "2"), - Random.nextFakeAuthor(id = "3"), + fakeAuthor(id = "1"), + fakeAuthor(id = "2"), + fakeAuthor(id = "3"), ) private val sampleTopics = listOf( - Random.nextFakeTopic(id = "1", name = "Headlines"), - Random.nextFakeTopic(id = "2", name = "UI"), - Random.nextFakeTopic(id = "3", name = "Tools"), + fakeTopic(id = "1", name = "Headlines"), + fakeTopic(id = "2", name = "UI"), + fakeTopic(id = "3", name = "Tools"), ) private val sampleNewsResources = listOf( - Random.nextFakeNewsResource( + fakeNewsResource( id = "1", authors = listOf(sampleAuthors[0]), topics = listOf(sampleTopics[0]) ), - Random.nextFakeNewsResource( + fakeNewsResource( id = "2", authors = listOf(sampleAuthors[1]), topics = listOf(sampleTopics[1]) ), - Random.nextFakeNewsResource( + fakeNewsResource( id = "3", authors = listOf(sampleAuthors[1]), topics = listOf(sampleTopics[1]) diff --git a/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt b/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt index c98ab318b..ce3bd076d 100644 --- a/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt +++ b/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt @@ -27,13 +27,12 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import com.google.samples.apps.nowinandroid.core.domain.model.FollowableAuthor import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeAuthor -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeTopic +import com.google.samples.apps.nowinandroid.core.model.data.fakeAuthor +import com.google.samples.apps.nowinandroid.core.model.data.fakeTopic import com.google.samples.apps.nowinandroid.feature.interests.InterestsScreen import com.google.samples.apps.nowinandroid.feature.interests.InterestsTabState import com.google.samples.apps.nowinandroid.feature.interests.InterestsUiState import com.google.samples.apps.nowinandroid.feature.interests.R -import kotlin.random.Random import org.junit.Before import org.junit.Rule import org.junit.Test @@ -187,24 +186,15 @@ class InterestsScreenTest { } private const val TOPIC_SHORT_DESC = "At vero eos et accusamus." private val testTopics = listOf( - FollowableTopic( - Random.nextFakeTopic(id = "1", shortDescription = TOPIC_SHORT_DESC), - isFollowed = true - ), - FollowableTopic( - Random.nextFakeTopic(id = "2", shortDescription = TOPIC_SHORT_DESC), - isFollowed = false - ), - FollowableTopic( - Random.nextFakeTopic(id = "3", shortDescription = TOPIC_SHORT_DESC), - isFollowed = false - ) + FollowableTopic(fakeTopic(id = "1", shortDescription = TOPIC_SHORT_DESC), isFollowed = true), + FollowableTopic(fakeTopic(id = "2", shortDescription = TOPIC_SHORT_DESC), isFollowed = false), + FollowableTopic(fakeTopic(id = "3", shortDescription = TOPIC_SHORT_DESC), isFollowed = false) ) private val testAuthors = listOf( - FollowableAuthor(Random.nextFakeAuthor(id = "1", name = "Android Dev"), isFollowed = true), - FollowableAuthor(Random.nextFakeAuthor(id = "2", name = "Android Dev 2"), isFollowed = false), - FollowableAuthor(Random.nextFakeAuthor(id = "3", name = "Android Dev 3"), isFollowed = false), + FollowableAuthor(fakeAuthor(id = "1", name = "Android Dev"), isFollowed = true), + FollowableAuthor(fakeAuthor(id = "2", name = "Android Dev 2"), isFollowed = false), + FollowableAuthor(fakeAuthor(id = "3", name = "Android Dev 3"), isFollowed = false), ) private val numberOfUnfollowedTopics = testTopics.filter { !it.isFollowed }.size diff --git a/feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt b/feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt index adb569979..a05b32d4a 100644 --- a/feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt +++ b/feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt @@ -20,15 +20,14 @@ import com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsStrea import com.google.samples.apps.nowinandroid.core.domain.GetSortedFollowableAuthorsStreamUseCase import com.google.samples.apps.nowinandroid.core.domain.model.FollowableAuthor import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeAuthor -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeTopic +import com.google.samples.apps.nowinandroid.core.model.data.fakeAuthor +import com.google.samples.apps.nowinandroid.core.model.data.fakeTopic import com.google.samples.apps.nowinandroid.core.testing.repository.TestAuthorsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule import com.google.samples.apps.nowinandroid.feature.interests.InterestsUiState import com.google.samples.apps.nowinandroid.feature.interests.InterestsViewModel -import kotlin.random.Random import kotlin.test.assertEquals import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch @@ -206,25 +205,25 @@ class InterestsViewModelTest { } private val testInputAuthors = listOf( - FollowableAuthor(author = Random.nextFakeAuthor(id = "1"), isFollowed = true), - FollowableAuthor(author = Random.nextFakeAuthor(id = "2"), isFollowed = false), - FollowableAuthor(author = Random.nextFakeAuthor(id = "3"), isFollowed = false), + FollowableAuthor(author = fakeAuthor(id = "1"), isFollowed = true), + FollowableAuthor(author = fakeAuthor(id = "2"), isFollowed = false), + FollowableAuthor(author = fakeAuthor(id = "3"), isFollowed = false), ) private val testOutputAuthors = listOf( - FollowableAuthor(author = Random.nextFakeAuthor(id = "1"), isFollowed = true), - FollowableAuthor(author = Random.nextFakeAuthor(id = "2"), isFollowed = true), - FollowableAuthor(author = Random.nextFakeAuthor(id = "3"), isFollowed = false), + FollowableAuthor(author = fakeAuthor(id = "1"), isFollowed = true), + FollowableAuthor(author = fakeAuthor(id = "2"), isFollowed = true), + FollowableAuthor(author = fakeAuthor(id = "3"), isFollowed = false), ) private val testInputTopics = listOf( - FollowableTopic(Random.nextFakeTopic(id = "1"), isFollowed = true), - FollowableTopic(Random.nextFakeTopic(id = "2"), isFollowed = false), - FollowableTopic(Random.nextFakeTopic(id = "3"), isFollowed = false), + FollowableTopic(fakeTopic(id = "1"), isFollowed = true), + FollowableTopic(fakeTopic(id = "2"), isFollowed = false), + FollowableTopic(fakeTopic(id = "3"), isFollowed = false), ) private val testOutputTopics = listOf( - FollowableTopic(Random.nextFakeTopic(id = "1"), isFollowed = true), - FollowableTopic(Random.nextFakeTopic(id = "2"), isFollowed = true), - FollowableTopic(Random.nextFakeTopic(id = "3"), isFollowed = false), + FollowableTopic(fakeTopic(id = "1"), isFollowed = true), + FollowableTopic(fakeTopic(id = "2"), isFollowed = true), + FollowableTopic(fakeTopic(id = "3"), isFollowed = false), ) diff --git a/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt b/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt index 3786a74db..3685fe93b 100644 --- a/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt +++ b/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt @@ -26,9 +26,8 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performScrollToNode import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeNewsResource -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeTopic -import kotlin.random.Random +import com.google.samples.apps.nowinandroid.core.model.data.fakeNewsResource +import com.google.samples.apps.nowinandroid.core.model.data.fakeTopic import org.junit.Before import org.junit.Rule import org.junit.Test @@ -147,9 +146,9 @@ class TopicScreenTest { } private val testTopics = listOf( - FollowableTopic(Random.nextFakeTopic(id = "1", name = "Headlines"), isFollowed = true), - FollowableTopic(Random.nextFakeTopic(id = "2", name = "UI"), isFollowed = false), - FollowableTopic(Random.nextFakeTopic(id = "3", name = "Tools"), isFollowed = false), + FollowableTopic(fakeTopic(id = "1", name = "Headlines"), isFollowed = true), + FollowableTopic(fakeTopic(id = "2", name = "UI"), isFollowed = false), + FollowableTopic(fakeTopic(id = "3", name = "Tools"), isFollowed = false), ) -private val sampleNewsResources = listOf(Random.nextFakeNewsResource()) +private val sampleNewsResources = listOf(fakeNewsResource(id = "0")) diff --git a/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt b/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt index b9ef93012..693823ca7 100644 --- a/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt +++ b/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt @@ -19,15 +19,14 @@ package com.google.samples.apps.nowinandroid.feature.topic import androidx.lifecycle.SavedStateHandle import com.google.samples.apps.nowinandroid.core.domain.GetSaveableNewsResourcesStreamUseCase import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeNewsResource -import com.google.samples.apps.nowinandroid.core.model.data.nextFakeTopic +import com.google.samples.apps.nowinandroid.core.model.data.fakeNewsResource +import com.google.samples.apps.nowinandroid.core.model.data.fakeTopic import com.google.samples.apps.nowinandroid.core.testing.decoder.FakeStringDecoder import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsRepository import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicIdArg -import kotlin.random.Random import kotlin.test.assertEquals import kotlin.test.assertIs import kotlinx.coroutines.flow.collect @@ -165,9 +164,9 @@ class TopicViewModelTest { } private val testInputTopics = listOf( - FollowableTopic(Random.nextFakeTopic(id = "1", name = "Android Studio"), isFollowed = true), - FollowableTopic(Random.nextFakeTopic(id = "2", name = "Build"), isFollowed = false), - FollowableTopic(Random.nextFakeTopic(id = "3", name = "Compose"), isFollowed = false), + FollowableTopic(fakeTopic(id = "1", name = "Android Studio"), isFollowed = true), + FollowableTopic(fakeTopic(id = "2", name = "Build"), isFollowed = false), + FollowableTopic(fakeTopic(id = "3", name = "Compose"), isFollowed = false), ) private val testOutputTopics = listOf( @@ -177,5 +176,5 @@ private val testOutputTopics = listOf( ) private val sampleNewsResources = listOf( - Random.nextFakeNewsResource(id = "1", topics = listOf(testInputTopics[0].topic)), + fakeNewsResource(id = "1", topics = listOf(testInputTopics[0].topic)), )