Fix OPMLDataSourceTest with a different injectable

Author: hufman

app/src/main/java/me/ash/reader/infrastructure/preference/PreferencesReader.kt

@@ -0,0 +1,38 @@
+package me.ash.reader.infrastructure.preference
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import dagger.hilt.android.qualifiers.ApplicationContext
+import me.ash.reader.ui.ext.DataStoreKey
+import me.ash.reader.ui.ext.dataStore
+import me.ash.reader.ui.ext.get
+import javax.inject.Inject
+
+/**
+ * An injectable Preferences wrapper object,
+ * so that consumers can receive a mock during tests
+ */
+class PreferencesReader @Inject constructor(
+	@ApplicationContext
+	appContext: Context
+) {
+	private val dataStore: DataStore<Preferences> = appContext.dataStore
+
+	val skipVersionNumber: String
+		get() = this.dataStore.get(DataStoreKey.skipVersionNumber) ?: ""
+	val isFirstLaunch: Boolean
+		get() = this.dataStore.get(DataStoreKey.isFirstLaunch) ?: true
+	val currentAccountId: Int
+		get() = this.dataStore.get(DataStoreKey.currentAccountId) ?: 1
+	val currentAccountType: Int
+		get() = this.dataStore.get(DataStoreKey.currentAccountType) ?: 1
+
+	val initialPage: Int
+		get() = this.dataStore.get(DataStoreKey.initialPage) ?: 0
+	val initialFilter: Int
+		get() = this.dataStore.get(DataStoreKey.initialFilter) ?: 2
+
+	val languages: Int
+		get() = this.dataStore.get(DataStoreKey.languages) ?: 0
+}

app/src/main/java/me/ash/reader/infrastructure/rss/OPMLDataSource.kt

@@ -1,23 +1,20 @@
 package me.ash.reader.infrastructure.rss
 
-import android.content.Context
 import be.ceau.opml.OpmlParser
-import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineDispatcher
 import me.ash.reader.domain.model.feed.Feed
 import me.ash.reader.domain.model.group.Group
 import me.ash.reader.domain.model.group.GroupWithFeed
 import me.ash.reader.infrastructure.di.IODispatcher
-import me.ash.reader.ui.ext.currentAccountId
+import me.ash.reader.infrastructure.preference.PreferencesReader
 import me.ash.reader.ui.ext.extractDomain
 import me.ash.reader.ui.ext.spacerDollar
 import java.io.InputStream
 import java.util.*
 import javax.inject.Inject
 
 class OPMLDataSource @Inject constructor(
-    @ApplicationContext
-    private val context: Context,
+    private val preferences: PreferencesReader,
     @IODispatcher
     private val ioDispatcher: CoroutineDispatcher,
 ) {
@@ -27,7 +24,7 @@ class OPMLDataSource @Inject constructor(
         inputStream: InputStream,
         defaultGroup: Group,
     ): List<GroupWithFeed> {
-        val accountId = context.currentAccountId
+        val accountId = preferences.currentAccountId
         val opml = OpmlParser().parse(inputStream)
         val groupWithFeedList = mutableListOf<GroupWithFeed>().also {
             it.addGroup(defaultGroup)
@@ -41,7 +38,7 @@ class OPMLDataSource @Inject constructor(
                     if (!it.attributes.getOrDefault("isDefault", null).toBoolean()) {
                         groupWithFeedList.addGroup(
                             Group(
-                                id = context.currentAccountId.spacerDollar(
+                                id = preferences.currentAccountId.spacerDollar(
                                     UUID.randomUUID().toString()
                                 ),
                                 name = it.attributes.getOrDefault("title", null) ?: it.text!!,
@@ -52,7 +49,7 @@ class OPMLDataSource @Inject constructor(
                 } else {
                     groupWithFeedList.addFeedToDefault(
                         Feed(
-                            id = context.currentAccountId.spacerDollar(
+                            id = preferences.currentAccountId.spacerDollar(
                                 UUID.randomUUID().toString()
                             ),
                             name = it.attributes.getOrDefault("title", null) ?: it.text!!,
@@ -71,7 +68,7 @@ class OPMLDataSource @Inject constructor(
                 var groupId = defaultGroup.id
                 if (!it.attributes.getOrDefault("isDefault", null).toBoolean()) {
                     groupId =
-                        context.currentAccountId.spacerDollar(UUID.randomUUID().toString())
+                        preferences.currentAccountId.spacerDollar(UUID.randomUUID().toString())
                     groupWithFeedList.addGroup(
                         Group(
                             id = groupId,
@@ -86,7 +83,7 @@ class OPMLDataSource @Inject constructor(
                             ?: throw IllegalArgumentException("${outline.attributes} xmlUrl is null")
                         groupWithFeedList.addFeed(
                             Feed(
-                                id = context.currentAccountId.spacerDollar(
+                                id = preferences.currentAccountId.spacerDollar(
                                     UUID.randomUUID().toString()
                                 ),
                                 name = outline.attributes.getOrDefault("title", null)

app/src/test/java/me/ash/reader/infrastructure/rss/OPMLDataSourceTest.kt

@@ -1,18 +1,17 @@
 package me.ash.reader.infrastructure.rss
 
-import android.content.Context
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.runBlocking
 import me.ash.reader.domain.model.group.Group
 import me.ash.reader.domain.model.group.GroupWithFeed
-import me.ash.reader.ui.ext.currentAccountId
+import me.ash.reader.infrastructure.preference.PreferencesReader
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.mockito.Mockito.`when`
 import org.mockito.junit.MockitoJUnitRunner
+import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 
 internal const val OPML_TEMPLATE: String = """
@@ -33,7 +32,7 @@ internal const val OPML_TEMPLATE: String = """
 class OPMLDataSourceTest {
 
     @Mock
-    private lateinit var mockContext: Context
+    private lateinit var mockPreferences: PreferencesReader
 
     @Mock
     private lateinit var mockIODispatcher: CoroutineDispatcher
@@ -46,10 +45,11 @@ class OPMLDataSourceTest {
 
     @Before
     fun setUp() {
-        mockContext = mock<Context> { }
+        mockPreferences = mock<PreferencesReader> {
+            on { currentAccountId } doReturn 1
+        }
         mockIODispatcher = mock<CoroutineDispatcher> {}
-        `when`(mockContext.currentAccountId).thenReturn(1)
-        opmlDataSource = OPMLDataSource(mockContext, mockIODispatcher)
+        opmlDataSource = OPMLDataSource(mockPreferences, mockIODispatcher)
     }
 
     @Test
@@ -63,9 +63,9 @@ class OPMLDataSourceTest {
                 inputStream = opml.byteInputStream(Charsets.UTF_8),
                 defaultGroup = defaultGroup
             )
-            Assert.assertTrue("", result.size == 1)
+            Assert.assertEquals(2, result.size) // includes the defaultGroup and the outline group
         }
     }
 }
 
-private fun fill(str: String): String = OPML_TEMPLATE.replace("{{var}}", str)
+private fun fill(str: String): String = OPML_TEMPLATE.replace("{{var}}", str).trim()