Rename LocalTestAddressBookStore to LocalTestAddressBookProvider

bitfireAT · Feb 20, 2025 · 89a8f84 · 89a8f84
1 parent 16c695d
commit 89a8f84
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalAddressBookTest.kt b/app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalAddressBookTest.kt
@@ -38,7 +38,7 @@ class LocalAddressBookTest {
     lateinit var context: Context
 
     @Inject
-    lateinit var localTestAddressBookStore: LocalTestAddressBookStore
+    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
 
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
@@ -56,7 +56,7 @@ class LocalAddressBookTest {
      */
     @Test
     fun test_renameAccount_retainsContacts() {
-        localTestAddressBookStore.provide(account, provider) { addressBook ->
+        localTestAddressBookProvider.provide(account, provider) { addressBook ->
             // insert contact with data row
             val uid = "12345"
             val contact = Contact(
@@ -91,7 +91,7 @@ class LocalAddressBookTest {
      */
     @Test
     fun test_renameAccount_retainsGroups() {
-        localTestAddressBookStore.provide(account, provider) { addressBook ->
+        localTestAddressBookProvider.provide(account, provider) { addressBook ->
             // insert group
             val localGroup = LocalGroup(addressBook, Contact(displayName = "Test Group"), null, null, 0)
             val uri = localGroup.add()

diff --git a/app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalGroupTest.kt b/app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalGroupTest.kt
@@ -41,7 +41,7 @@ class LocalGroupTest {
     lateinit var context: Context
 
     @Inject
-    lateinit var localTestAddressBookStore: LocalTestAddressBookStore
+    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
 
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
@@ -56,7 +56,7 @@ class LocalGroupTest {
 
     @Test
     fun testApplyPendingMemberships_addPendingMembership() {
-        localTestAddressBookStore.provide(account, provider, GroupMethod.GROUP_VCARDS) { ab ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.GROUP_VCARDS) { ab ->
             val contact1 = LocalContact(ab, Contact().apply {
                 uid = "test1"
                 displayName = "Test"
@@ -105,7 +105,7 @@ class LocalGroupTest {
 
     @Test
     fun testApplyPendingMemberships_removeMembership() {
-        localTestAddressBookStore.provide(account, provider, GroupMethod.GROUP_VCARDS) { ab ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.GROUP_VCARDS) { ab ->
             val contact1 = LocalContact(ab, Contact().apply {
                 uid = "test1"
                 displayName = "Test"
@@ -148,7 +148,7 @@ class LocalGroupTest {
 
     @Test
     fun testClearDirty_addCachedGroupMembership() {
-        localTestAddressBookStore.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
             val group = newGroup(ab)
 
             val contact1 =
@@ -185,7 +185,7 @@ class LocalGroupTest {
 
     @Test
     fun testClearDirty_removeCachedGroupMembership() {
-        localTestAddressBookStore.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
             val group = newGroup(ab)
 
             val contact1 = LocalContact(ab, Contact().apply { displayName = "Test" }, "fn.vcf", null, 0)
@@ -216,7 +216,7 @@ class LocalGroupTest {
 
     @Test
     fun testMarkMembersDirty() {
-        localTestAddressBookStore.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
             val group = newGroup(ab)
 
             val contact1 =
@@ -236,7 +236,7 @@ class LocalGroupTest {
 
     @Test
     fun testPrepareForUpload() {
-        localTestAddressBookStore.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { ab ->
             val group = newGroup(ab)
             assertNull(group.getContact().uid)
 

diff --git a/...oid/resource/LocalTestAddressBookStore.kt → .../resource/LocalTestAddressBookProvider.kt b/...oid/resource/LocalTestAddressBookStore.kt → .../resource/LocalTestAddressBookProvider.kt
@@ -18,7 +18,7 @@ import javax.inject.Inject
 /**
  * Provides [LocalTestAddressBook]s in tests.
  */
-class LocalTestAddressBookStore @Inject constructor(
+class LocalTestAddressBookProvider @Inject constructor(
     @ApplicationContext private val context: Context,
     private val localTestAddressBookFactory: LocalTestAddressBook.Factory
 ) {

diff --git a/...idTest/kotlin/at/bitfire/davdroid/resource/contactrow/CachedGroupMembershipHandlerTest.kt b/...idTest/kotlin/at/bitfire/davdroid/resource/contactrow/CachedGroupMembershipHandlerTest.kt
@@ -13,7 +13,7 @@ import android.provider.ContactsContract
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import at.bitfire.davdroid.resource.LocalContact
-import at.bitfire.davdroid.resource.LocalTestAddressBookStore
+import at.bitfire.davdroid.resource.LocalTestAddressBookProvider
 import at.bitfire.vcard4android.CachedGroupMembership
 import at.bitfire.vcard4android.Contact
 import at.bitfire.vcard4android.GroupMethod
@@ -37,7 +37,7 @@ class CachedGroupMembershipHandlerTest {
     lateinit var context: Context
 
     @Inject
-    lateinit var localTestAddressBookStore: LocalTestAddressBookStore
+    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
 
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
@@ -52,7 +52,7 @@ class CachedGroupMembershipHandlerTest {
 
     @Test
     fun testMembership() {
-        localTestAddressBookStore.provide(account, provider, GroupMethod.GROUP_VCARDS) { addressBook ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.GROUP_VCARDS) { addressBook ->
             val contact = Contact()
             val localContact = LocalContact(addressBook, contact, null, null, 0)
             CachedGroupMembershipHandler(localContact).handle(ContentValues().apply {

diff --git a/.../androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/GroupMembershipBuilderTest.kt b/.../androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/GroupMembershipBuilderTest.kt
@@ -13,7 +13,7 @@ import android.provider.ContactsContract
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
-import at.bitfire.davdroid.resource.LocalTestAddressBookStore
+import at.bitfire.davdroid.resource.LocalTestAddressBookProvider
 import at.bitfire.vcard4android.Contact
 import at.bitfire.vcard4android.GroupMethod
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -35,7 +35,7 @@ class GroupMembershipBuilderTest {
     lateinit var context: Context
 
     @Inject
-    lateinit var localTestAddressBookStore: LocalTestAddressBookStore
+    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
 
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
@@ -54,7 +54,7 @@ class GroupMembershipBuilderTest {
         val contact = Contact().apply {
             categories += "TEST GROUP"
         }
-        localTestAddressBookStore.provide(account, provider, GroupMethod.CATEGORIES) { addressBookGroupsAsCategories ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { addressBookGroupsAsCategories ->
             GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsCategories, false).build().also { result ->
                 assertEquals(1, result.size)
                 assertEquals(GroupMembership.CONTENT_ITEM_TYPE, result[0].values[GroupMembership.MIMETYPE])
@@ -68,7 +68,7 @@ class GroupMembershipBuilderTest {
         val contact = Contact().apply {
             categories += "TEST GROUP"
         }
-        localTestAddressBookStore.provide(account, provider, GroupMethod.GROUP_VCARDS) { addressBookGroupsAsVCards ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.GROUP_VCARDS) { addressBookGroupsAsVCards ->
             GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsVCards, false).build().also { result ->
                 // group membership is constructed during post-processing
                 assertEquals(0, result.size)

diff --git a/.../androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/GroupMembershipHandlerTest.kt b/.../androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/GroupMembershipHandlerTest.kt
@@ -13,7 +13,7 @@ import android.provider.ContactsContract
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import at.bitfire.davdroid.resource.LocalContact
-import at.bitfire.davdroid.resource.LocalTestAddressBookStore
+import at.bitfire.davdroid.resource.LocalTestAddressBookProvider
 import at.bitfire.vcard4android.CachedGroupMembership
 import at.bitfire.vcard4android.Contact
 import at.bitfire.vcard4android.GroupMethod
@@ -38,7 +38,7 @@ class GroupMembershipHandlerTest {
     lateinit var context: Context
 
     @Inject
-    lateinit var localTestAddressBookStore: LocalTestAddressBookStore
+    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
 
     @get:Rule
     var hiltRule = HiltAndroidRule(this)
@@ -53,7 +53,7 @@ class GroupMembershipHandlerTest {
 
     @Test
     fun testMembership_GroupsAsCategories() {
-        localTestAddressBookStore.provide(account, provider, GroupMethod.CATEGORIES) { addressBookGroupsAsCategories ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.CATEGORIES) { addressBookGroupsAsCategories ->
             val addressBookGroupsAsCategoriesGroup = addressBookGroupsAsCategories.findOrCreateGroup("TEST GROUP")
 
             val contact = Contact()
@@ -70,7 +70,7 @@ class GroupMembershipHandlerTest {
 
     @Test
     fun testMembership_GroupsAsVCards() {
-        localTestAddressBookStore.provide(account, provider, GroupMethod.GROUP_VCARDS) { addressBookGroupsAsVCards ->
+        localTestAddressBookProvider.provide(account, provider, GroupMethod.GROUP_VCARDS) { addressBookGroupsAsVCards ->
             val contact = Contact()
             val localContact = LocalContact(addressBookGroupsAsVCards, contact, null, null, 0)
             GroupMembershipHandler(localContact).handle(ContentValues().apply {

diff --git a/...droidTest/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration20Test.kt b/...droidTest/kotlin/at/bitfire/davdroid/settings/migration/AccountSettingsMigration20Test.kt
@@ -18,7 +18,7 @@ import at.bitfire.davdroid.db.Collection
 import at.bitfire.davdroid.db.Service
 import at.bitfire.davdroid.resource.LocalAddressBook
 import at.bitfire.davdroid.resource.LocalCalendarStore
-import at.bitfire.davdroid.resource.LocalTestAddressBookStore
+import at.bitfire.davdroid.resource.LocalTestAddressBookProvider
 import at.bitfire.davdroid.sync.account.setAndVerifyUserData
 import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
 import at.bitfire.vcard4android.GroupMethod
@@ -50,7 +50,7 @@ class AccountSettingsMigration20Test {
     lateinit var migration: AccountSettingsMigration20
 
     @Inject
-    lateinit var localTestAddressBookStore: LocalTestAddressBookStore
+    lateinit var localTestAddressBookProvider: LocalTestAddressBookProvider
 
     @get:Rule
     val hiltRule = HiltAndroidRule(this)
@@ -85,7 +85,7 @@ class AccountSettingsMigration20Test {
             url = url.toHttpUrl()
         ))
 
-        localTestAddressBookStore.provide(account, mockk(relaxed = true), GroupMethod.GROUP_VCARDS) { addressBook ->
+        localTestAddressBookProvider.provide(account, mockk(relaxed = true), GroupMethod.GROUP_VCARDS) { addressBook ->
 
             accountManager.setAndVerifyUserData(addressBook.addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_NAME, account.name)
             accountManager.setAndVerifyUserData(addressBook.addressBookAccount, LocalAddressBook.USER_DATA_ACCOUNT_TYPE, account.type)