Migrate to testFixtures, closes #451

core/data/build.gradle.kts

@@ -44,4 +44,6 @@ dependencies {
     implementation(libs.kotlinx.datetime)
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)
+
+    testImplementation(testFixtures(project(":core:model")))
 }

core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt

@@ -16,10 +16,8 @@
 
 package com.google.samples.apps.nowinandroid.core.database.model
 
-import com.google.samples.apps.nowinandroid.core.model.data.Author
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video
-import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import kotlin.test.assertEquals
 import kotlinx.datetime.Instant
 import org.junit.Test
@@ -58,39 +56,20 @@ class PopulatedNewsResourceKtTest {
                 )
             ),
         )
-        val newsResource = populatedNewsResource.asExternalModel()
 
         assertEquals(
             NewsResource(
-                id = "1",
-                title = "news",
-                content = "Hilt",
-                url = "url",
-                headerImageUrl = "headerImageUrl",
-                type = Video,
-                publishDate = Instant.fromEpochMilliseconds(1),
-                authors = listOf(
-                    Author(
-                        id = "2",
-                        name = "name",
-                        imageUrl = "imageUrl",
-                        twitter = "twitter",
-                        mediumPage = "mediumPage",
-                        bio = "bio",
-                    )
-                ),
-                topics = listOf(
-                    Topic(
-                        id = "3",
-                        name = "name",
-                        shortDescription = "short description",
-                        longDescription = "long description",
-                        url = "URL",
-                        imageUrl = "image URL",
-                    )
-                )
+                id = populatedNewsResource.entity.id,
+                title = populatedNewsResource.entity.title,
+                content = populatedNewsResource.entity.content,
+                url = populatedNewsResource.entity.url,
+                headerImageUrl = populatedNewsResource.entity.headerImageUrl,
+                publishDate = populatedNewsResource.entity.publishDate,
+                type = populatedNewsResource.entity.type,
+                authors = populatedNewsResource.authors.map(AuthorEntity::asExternalModel),
+                topics = populatedNewsResource.topics.map(TopicEntity::asExternalModel),
             ),
-            newsResource
+            populatedNewsResource.asExternalModel()
         )
     }
 }

core/domain/build.gradle.kts

@@ -31,4 +31,6 @@ dependencies {
 
     implementation(libs.hilt.android)
     kapt(libs.hilt.compiler)
+
+    testImplementation(testFixtures(project(":core:model")))
 }

core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsStreamUseCaseTest.kt

@@ -18,10 +18,11 @@ 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.Topic
+import com.google.samples.apps.nowinandroid.core.model.data.nextFakeTopic
 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
@@ -87,7 +88,7 @@ class GetFollowableTopicsStreamUseCaseTest {
 }
 
 private val testTopics = listOf(
-    Topic("1", "Headlines", "", "", "", ""),
-    Topic("2", "Android Studio", "", "", "", ""),
-    Topic("3", "Compose", "", "", "", ""),
+    Random.nextFakeTopic(id = "1", name = "Headlines"),
+    Random.nextFakeTopic(id = "2", name = "Android Studio"),
+    Random.nextFakeTopic(id = "3", name = "Compose"),
 )

core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetSaveableNewsResourcesStreamUseCaseTest.kt

@@ -17,17 +17,16 @@
 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.Author
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video
-import com.google.samples.apps.nowinandroid.core.model.data.Topic
+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.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
-import kotlinx.datetime.Instant
 import org.junit.Rule
 import org.junit.Test
 
@@ -125,81 +124,25 @@ class GetSaveableNewsResourcesStreamUseCaseTest {
     }
 }
 
-private val sampleTopic1 = Topic(
-    id = "Topic1",
-    name = "Headlines",
-    shortDescription = "",
-    longDescription = "long description",
-    url = "URL",
-    imageUrl = "image URL",
-)
-
-private val sampleTopic2 = Topic(
-    id = "Topic2",
-    name = "UI",
-    shortDescription = "",
-    longDescription = "long description",
-    url = "URL",
-    imageUrl = "image URL",
-)
-
-private val sampleAuthor1 =
-    Author(
-        id = "Author1",
-        name = "Android Dev",
-        imageUrl = "",
-        twitter = "",
-        mediumPage = "",
-        bio = "",
-    )
-
-private val sampleAuthor2 =
-    Author(
-        id = "Author2",
-        name = "Android Dev",
-        imageUrl = "",
-        twitter = "",
-        mediumPage = "",
-        bio = "",
-    )
+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 sampleNewsResources = listOf(
-    NewsResource(
+    Random.nextFakeNewsResource(
         id = "1",
-        title = "Thanks for helping us reach 1M YouTube Subscribers",
-        content = "Thank you everyone for following the Now in Android series and everything the " +
-            "Android Developers YouTube channel has to offer. During the Android Developer " +
-            "Summit, our YouTube channel reached 1 million subscribers! Here’s a small video to " +
-            "thank you all.",
-        url = "https://youtu.be/-fJ6poHQrjM",
-        headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
-        publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
-        type = Video,
-        topics = listOf(sampleTopic1),
-        authors = listOf(sampleAuthor1)
+        authors = listOf(sampleAuthor1),
+        topics = listOf(sampleTopic1)
     ),
-    NewsResource(
+    Random.nextFakeNewsResource(
         id = "2",
-        title = "Transformations and customisations in the Paging Library",
-        content = "A demonstration of different operations that can be performed with Paging. " +
-            "Transformations like inserting separators, when to create a new pager, and " +
-            "customisation options for consuming PagingData.",
-        url = "https://youtu.be/ZARz0pjm5YM",
-        headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",
-        publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),
-        type = Video,
-        topics = listOf(sampleTopic1, sampleTopic2),
-        authors = listOf(sampleAuthor1)
+        authors = listOf(sampleAuthor1),
+        topics = listOf(sampleTopic1, sampleTopic2)
     ),
-    NewsResource(
+    Random.nextFakeNewsResource(
         id = "3",
-        title = "Community tip on Paging",
-        content = "Tips for using the Paging library from the developer community",
-        url = "https://youtu.be/r5JgIyS3t3s",
-        headerImageUrl = "https://i.ytimg.com/vi/r5JgIyS3t3s/maxresdefault.jpg",
-        publishDate = Instant.parse("2021-11-08T00:00:00.000Z"),
-        type = Video,
-        topics = listOf(sampleTopic2),
-        authors = listOf(sampleAuthor2)
+        authors = listOf(sampleAuthor2),
+        topics = listOf(sampleTopic2)
     ),
 )

core/domain/src/test/java/com/google/samples/apps/nowinandroid/core/domain/GetSortedFollowableAuthorsStreamUseCaseTest.kt

@@ -17,10 +17,11 @@
 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.Author
+import com.google.samples.apps.nowinandroid.core.model.data.nextFakeAuthor
 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
@@ -64,34 +65,8 @@ class GetSortedFollowableAuthorsStreamUseCaseTest {
     }
 }
 
-private val sampleAuthor1 =
-    Author(
-        id = "Author1",
-        name = "Mandy",
-        imageUrl = "",
-        twitter = "",
-        mediumPage = "",
-        bio = "",
-    )
-
-private val sampleAuthor2 =
-    Author(
-        id = "Author2",
-        name = "Andy",
-        imageUrl = "",
-        twitter = "",
-        mediumPage = "",
-        bio = "",
-    )
-
-private val sampleAuthor3 =
-    Author(
-        id = "Author2",
-        name = "Sandy",
-        imageUrl = "",
-        twitter = "",
-        mediumPage = "",
-        bio = "",
-    )
+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 sampleAuthors = listOf(sampleAuthor1, sampleAuthor2, sampleAuthor3)

feature/author/build.gradle.kts

@@ -25,4 +25,6 @@ android {
 
 dependencies {
     implementation(libs.kotlinx.datetime)
+    androidTestImplementation(testFixtures(project(":core:model")))
+    testImplementation(testFixtures(project(":core:model")))
 }

feature/author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt

@@ -22,10 +22,9 @@ 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.Author
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video
-import kotlinx.datetime.Instant
+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 org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -142,69 +141,12 @@ class AuthorScreenTest {
     }
 }
 
-private const val AUTHOR_1_NAME = "Author 1"
-private const val AUTHOR_2_NAME = "Author 2"
-private const val AUTHOR_3_NAME = "Author 3"
-private const val AUTHOR_BIO = "At vero eos et accusamus et iusto odio dignissimos ducimus qui."
-
 private val testAuthors = listOf(
-    FollowableAuthor(
-        Author(
-            id = "0",
-            name = AUTHOR_1_NAME,
-            twitter = "",
-            bio = AUTHOR_BIO,
-            mediumPage = "",
-            imageUrl = ""
-        ),
-        isFollowed = true
-    ),
-    FollowableAuthor(
-        Author(
-            id = "1",
-            name = AUTHOR_2_NAME,
-            twitter = "",
-            bio = AUTHOR_BIO,
-            mediumPage = "",
-            imageUrl = ""
-        ),
-        isFollowed = false
-    ),
-    FollowableAuthor(
-        Author(
-            id = "2",
-            name = AUTHOR_3_NAME,
-            twitter = "",
-            bio = AUTHOR_BIO,
-            mediumPage = "",
-            imageUrl = ""
-        ),
-        isFollowed = false
-    )
+    FollowableAuthor(Random.nextFakeAuthor(id = "1"), isFollowed = true),
+    FollowableAuthor(Random.nextFakeAuthor(id = "2"), isFollowed = false),
+    FollowableAuthor(Random.nextFakeAuthor(id = "3"), isFollowed = false),
 )
 
 private val sampleNewsResources = listOf(
-    NewsResource(
-        id = "1",
-        title = "Thanks for helping us reach 1M YouTube Subscribers",
-        content = "Thank you everyone for following the Now in Android series and everything the " +
-            "Android Developers YouTube channel has to offer. During the Android Developer " +
-            "Summit, our YouTube channel reached 1 million subscribers! Here’s a small video to " +
-            "thank you all.",
-        url = "https://youtu.be/-fJ6poHQrjM",
-        headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
-        publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
-        type = Video,
-        authors = listOf(
-            Author(
-                id = "0",
-                name = "Headlines",
-                twitter = "",
-                bio = AUTHOR_BIO,
-                mediumPage = "",
-                imageUrl = ""
-            )
-        ),
-        topics = emptyList()
-    )
+    Random.nextFakeNewsResource(id = "1", authors = listOf(testAuthors.first().author)),
 )