test(android): give every repository test its own settings stores

SyncIntegrationTest failed because it read the app's real settings on the
device. Four more instrumented tests built SpamRepository the same way:
the SMS and spam pipeline tests reset a few settings and inherited the
rest from whatever the installed app had stored (contacts-only mode, for
one, would flip their verdicts), and the backup and hot-list tests wrote
test state into the installed app.

TestSettingsStores gains a repository() factory and all five use it.
CallScreeningDeadlineTest keeps the real stores on purpose, since the
cold path through them is what it times, and now says so.

Author: SysAdminDoc

CHANGELOG.md

@@ -369,11 +369,12 @@ The rest of this section takes effect when the report Worker is next deployed.
   the result doesn't match what the app expects or a table loses rows. The
   migration test that would have caught the August database lockout ran only
   on an emulator, and nothing ran it.
-- The on-device sync tests keep their settings to themselves. They used the
-  app's own saved settings, so once the app had loaded its built-in database
-  on the test phone, every older test feed was refused as a rollback and the
-  tests failed. The dashboard tests now check the labels and buttons from the
-  August redesign.
+- The on-device tests keep their settings to themselves. They used the app's
+  own saved settings, so once the app had loaded its built-in database on the
+  test phone, every older test feed was refused as a rollback and the sync
+  tests failed, and the backup and screening tests wrote test settings into
+  the installed app. The dashboard tests now check the labels and buttons from
+  the August redesign.
 - The on-device accessibility checks draw each screen in the app's theme on
   its own background. They measured colors against the bare white test window
   instead, which failed 20 screens for colors nobody sees and hid the real

app/src/androidTest/java/com/sysadmindoc/callshield/data/BackupRestoreIntegrationTest.kt

@@ -45,19 +45,22 @@ class BackupRestoreIntegrationTest {
     private lateinit var db: AppDatabase
     private lateinit var dao: SpamDao
     private lateinit var repo: SpamRepository
+    private lateinit var stores: TestSettingsStores
 
     @Before
     fun setUp() {
         context = ApplicationProvider.getApplicationContext()
         val builder = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
         db = builder.allowMainThreadQueries().build()
         dao = db.spamDao()
-        repo = SpamRepository(context, db)
+        stores = TestSettingsStores(context)
+        repo = stores.repository(context, db)
     }
 
     @After
     fun tearDown() {
         db.close()
+        stores.close()
     }
 
     @Test

app/src/androidTest/java/com/sysadmindoc/callshield/data/SmsPipelineIntegrationTest.kt

@@ -22,6 +22,7 @@ class SmsPipelineIntegrationTest {
     private lateinit var db: AppDatabase
     private lateinit var dao: SpamDao
     private lateinit var repo: SpamRepository
+    private lateinit var stores: TestSettingsStores
 
     @Before
     fun setUp() =
@@ -33,13 +34,15 @@ class SmsPipelineIntegrationTest {
                     .allowMainThreadQueries()
                     .build()
             dao = db.spamDao()
-            repo = SpamRepository(context, db)
+            stores = TestSettingsStores(context)
+            repo = stores.repository(context, db)
             resetHotPathSettings()
         }
 
     @After
     fun tearDown() {
         db.close()
+        stores.close()
     }
 
     @Test

app/src/androidTest/java/com/sysadmindoc/callshield/data/SpamPipelineIntegrationTest.kt

@@ -30,6 +30,7 @@ class SpamPipelineIntegrationTest {
     private lateinit var db: AppDatabase
     private lateinit var dao: SpamDao
     private lateinit var repo: SpamRepository
+    private lateinit var stores: TestSettingsStores
 
     @Before
     fun setUp() =
@@ -41,13 +42,15 @@ class SpamPipelineIntegrationTest {
                     .allowMainThreadQueries()
                     .build()
             dao = db.spamDao()
-            repo = SpamRepository(context, db)
+            stores = TestSettingsStores(context)
+            repo = stores.repository(context, db)
             resetHotPathSettings()
         }
 
     @After
     fun tearDown() {
         db.close()
+        stores.close()
     }
 
     @Test
@@ -176,12 +179,7 @@ class SpamPipelineIntegrationTest {
                 PhoneIdentityCanonicalizer("GB") { number, _ ->
                     if (number == "02079460018") "+442079460018" else null
                 }
-            val regionalRepo =
-                SpamRepository(
-                    context = context,
-                    database = db,
-                    phoneIdentityCanonicalizer = canonicalizer,
-                )
+            val regionalRepo = stores.repository(context, db, phoneIdentityCanonicalizer = canonicalizer)
             regionalRepo.blockNumber("020 7946 0018", type = "test")
 
             val result = regionalRepo.isSpam("+44 20 7946 0018")

app/src/androidTest/java/com/sysadmindoc/callshield/data/SyncIntegrationTest.kt

@@ -49,14 +49,7 @@ class SyncIntegrationTest {
 
     // The feed policy refuses a feed older than the last one accepted, which
     // the app's own settings remember on the device, so each test starts empty.
-    private fun repository(remote: SpamDataSource) =
-        SpamRepository(
-            context = context,
-            database = db,
-            remote = remote,
-            settingsDataStore = stores.settings,
-            privateSettingsDataStore = stores.privateSettings,
-        )
+    private fun repository(remote: SpamDataSource) = stores.repository(context, db, remote)
 
     @Test
     fun syncFromGitHubPopulatesInMemoryRoomDatabaseFromRemoteSnapshot() =

app/src/androidTest/java/com/sysadmindoc/callshield/data/TestSettingsStores.kt

@@ -4,6 +4,9 @@ import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
+import com.sysadmindoc.callshield.data.local.AppDatabase
+import com.sysadmindoc.callshield.data.remote.GitHubDataSource
+import com.sysadmindoc.callshield.data.remote.SpamDataSource
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -27,6 +30,21 @@ internal class TestSettingsStores(
     val settings: DataStore<Preferences> = store("settings")
     val privateSettings: DataStore<Preferences> = store("private")
 
+    /** A repository on [database] that keeps its settings in these stores. */
+    fun repository(
+        context: Context,
+        database: AppDatabase,
+        remote: SpamDataSource = GitHubDataSource(),
+        phoneIdentityCanonicalizer: PhoneIdentityCanonicalizer = PhoneIdentityCanonicalizer.fromContext(context.applicationContext),
+    ) = SpamRepository(
+        context = context,
+        database = database,
+        remote = remote,
+        settingsDataStore = settings,
+        privateSettingsDataStore = privateSettings,
+        phoneIdentityCanonicalizer = phoneIdentityCanonicalizer,
+    )
+
     private fun store(name: String) =
         PreferenceDataStoreFactory.create(
             corruptionHandler = replaceCorruptPreferences(),

app/src/androidTest/java/com/sysadmindoc/callshield/service/CallScreeningDeadlineTest.kt

@@ -32,7 +32,9 @@ class CallScreeningDeadlineTest {
                 assertEquals(CallShieldScreeningService::class.java.name, component?.className)
 
                 // A new facade leaves checker/prefix/rule caches cold while using
-                // the same Room/DataStore path as onScreenCall.
+                // the same Room/DataStore path as onScreenCall. Unlike the other
+                // repository tests it keeps the app's own stores on purpose: the
+                // cold path through them is what this test times.
                 val repository = SpamRepository(context)
                 val checkSpam = CheckSpamUseCase(SpamRepositoryAdapter(repository))
                 val number = "+12125550199"

app/src/androidTest/java/com/sysadmindoc/callshield/service/HotListSyncIntegrationTest.kt

@@ -7,6 +7,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.sysadmindoc.callshield.data.SmsContentAnalyzer
 import com.sysadmindoc.callshield.data.SpamHeuristics
 import com.sysadmindoc.callshield.data.SpamRepository
+import com.sysadmindoc.callshield.data.TestSettingsStores
 import com.sysadmindoc.callshield.data.local.AppDatabase
 import com.sysadmindoc.callshield.data.model.HotNumber
 import com.sysadmindoc.callshield.data.model.SpamNumber
@@ -26,6 +27,7 @@ class HotListSyncIntegrationTest {
     private lateinit var context: Context
     private lateinit var db: AppDatabase
     private lateinit var repo: SpamRepository
+    private lateinit var stores: TestSettingsStores
 
     @Before
     fun setUp() {
@@ -35,7 +37,8 @@ class HotListSyncIntegrationTest {
                 .inMemoryDatabaseBuilder(context, AppDatabase::class.java)
                 .allowMainThreadQueries()
                 .build()
-        repo = SpamRepository(context, db)
+        stores = TestSettingsStores(context)
+        repo = stores.repository(context, db)
         SpamHeuristics.updateHotRanges(emptyList())
         SmsContentAnalyzer.updateSpamDomains(emptyList())
     }
@@ -45,6 +48,7 @@ class HotListSyncIntegrationTest {
         SpamHeuristics.updateHotRanges(emptyList())
         SmsContentAnalyzer.updateSpamDomains(emptyList())
         db.close()
+        stores.close()
     }
 
     @Test