Migrate data-test to kmp module

core/data-test/build.gradle.kts

@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 plugins {
-    alias(libs.plugins.nowinandroid.android.library)
-    alias(libs.plugins.nowinandroid.hilt)
+    alias(libs.plugins.nowinandroid.kmp.library)
+    alias(libs.plugins.nowinandroid.di.koin)
 }
 
 android {
     namespace = "com.google.samples.apps.nowinandroid.core.data.test"
 }
 
-dependencies {
-    api(projects.core.data)
-
-    implementation(libs.hilt.android.testing)
+kotlin {
+    sourceSets {
+        commonMain.dependencies {
+            api(projects.core.data)
+        }
+    }
 }

core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/AlwaysOnlineNetworkMonitor.kt

@@ -19,8 +19,7 @@ package com.google.samples.apps.nowinandroid.core.data.test
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
-import javax.inject.Inject
 
-class AlwaysOnlineNetworkMonitor @Inject constructor() : NetworkMonitor {
+class AlwaysOnlineNetworkMonitor : NetworkMonitor {
     override val isOnline: Flow<Boolean> = flowOf(true)
 }

core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/DefaultZoneIdTimeZoneMonitor.kt

@@ -20,8 +20,7 @@ import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.datetime.TimeZone
-import javax.inject.Inject
 
-class DefaultZoneIdTimeZoneMonitor @Inject constructor() : TimeZoneMonitor {
+class DefaultZoneIdTimeZoneMonitor : TimeZoneMonitor {
     override val currentTimeZone: Flow<TimeZone> = flowOf(TimeZone.of("Europe/Warsaw"))
 }

core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt

@@ -16,7 +16,6 @@
 
 package com.google.samples.apps.nowinandroid.core.data.test
 
-import com.google.samples.apps.nowinandroid.core.data.di.DataModule
 import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
 import com.google.samples.apps.nowinandroid.core.data.repository.RecentSearchRepository
 import com.google.samples.apps.nowinandroid.core.data.repository.SearchContentsRepository
@@ -29,47 +28,15 @@ import com.google.samples.apps.nowinandroid.core.data.test.repository.FakeTopics
 import com.google.samples.apps.nowinandroid.core.data.test.repository.FakeUserDataRepository
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
 import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.components.SingletonComponent
-import dagger.hilt.testing.TestInstallIn
-
-@Module
-@TestInstallIn(
-    components = [SingletonComponent::class],
-    replaces = [DataModule::class],
-)
-internal interface TestDataModule {
-    @Binds
-    fun bindsTopicRepository(
-        fakeTopicsRepository: FakeTopicsRepository,
-    ): TopicsRepository
-
-    @Binds
-    fun bindsNewsResourceRepository(
-        fakeNewsRepository: FakeNewsRepository,
-    ): NewsRepository
-
-    @Binds
-    fun bindsUserDataRepository(
-        userDataRepository: FakeUserDataRepository,
-    ): UserDataRepository
-
-    @Binds
-    fun bindsRecentSearchRepository(
-        recentSearchRepository: FakeRecentSearchRepository,
-    ): RecentSearchRepository
-
-    @Binds
-    fun bindsSearchContentsRepository(
-        searchContentsRepository: FakeSearchContentsRepository,
-    ): SearchContentsRepository
-
-    @Binds
-    fun bindsNetworkMonitor(
-        networkMonitor: AlwaysOnlineNetworkMonitor,
-    ): NetworkMonitor
-
-    @Binds
-    fun binds(impl: DefaultZoneIdTimeZoneMonitor): TimeZoneMonitor
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+
+val testDataModule = module {
+    single<TopicsRepository> { FakeTopicsRepository(get(named("IoDispatcher")), get()) }
+    single<NewsRepository> { FakeNewsRepository(get(named("IoDispatcher")), get()) }
+    single<UserDataRepository> { FakeUserDataRepository(get()) }
+    single<RecentSearchRepository> { FakeRecentSearchRepository() }
+    single<SearchContentsRepository> { FakeSearchContentsRepository() }
+    single<NetworkMonitor> { AlwaysOnlineNetworkMonitor() }
+    single<TimeZoneMonitor> { DefaultZoneIdTimeZoneMonitor() }
 }

core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeNewsRepository.kt

@@ -23,15 +23,12 @@ import com.google.samples.apps.nowinandroid.core.data.repository.NewsResourceQue
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
-import com.google.samples.apps.nowinandroid.core.network.Dispatcher
-import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO
 import com.google.samples.apps.nowinandroid.core.network.demo.DemoNiaNetworkDataSource
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
-import javax.inject.Inject
 
 /**
  * Fake implementation of the [NewsRepository] that retrieves the news resources from a JSON String.
@@ -39,8 +36,8 @@ import javax.inject.Inject
  * This allows us to run the app with fake data, without needing an internet connection or working
  * backend.
  */
-class FakeNewsRepository @Inject constructor(
-    @Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,
+class FakeNewsRepository(
+    private val ioDispatcher: CoroutineDispatcher,
     private val datasource: DemoNiaNetworkDataSource,
 ) : NewsRepository {
 

core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeRecentSearchRepository.kt

@@ -20,12 +20,11 @@ import com.google.samples.apps.nowinandroid.core.data.model.RecentSearchQuery
 import com.google.samples.apps.nowinandroid.core.data.repository.RecentSearchRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
-import javax.inject.Inject
 
 /**
  * Fake implementation of the [RecentSearchRepository]
  */
-internal class FakeRecentSearchRepository @Inject constructor() : RecentSearchRepository {
+internal class FakeRecentSearchRepository : RecentSearchRepository {
     override suspend fun insertOrReplaceRecentSearch(searchQuery: String) = Unit
 
     override fun getRecentSearchQueries(limit: Int): Flow<List<RecentSearchQuery>> =

core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeSearchContentsRepository.kt

@@ -20,12 +20,11 @@ import com.google.samples.apps.nowinandroid.core.data.repository.SearchContentsR
 import com.google.samples.apps.nowinandroid.core.model.data.SearchResult
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
-import javax.inject.Inject
 
 /**
  * Fake implementation of the [SearchContentsRepository]
  */
-internal class FakeSearchContentsRepository @Inject constructor() : SearchContentsRepository {
+internal class FakeSearchContentsRepository : SearchContentsRepository {
 
     override suspend fun populateFtsData() = Unit
     override fun searchContents(searchQuery: String): Flow<SearchResult> = flowOf()

core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeTopicsRepository.kt

@@ -19,15 +19,12 @@ package com.google.samples.apps.nowinandroid.core.data.test.repository
 import com.google.samples.apps.nowinandroid.core.data.Synchronizer
 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.network.Dispatcher
-import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO
 import com.google.samples.apps.nowinandroid.core.network.demo.DemoNiaNetworkDataSource
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
-import javax.inject.Inject
 
 /**
  * Fake implementation of the [TopicsRepository] that retrieves the topics from a JSON String, and
@@ -36,8 +33,8 @@ import javax.inject.Inject
  * This allows us to run the app with fake data, without needing an internet connection or working
  * backend.
  */
-internal class FakeTopicsRepository @Inject constructor(
-    @Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,
+internal class FakeTopicsRepository(
+    private val ioDispatcher: CoroutineDispatcher,
     private val datasource: DemoNiaNetworkDataSource,
 ) : TopicsRepository {
     override fun getTopics(): Flow<List<Topic>> = flow {

core/data-test/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeUserDataRepository.kt

@@ -22,7 +22,6 @@ import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
 import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
 import com.google.samples.apps.nowinandroid.core.model.data.UserData
 import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
 
 /**
  * Fake implementation of the [UserDataRepository] that returns hardcoded user data.
@@ -30,7 +29,7 @@ import javax.inject.Inject
  * This allows us to run the app with fake data, without needing an internet connection or working
  * backend.
  */
-class FakeUserDataRepository @Inject constructor(
+class FakeUserDataRepository(
     private val niaPreferencesDataSource: NiaPreferencesDataSource,
 ) : UserDataRepository {
 

core/data-test/src/main/AndroidManifest.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest />