A fully functional Android app built entirely with Kotlin and Jetpack Compose
Remove implicit `TemporaryFolder` binding with InMemoryDataStore test module
Simon Marquisdac9a6a0fa9f
diff --git a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.ktindex b15024cc7..f421adaeb 100644--- a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt+++ b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt@@ -35,7 +35,6 @@ import com.google.samples.apps.nowinandroid.Rimport com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepositoryimport com.google.samples.apps.nowinandroid.core.model.data.Topicimport com.google.samples.apps.nowinandroid.core.rules.GrantPostNotificationsPermissionRule-import dagger.hilt.android.testing.BindValueimport dagger.hilt.android.testing.HiltAndroidRuleimport dagger.hilt.android.testing.HiltAndroidTestimport kotlinx.coroutines.flow.first@@ -43,7 +42,6 @@ import kotlinx.coroutines.runBlockingimport org.junit.Beforeimport org.junit.Ruleimport org.junit.Test-import org.junit.rules.TemporaryFolderimport javax.inject.Injectimport com.google.samples.apps.nowinandroid.feature.bookmarks.R as BookmarksRimport com.google.samples.apps.nowinandroid.feature.foryou.R as FeatureForyouR@@ -62,24 +60,16 @@ class NavigationTest {@get:Rule(order = 0)val hiltRule = HiltAndroidRule(this)- /**- * Create a temporary folder used to create a Data Store file. This guarantees that- * the file is removed in between each test, preventing a crash.- */- @BindValue- @get:Rule(order = 1)- val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()-/*** Grant [android.Manifest.permission.POST_NOTIFICATIONS] permission.*/- @get:Rule(order = 2)+ @get:Rule(order = 1)val postNotificationsPermission = GrantPostNotificationsPermissionRule()/*** Use the primary activity to initialize the app normally.*/- @get:Rule(order = 3)+ @get:Rule(order = 2)val composeTestRule = createAndroidComposeRule<MainActivity>()@Injectdiff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.ktindex 1cca5a13a..e84b96b73 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt@@ -38,7 +38,6 @@ import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitorimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.testing.util.DefaultRoborazziOptionsimport com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity-import dagger.hilt.android.testing.BindValueimport dagger.hilt.android.testing.HiltAndroidRuleimport dagger.hilt.android.testing.HiltAndroidTestimport dagger.hilt.android.testing.HiltTestApplication@@ -47,7 +46,6 @@ import kotlinx.coroutines.runBlockingimport org.junit.Beforeimport org.junit.Ruleimport org.junit.Test-import org.junit.rules.TemporaryFolderimport org.junit.runner.RunWithimport org.robolectric.RobolectricTestRunnerimport org.robolectric.annotation.Config@@ -74,18 +72,10 @@ class NiaAppScreenSizesScreenshotTests {@get:Rule(order = 0)val hiltRule = HiltAndroidRule(this)- /**- * Create a temporary folder used to create a Data Store file. This guarantees that- * the file is removed in between each test, preventing a crash.- */- @BindValue- @get:Rule(order = 1)- val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()-/*** Use a test activity to set the content on.*/- @get:Rule(order = 2)+ @get:Rule(order = 1)val composeTestRule = createAndroidComposeRule<HiltComponentActivity>()@Injectdiff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.ktindex b9970effd..2ef0d3e4f 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt@@ -69,7 +69,6 @@ import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitorimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.testing.util.DefaultRoborazziOptionsimport com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity-import dagger.hilt.android.testing.BindValueimport dagger.hilt.android.testing.HiltAndroidRuleimport dagger.hilt.android.testing.HiltAndroidTestimport dagger.hilt.android.testing.HiltTestApplication@@ -80,7 +79,6 @@ import kotlinx.coroutines.runBlockingimport org.junit.Beforeimport org.junit.Ruleimport org.junit.Test-import org.junit.rules.TemporaryFolderimport org.junit.runner.RunWithimport org.robolectric.RobolectricTestRunnerimport org.robolectric.annotation.Config@@ -107,18 +105,10 @@ class SnackbarInsetsScreenshotTests {@get:Rule(order = 0)val hiltRule = HiltAndroidRule(this)- /**- * Create a temporary folder used to create a Data Store file. This guarantees that- * the file is removed in between each test, preventing a crash.- */- @BindValue- @get:Rule(order = 1)- val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()-/*** Use a test activity to set the content on.*/- @get:Rule(order = 2)+ @get:Rule(order = 1)val composeTestRule = createAndroidComposeRule<HiltComponentActivity>()@Injectdiff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.ktindex 6f12dd620..fe2e98452 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt@@ -42,7 +42,6 @@ import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitorimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.testing.util.DefaultRoborazziOptionsimport com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity-import dagger.hilt.android.testing.BindValueimport dagger.hilt.android.testing.HiltAndroidRuleimport dagger.hilt.android.testing.HiltAndroidTestimport dagger.hilt.android.testing.HiltTestApplication@@ -53,7 +52,6 @@ import kotlinx.coroutines.runBlockingimport org.junit.Beforeimport org.junit.Ruleimport org.junit.Test-import org.junit.rules.TemporaryFolderimport org.junit.runner.RunWithimport org.robolectric.RobolectricTestRunnerimport org.robolectric.annotation.Config@@ -80,18 +78,10 @@ class SnackbarScreenshotTests {@get:Rule(order = 0)val hiltRule = HiltAndroidRule(this)- /**- * Create a temporary folder used to create a Data Store file. This guarantees that- * the file is removed in between each test, preventing a crash.- */- @BindValue- @get:Rule(order = 1)- val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()-/*** Use a test activity to set the content on.*/- @get:Rule(order = 2)+ @get:Rule(order = 1)val composeTestRule = createAndroidComposeRule<HiltComponentActivity>()@Injectdiff --git a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.ktindex 47c3996c4..01111013f 100644--- a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt+++ b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt@@ -32,7 +32,8 @@ import com.google.samples.apps.nowinandroid.core.database.model.PopulatedNewsResimport com.google.samples.apps.nowinandroid.core.database.model.TopicEntityimport com.google.samples.apps.nowinandroid.core.database.model.asExternalModelimport com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSource-import com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStore+import com.google.samples.apps.nowinandroid.core.datastore.UserPreferences+import com.google.samples.apps.nowinandroid.core.datastore.test.InMemoryDataStoreimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceimport com.google.samples.apps.nowinandroid.core.model.data.Topicimport com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList@@ -43,9 +44,7 @@ import kotlinx.coroutines.test.TestScopeimport kotlinx.coroutines.test.UnconfinedTestDispatcherimport kotlinx.coroutines.test.runTestimport org.junit.Before-import org.junit.Ruleimport org.junit.Test-import org.junit.rules.TemporaryFolderimport kotlin.test.assertEqualsimport kotlin.test.assertTrue@@ -67,14 +66,9 @@ class OfflineFirstNewsRepositoryTest {private lateinit var synchronizer: Synchronizer- @get:Rule- val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()-@Beforefun setup() {- niaPreferencesDataSource = NiaPreferencesDataSource(- tmpFolder.testUserPreferencesDataStore(testScope),- )+ niaPreferencesDataSource = NiaPreferencesDataSource(InMemoryDataStore(UserPreferences.getDefaultInstance()))newsResourceDao = TestNewsResourceDao()topicDao = TestTopicDao()network = TestNiaNetworkDataSource()diff --git a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.ktindex 3bd314eae..d32f424d8 100644--- a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt+++ b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt@@ -25,7 +25,8 @@ import com.google.samples.apps.nowinandroid.core.database.dao.TopicDaoimport com.google.samples.apps.nowinandroid.core.database.model.TopicEntityimport com.google.samples.apps.nowinandroid.core.database.model.asExternalModelimport com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSource-import com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStore+import com.google.samples.apps.nowinandroid.core.datastore.UserPreferences+import com.google.samples.apps.nowinandroid.core.datastore.test.InMemoryDataStoreimport com.google.samples.apps.nowinandroid.core.model.data.Topicimport com.google.samples.apps.nowinandroid.core.network.model.NetworkTopicimport kotlinx.coroutines.flow.first@@ -33,9 +34,7 @@ import kotlinx.coroutines.test.TestScopeimport kotlinx.coroutines.test.UnconfinedTestDispatcherimport kotlinx.coroutines.test.runTestimport org.junit.Before-import org.junit.Ruleimport org.junit.Test-import org.junit.rules.TemporaryFolderimport kotlin.test.assertEqualsclass OfflineFirstTopicsRepositoryTest {@@ -52,16 +51,11 @@ class OfflineFirstTopicsRepositoryTest {private lateinit var synchronizer: Synchronizer- @get:Rule- val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()-@Beforefun setup() {topicDao = TestTopicDao()network = TestNiaNetworkDataSource()- niaPreferences = NiaPreferencesDataSource(- tmpFolder.testUserPreferencesDataStore(testScope),- )+ niaPreferences = NiaPreferencesDataSource(InMemoryDataStore(UserPreferences.getDefaultInstance()))synchronizer = TestSynchronizer(niaPreferences)subject = OfflineFirstTopicsRepository(diff --git a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.ktindex 422e2cfb7..8860a6b35 100644--- a/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt+++ b/core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt@@ -18,7 +18,8 @@ package com.google.samples.apps.nowinandroid.core.data.repositoryimport com.google.samples.apps.nowinandroid.core.analytics.NoOpAnalyticsHelperimport com.google.samples.apps.nowinandroid.core.datastore.NiaPreferencesDataSource-import com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStore+import com.google.samples.apps.nowinandroid.core.datastore.UserPreferences+import com.google.samples.apps.nowinandroid.core.datastore.test.InMemoryDataStoreimport com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfigimport com.google.samples.apps.nowinandroid.core.model.data.ThemeBrandimport com.google.samples.apps.nowinandroid.core.model.data.UserData@@ -28,9 +29,7 @@ import kotlinx.coroutines.test.TestScopeimport kotlinx.coroutines.test.UnconfinedTestDispatcherimport kotlinx.coroutines.test.runTestimport org.junit.Before-import org.junit.Ruleimport org.junit.Test-import org.junit.rules.TemporaryFolderimport kotlin.test.assertEqualsimport kotlin.test.assertFalseimport kotlin.test.assertTrue@@ -45,14 +44,9 @@ class OfflineFirstUserDataRepositoryTest {private val analyticsHelper = NoOpAnalyticsHelper()- @get:Rule- val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()-@Beforefun setup() {- niaPreferencesDataSource = NiaPreferencesDataSource(- tmpFolder.testUserPreferencesDataStore(testScope),- )+ niaPreferencesDataSource = NiaPreferencesDataSource(InMemoryDataStore(UserPreferences.getDefaultInstance()))subject = OfflineFirstUserDataRepository(niaPreferencesDataSource = niaPreferencesDataSource,diff --git a/core/datastore-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.kt b/core/datastore-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.ktindex 295b2978a..5cc48af12 100644--- a/core/datastore-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.kt+++ b/core/datastore-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.kt@@ -17,17 +17,13 @@package com.google.samples.apps.nowinandroid.core.datastore.testimport androidx.datastore.core.DataStore-import androidx.datastore.core.DataStoreFactoryimport com.google.samples.apps.nowinandroid.core.datastore.UserPreferencesimport com.google.samples.apps.nowinandroid.core.datastore.UserPreferencesSerializerimport com.google.samples.apps.nowinandroid.core.datastore.di.DataStoreModule-import com.google.samples.apps.nowinandroid.core.network.di.ApplicationScopeimport dagger.Moduleimport dagger.Providesimport dagger.hilt.components.SingletonComponentimport dagger.hilt.testing.TestInstallIn-import kotlinx.coroutines.CoroutineScope-import org.junit.rules.TemporaryFolderimport javax.inject.Singleton@Module@@ -36,26 +32,9 @@ import javax.inject.Singletonreplaces = [DataStoreModule::class],)internal object TestDataStoreModule {-@Provides@Singletonfun providesUserPreferencesDataStore(- @ApplicationScope scope: CoroutineScope,- userPreferencesSerializer: UserPreferencesSerializer,- tmpFolder: TemporaryFolder,- ): DataStore<UserPreferences> =- tmpFolder.testUserPreferencesDataStore(- coroutineScope = scope,- userPreferencesSerializer = userPreferencesSerializer,- )-}--fun TemporaryFolder.testUserPreferencesDataStore(- coroutineScope: CoroutineScope,- userPreferencesSerializer: UserPreferencesSerializer = UserPreferencesSerializer(),-) = DataStoreFactory.create(- serializer = userPreferencesSerializer,- scope = coroutineScope,-) {- newFile("user_preferences_test.pb")+ serializer: UserPreferencesSerializer,+ ): DataStore<UserPreferences> = InMemoryDataStore(serializer.defaultValue)}diff --git a/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSourceTest.kt b/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSourceTest.ktindex 433812808..433bbb5ea 100644--- a/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSourceTest.kt+++ b/core/datastore/src/test/kotlin/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSourceTest.kt@@ -16,15 +16,13 @@package com.google.samples.apps.nowinandroid.core.datastore-import com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStore+import com.google.samples.apps.nowinandroid.core.datastore.test.InMemoryDataStoreimport kotlinx.coroutines.flow.firstimport kotlinx.coroutines.test.TestScopeimport kotlinx.coroutines.test.UnconfinedTestDispatcherimport kotlinx.coroutines.test.runTestimport org.junit.Before-import org.junit.Ruleimport org.junit.Test-import org.junit.rules.TemporaryFolderimport kotlin.test.assertFalseimport kotlin.test.assertTrue@@ -34,14 +32,9 @@ class NiaPreferencesDataSourceTest {private lateinit var subject: NiaPreferencesDataSource- @get:Rule- val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()-@Beforefun setup() {- subject = NiaPreferencesDataSource(- tmpFolder.testUserPreferencesDataStore(testScope),- )+ subject = NiaPreferencesDataSource(InMemoryDataStore(UserPreferences.getDefaultInstance()))}@Test