Add test for groups

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalAddressBookTest.kt

@@ -19,6 +19,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import ezvcard.property.Telephone
+import org.junit.After
 import org.junit.AfterClass
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -44,10 +45,21 @@ class LocalAddressBookTest {
     @ApplicationContext
     lateinit var context: Context
 
+    lateinit var addressBook: LocalTestAddressBook
+
 
     @Before
-    fun setup() {
+    fun setUp() {
         hiltRule.inject()
+
+        addressBook = addressbookFactory.create(provider, GroupMethod.CATEGORIES)
+        LocalTestAddressBook.createAccount(context)
+    }
+
+    @After
+    fun tearDown() {
+        // remove address book
+        addressBook.deleteCollection()
     }
 
 
@@ -56,42 +68,62 @@ class LocalAddressBookTest {
      */
     @Test
     fun test_renameAccount_retainsContacts() {
-        val addressBook = addressbookFactory.create(provider, GroupMethod.CATEGORIES)
-        LocalTestAddressBook.createAccount(context)
-        try {
-            // insert contact with data row
-            val uid = "12345"
-            val contact = Contact(
-                uid = uid,
-                displayName = "Test Contact",
-                phoneNumbers = LinkedList(listOf(LabeledProperty(Telephone("1234567890"))))
-            )
-            val uri = LocalContact(addressBook, contact, null, null, 0).add()
-            val id = ContentUris.parseId(uri)
-            val localContact = addressBook.findContactById(id)
-            localContact.resetDirty()
-            assertFalse("Contact is dirty before moving", addressBook.isContactDirty(id))
-
-            // rename address book
-            val newName = "New Name"
-            addressBook.renameAccount(newName)
-            assertEquals(Account(newName, LocalTestAddressBook.ACCOUNT.type), addressBook.account)
-
-            // check whether contact is still here (including data rows) and not dirty
-            val result = addressBook.findContactById(id)
-            assertFalse("Contact is dirty after moving", addressBook.isContactDirty(id))
-
-            val contact2 = result.getContact()
-            assertEquals(uid, contact2.uid)
-            assertEquals(contact.displayName, contact2.displayName)
-            assertEquals(contact.phoneNumbers.first().component1().text, contact2.phoneNumbers.first().component1().text)
-
-        } finally {
-            // clean up / remove address book
-            addressBook.deleteCollection()
-        }
+        // insert contact with data row
+        val uid = "12345"
+        val contact = Contact(
+            uid = uid,
+            displayName = "Test Contact",
+            phoneNumbers = LinkedList(listOf(LabeledProperty(Telephone("1234567890"))))
+        )
+        val uri = LocalContact(addressBook, contact, null, null, 0).add()
+        val id = ContentUris.parseId(uri)
+        val localContact = addressBook.findContactById(id)
+        localContact.resetDirty()
+        assertFalse("Contact is dirty before moving", addressBook.isContactDirty(id))
+
+        // rename address book
+        val newName = "New Name"
+        addressBook.renameAccount(newName)
+        assertEquals(Account(newName, LocalTestAddressBook.ACCOUNT.type), addressBook.account)
+
+        // check whether contact is still here (including data rows) and not dirty
+        val result = addressBook.findContactById(id)
+        assertFalse("Contact is dirty after moving", addressBook.isContactDirty(id))
+
+        val contact2 = result.getContact()
+        assertEquals(uid, contact2.uid)
+        assertEquals("Test Contact", contact2.displayName)
+        assertEquals("1234567890", contact2.phoneNumbers.first().component1().text)
     }
 
+    /**
+     * Tests whether groups are moved (and not lost) when an address book is renamed.
+     */
+    @Test
+    fun test_renameAccount_retainsGroups() {
+        // insert group
+        val localGroup = LocalGroup(addressBook, Contact(displayName = "Test Group"), null, null, 0)
+        val uri = localGroup.add()
+        val id = ContentUris.parseId(uri)
+
+        // make sure it's not dirty
+        localGroup.clearDirty(null, null, null)
+        assertFalse("Group is dirty before moving", addressBook.isGroupDirty(id))
+
+        // rename address book
+        val newName = "New Name"
+        addressBook.renameAccount(newName)
+        assertEquals(Account(newName, LocalTestAddressBook.ACCOUNT.type), addressBook.account)
+
+        // check whether group is still here and not dirty
+        val result = addressBook.findGroupById(id)
+        assertFalse("Group is dirty after moving", addressBook.isGroupDirty(id))
+
+        val group = result.getContact()
+        assertEquals("Test Group", group.displayName)
+    }
+
+
 
     companion object {
 

app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalTestAddressBook.kt

@@ -66,6 +66,22 @@ class LocalTestAddressBook @AssistedInject constructor(
         throw FileNotFoundException()
     }
 
+    /**
+     * Returns the dirty flag of the given contact group.
+     *
+     * @return true if the group is dirty, false otherwise
+     *
+     * @throws FileNotFoundException if the group can't be found
+     */
+    fun isGroupDirty(id: Long): Boolean {
+        val uri = ContentUris.withAppendedId(groupsSyncUri(), id)
+        provider!!.query(uri, arrayOf(ContactsContract.Groups.DIRTY), null, null, null)?.use { cursor ->
+            if (cursor.moveToFirst())
+                return cursor.getInt(0) != 0
+        }
+        throw FileNotFoundException()
+    }
+
 
     companion object {