Fix tests

bitfireAT · Jan 7, 2025 · d16bfd3 · d16bfd3
1 parent 45d3819
commit d16bfd3
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 95 deletions.
diff --git a/app/src/androidTest/kotlin/at/bitfire/davdroid/TestModules.kt b/app/src/androidTest/kotlin/at/bitfire/davdroid/TestModules.kt
@@ -1,32 +1,13 @@
 package at.bitfire.davdroid
 
-import android.content.Context
-import androidx.test.platform.app.InstrumentationRegistry
 import at.bitfire.davdroid.push.PushRegistrationWorkerManager
 import at.bitfire.davdroid.repository.DavCollectionRepository
 import at.bitfire.davdroid.startup.StartupPlugin
 import at.bitfire.davdroid.startup.TasksAppWatcher
 import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import dagger.hilt.testing.TestInstallIn
 import dagger.multibindings.Multibinds
-import javax.inject.Provider
-import javax.inject.Qualifier
-
-/*@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class TargetContext
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal object TargetContextModule {
-    @Provides @TargetContext
-    fun targetContext(): Provider<Context> = object: Provider<Context> {
-        override fun get() = InstrumentationRegistry.getInstrumentation().targetContext
-    }
-}*/
 
 // remove PushRegistrationWorkerModule from Android tests
 @Module

diff --git a/app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalTestAddressBook.kt b/app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalTestAddressBook.kt
@@ -119,6 +119,11 @@ class LocalTestAddressBook @AssistedInject constructor(
 
         val counter = AtomicInteger()
 
+        /**
+         * Creates a [at.bitfire.davdroid.resource.LocalTestAddressBook].
+         *
+         * Make sure to delete it with [at.bitfire.davdroid.resource.LocalTestAddressBook.remove] or [removeAll] after use.
+         */
         fun create(context: Context, account: Account, provider: ContentProviderClient, groupMethod: GroupMethod = GroupMethod.GROUP_VCARDS): LocalTestAddressBook {
             // create new address book account
             val addressBookAccount = Account("Test Address Book ${counter.incrementAndGet()}", context.getString(R.string.account_type_address_book))
@@ -131,6 +136,12 @@ class LocalTestAddressBook @AssistedInject constructor(
             return factory.create(account, addressBookAccount, provider, groupMethod)
         }
 
+        fun removeAll(context: Context) {
+            val accountManager = AccountManager.get(context)
+            for (account in accountManager.getAccountsByType(context.getString(R.string.account_type_address_book)))
+                accountManager.removeAccountExplicitly(account)
+        }
+
     }
 
 }
diff --git a/...idTest/kotlin/at/bitfire/davdroid/resource/contactrow/CachedGroupMembershipHandlerTest.kt b/...idTest/kotlin/at/bitfire/davdroid/resource/contactrow/CachedGroupMembershipHandlerTest.kt
@@ -74,14 +74,17 @@ class CachedGroupMembershipHandlerTest {
     @Test
     fun testMembership() {
         val addressBook = LocalTestAddressBook.create(context, account, provider, GroupMethod.GROUP_VCARDS)
-
-        val contact = Contact()
-        val localContact = LocalContact(addressBook, contact, null, null, 0)
-        CachedGroupMembershipHandler(localContact).handle(ContentValues().apply {
-            put(CachedGroupMembership.GROUP_ID, 123456)
-            put(CachedGroupMembership.RAW_CONTACT_ID, 789)
-        }, contact)
-        assertArrayEquals(arrayOf(123456L), localContact.cachedGroupMemberships.toArray())
+        try {
+            val contact = Contact()
+            val localContact = LocalContact(addressBook, contact, null, null, 0)
+            CachedGroupMembershipHandler(localContact).handle(ContentValues().apply {
+                put(CachedGroupMembership.GROUP_ID, 123456)
+                put(CachedGroupMembership.RAW_CONTACT_ID, 789)
+            }, contact)
+            assertArrayEquals(arrayOf(123456L), localContact.cachedGroupMemberships.toArray())
+        } finally {
+            addressBook.remove()
+        }
     }
 
 }
diff --git a/.../androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/GroupMembershipBuilderTest.kt b/.../androidTest/kotlin/at/bitfire/davdroid/resource/contactrow/GroupMembershipBuilderTest.kt
@@ -52,10 +52,14 @@ class GroupMembershipBuilderTest {
             categories += "TEST GROUP"
         }
         val addressBookGroupsAsCategories = LocalTestAddressBook.create(context, account, provider, GroupMethod.CATEGORIES)
-        GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsCategories, false).build().also { result ->
-            assertEquals(1, result.size)
-            assertEquals(GroupMembership.CONTENT_ITEM_TYPE, result[0].values[GroupMembership.MIMETYPE])
-            assertEquals(addressBookGroupsAsCategories.findOrCreateGroup("TEST GROUP"), result[0].values[GroupMembership.GROUP_ROW_ID])
+        try {
+            GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsCategories, false).build().also { result ->
+                assertEquals(1, result.size)
+                assertEquals(GroupMembership.CONTENT_ITEM_TYPE, result[0].values[GroupMembership.MIMETYPE])
+                assertEquals(addressBookGroupsAsCategories.findOrCreateGroup("TEST GROUP"), result[0].values[GroupMembership.GROUP_ROW_ID])
+            }
+        } finally {
+            addressBookGroupsAsCategories.remove()
         }
     }
 
@@ -65,9 +69,13 @@ class GroupMembershipBuilderTest {
             categories += "TEST GROUP"
         }
         val addressBookGroupsAsVCards = LocalTestAddressBook.create(context, account, provider, GroupMethod.GROUP_VCARDS)
-        GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsVCards, false).build().also { result ->
-            // group membership is constructed during post-processing
-            assertEquals(0, result.size)
+        try {
+            GroupMembershipBuilder(Uri.EMPTY, null, contact, addressBookGroupsAsVCards, false).build().also { result ->
+                // group membership is constructed during post-processing
+                assertEquals(0, result.size)
+            }
+        } finally {
+            addressBookGroupsAsVCards.remove()
         }
     }
 

diff --git a/app/src/androidTest/kotlin/at/bitfire/davdroid/sync/account/AccountsCleanupWorkerTest.kt b/app/src/androidTest/kotlin/at/bitfire/davdroid/sync/account/AccountsCleanupWorkerTest.kt
@@ -11,12 +11,11 @@ import at.bitfire.davdroid.TestUtils
 import at.bitfire.davdroid.db.AppDatabase
 import at.bitfire.davdroid.db.Service
 import at.bitfire.davdroid.resource.LocalAddressBook
+import at.bitfire.davdroid.resource.LocalTestAddressBook
 import at.bitfire.davdroid.settings.SettingsManager
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.every
-import io.mockk.mockkObject
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
@@ -36,8 +35,7 @@ class AccountsCleanupWorkerTest {
     @Inject
     lateinit var accountsCleanupWorkerFactory: AccountsCleanupWorker.Factory
 
-    @Inject
-    @ApplicationContext
+    @Inject @ApplicationContext
     lateinit var context: Context
 
     @Inject
@@ -59,15 +57,14 @@ class AccountsCleanupWorkerTest {
         hiltRule.inject()
         TestUtils.setUpWorkManager(context, workerFactory)
 
-        service = createTestService(Service.TYPE_CARDDAV)
-
-        // Prepare test account
         accountManager = AccountManager.get(context)
+        service = createTestService()
+
         addressBookAccountType = context.getString(R.string.account_type_address_book)
-        addressBookAccount = Account(
-            "Fancy address book account",
-            addressBookAccountType
-        )
+        addressBookAccount = Account("Fancy address book account", addressBookAccountType)
+
+        // Make sure there are no address books
+        LocalTestAddressBook.removeAll(context)
     }
 
     @After
@@ -95,37 +92,32 @@ class AccountsCleanupWorkerTest {
 
     @Test
     fun testCleanUpServices_oneAccount() {
-        val account = Account("test", "test")
-        val accountManager = AccountManager.get(context)
-        mockkObject(accountManager)
-        every { accountManager.getAccountsByType(context.getString(R.string.account_type)) } returns arrayOf(account)
-
-        // Insert services, one that reference the existing account and one that references an invalid account
-        db.serviceDao().insertOrReplace(Service(id = 1, accountName = account.name, type = Service.TYPE_CALDAV, principal = null))
-        assertNotNull(db.serviceDao().get(1))
+        TestAccount.provide { existingAccount ->
+            // Insert services, one that reference the existing account and one that references an invalid account
+            db.serviceDao().insertOrReplace(Service(id = 1, accountName = existingAccount.name, type = Service.TYPE_CALDAV, principal = null))
+            assertNotNull(db.serviceDao().get(1))
 
-        db.serviceDao().insertOrReplace(Service(id = 2, accountName = "not existing", type = Service.TYPE_CARDDAV, principal = null))
-        assertNotNull(db.serviceDao().get(2))
+            db.serviceDao().insertOrReplace(Service(id = 2, accountName = "not existing", type = Service.TYPE_CARDDAV, principal = null))
+            assertNotNull(db.serviceDao().get(2))
 
-        // Create worker and run the method
-        val worker = TestListenableWorkerBuilder<AccountsCleanupWorker>(context)
-            .setWorkerFactory(workerFactory)
-            .build()
-        worker.cleanUpServices()
+            // Create worker and run the method
+            val worker = TestListenableWorkerBuilder<AccountsCleanupWorker>(context)
+                .setWorkerFactory(workerFactory)
+                .build()
+            worker.cleanUpServices()
 
-        // Verify that one service is deleted and the other one is kept
-        assertNotNull(db.serviceDao().get(1))
-        assertNull(db.serviceDao().get(2))
+            // Verify that one service is deleted and the other one is kept
+            assertNotNull(db.serviceDao().get(1))
+            assertNull(db.serviceDao().get(2))
+        }
     }
 
 
     @Test
     fun testCleanUpAddressBooks_deletesAddressBookWithoutAccount() {
         // Create address book account without corresponding account
         assertTrue(accountManager.addAccountExplicitly(addressBookAccount, null, null))
-
-        val addressBookAccounts = accountManager.getAccountsByType(addressBookAccountType)
-        assertEquals(addressBookAccount, addressBookAccounts.firstOrNull())
+        assertEquals(listOf(addressBookAccount), accountManager.getAccountsByType(addressBookAccountType).toList())
 
         // Create worker and run the method
         val worker = TestListenableWorkerBuilder<AccountsCleanupWorker>(context)
@@ -139,16 +131,14 @@ class AccountsCleanupWorkerTest {
 
     @Test
     fun testCleanUpAddressBooks_keepsAddressBookWithAccount() {
-        TestAccount.provide { account ->
+        TestAccount.provide { existingAccount ->
             // Create address book account _with_ corresponding account and verify
             val userData = Bundle(2).apply {
-                putString(LocalAddressBook.USER_DATA_ACCOUNT_NAME, account.name)
-                putString(LocalAddressBook.USER_DATA_ACCOUNT_TYPE, account.type)
+                putString(LocalAddressBook.USER_DATA_ACCOUNT_NAME, existingAccount.name)
+                putString(LocalAddressBook.USER_DATA_ACCOUNT_TYPE, existingAccount.type)
             }
             assertTrue(accountManager.addAccountExplicitly(addressBookAccount, null, userData))
-
-            val addressBookAccounts = accountManager.getAccountsByType(addressBookAccountType)
-            assertEquals(addressBookAccount, addressBookAccounts.firstOrNull())
+            assertEquals(listOf(addressBookAccount), accountManager.getAccountsByType(addressBookAccountType).toList())
 
             // Create worker and run the method
             val worker = TestListenableWorkerBuilder<AccountsCleanupWorker>(context)
@@ -157,15 +147,15 @@ class AccountsCleanupWorkerTest {
             worker.cleanUpAddressBooks()
 
             // Verify account was _not_ deleted
-            assertEquals(addressBookAccount, addressBookAccounts.firstOrNull())
+            assertEquals(listOf(addressBookAccount), accountManager.getAccountsByType(addressBookAccountType).toList())
         }
     }
 
 
     // helpers
 
-    private fun createTestService(serviceType: String): Service {
-        val service = Service(id=0, accountName="test", type=serviceType, principal = null)
+    private fun createTestService(): Service {
+        val service = Service(id=0, accountName="test", type=Service.TYPE_CARDDAV, principal = null)
         val serviceId = db.serviceDao().insertOrReplace(service)
         return db.serviceDao().get(serviceId)!!
     }

diff --git a/app/src/androidTest/kotlin/at/bitfire/davdroid/sync/account/SystemAccountUtilsTest.kt b/app/src/androidTest/kotlin/at/bitfire/davdroid/sync/account/SystemAccountUtilsTest.kt
@@ -32,11 +32,6 @@ class SystemAccountUtilsTest {
     @Inject
     lateinit var settingsManager: SettingsManager
 
-    val account = Account(
-        "AccountUtilsTest",
-        context.getString(R.string.account_type)
-    )
-
     @Before
     fun setUp() {
         hiltRule.inject()
@@ -49,6 +44,7 @@ class SystemAccountUtilsTest {
         userData.putString("int", "1")
         userData.putString("string", "abc/\"-")
 
+        val account = Account("AccountUtilsTest", context.getString(R.string.account_type))
         val manager = AccountManager.get(context)
         try {
             assertTrue(SystemAccountUtils.createAccount(context, account, userData))

diff --git a/app/src/main/res/xml/sync_calendars.xml b/app/src/main/res/xml/sync_calendars.xml
@@ -1,6 +1,6 @@
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/account_type"
     android:contentAuthority="com.android.calendar"
+    android:accountType="@string/account_type"
     android:userVisible="false"
-    android:allowParallelSyncs="true"
-    android:supportsUploading="true" />
+    android:supportsUploading="true"
+    android:allowParallelSyncs="true" />
diff --git a/app/src/main/res/xml/sync_contacts.xml b/app/src/main/res/xml/sync_contacts.xml
@@ -1,6 +1,6 @@
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/account_type_address_book"
     android:contentAuthority="com.android.contacts"
+    android:accountType="@string/account_type_address_book"
     android:userVisible="false"
-    android:allowParallelSyncs="true"
-    android:supportsUploading="true" />
+    android:supportsUploading="true"
+    android:allowParallelSyncs="true" />
diff --git a/app/src/main/res/xml/sync_notes.xml b/app/src/main/res/xml/sync_notes.xml
@@ -1,6 +1,6 @@
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/account_type"
     android:contentAuthority="at.techbee.jtx.provider"
+    android:accountType="@string/account_type"
     android:userVisible="false"
-    android:allowParallelSyncs="true"
-    android:supportsUploading="true" />
+    android:supportsUploading="true"
+    android:allowParallelSyncs="true" />
diff --git a/app/src/main/res/xml/sync_opentasks.xml b/app/src/main/res/xml/sync_opentasks.xml
@@ -1,6 +1,6 @@
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/account_type"
     android:contentAuthority="org.dmfs.tasks"
+    android:accountType="@string/account_type"
     android:userVisible="false"
-    android:allowParallelSyncs="true"
-    android:supportsUploading="true" />
+    android:supportsUploading="true"
+    android:allowParallelSyncs="true" />
diff --git a/app/src/main/res/xml/sync_tasks_org.xml b/app/src/main/res/xml/sync_tasks_org.xml
@@ -1,6 +1,6 @@
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="@string/account_type"
     android:contentAuthority="org.tasks.opentasks"
+    android:accountType="@string/account_type"
     android:userVisible="false"
-    android:allowParallelSyncs="true"
-    android:supportsUploading="true" />
+    android:supportsUploading="true"
+    android:allowParallelSyncs="true" />