From 343c421f22eb181d1171d9d88eef015842f6fcd4 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Wed, 13 Mar 2024 13:41:12 -0700 Subject: [PATCH] Remove defaults to pass test --- .../data/testdoubles/TestNiaNetworkDataSource.kt | 2 ++ .../nowinandroid/core/datastore/UserPreferences.kt | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/core/data/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.kt b/core/data/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.kt index 7f9a69959..1a81e84b5 100644 --- a/core/data/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.kt +++ b/core/data/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.kt @@ -21,6 +21,7 @@ import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetworkData import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.serialization.json.Json @@ -33,6 +34,7 @@ enum class CollectionType { /** * Test double for [NiaNetworkDataSource] */ +@OptIn(ExperimentalCoroutinesApi::class) class TestNiaNetworkDataSource : NiaNetworkDataSource { private val source = FakeNiaNetworkDataSource( diff --git a/core/datastore-proto/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/datastore/UserPreferences.kt b/core/datastore-proto/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/datastore/UserPreferences.kt index f8168fc0c..9307ffc22 100644 --- a/core/datastore-proto/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/datastore/UserPreferences.kt +++ b/core/datastore-proto/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/datastore/UserPreferences.kt @@ -28,10 +28,10 @@ data class UserPreferences( val newsResourceChangeListVersion: Int, val hasDoneIntToStringIdMigration: Boolean, val hasDoneListToMapMigration: Boolean, - val followedTopicIds: Set = emptySet(), - val followedAuthorIds: Set = emptySet(), - val bookmarkedNewsResourceIds: Set = emptySet(), - val viewedNewsResourceIds: Set = emptySet(), + val followedTopicIds: Set, + val followedAuthorIds: Set, + val bookmarkedNewsResourceIds: Set, + val viewedNewsResourceIds: Set, val themeBrand: ThemeBrandProto, val darkThemeConfig: DarkThemeConfigProto, val shouldHideOnboarding: Boolean, @@ -48,6 +48,10 @@ data class UserPreferences( darkThemeConfig = DARK_THEME_CONFIG_FOLLOW_SYSTEM, shouldHideOnboarding = false, useDynamicColor = false, + followedTopicIds = emptySet(), + followedAuthorIds = emptySet(), + bookmarkedNewsResourceIds = emptySet(), + viewedNewsResourceIds = emptySet(), ) } }