Assume initial state for test updatesOwnerAccount (#1874)

* Assume initial state

Signed-off-by: Sunik Kupfer <kupfer@bitfire.at>

* Enhance comment

Signed-off-by: Sunik Kupfer <kupfer@bitfire.at>

* Don't pass provider

Signed-off-by: Sunik Kupfer <kupfer@bitfire.at>

---------

Signed-off-by: Sunik Kupfer <kupfer@bitfire.at>
This commit is contained in:
Sunik Kupfer
2025-12-11 14:16:03 +01:00
committed by GitHub
parent cc43998148
commit 84d58f73db

View File

@@ -20,6 +20,7 @@ import dagger.hilt.android.testing.HiltAndroidRule
import dagger.hilt.android.testing.HiltAndroidTest
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assume
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@@ -63,8 +64,8 @@ class LocalCalendarStoreTest {
@Test
fun testUpdateAccount_updatesOwnerAccount() {
// Verify initial state
verifyOwnerAccountIs(provider, "InitialAccountName")
// Verify initial state (assume to skip and prevent flaky test failures)
Assume.assumeTrue("InitialAccountName" == getOwnerAccount())
// Rename account
val oldAccount = account
@@ -74,7 +75,7 @@ class LocalCalendarStoreTest {
localCalendarStore.updateAccount(oldAccount, account, provider)
// Verify [Calendar.OWNER_ACCOUNT] of local calendar was updated
verifyOwnerAccountIs(provider, "ChangedAccountName")
assertEquals("ChangedAccountName", getOwnerAccount())
}
@@ -95,7 +96,7 @@ class LocalCalendarStoreTest {
)
)!!.asSyncAdapter(account)
private fun verifyOwnerAccountIs(provider: ContentProviderClient, expectedOwnerAccount: String) {
private fun getOwnerAccount(): String {
provider.query(
calendarUri,
arrayOf(Calendars.OWNER_ACCOUNT),
@@ -104,8 +105,7 @@ class LocalCalendarStoreTest {
null
)!!.use { cursor ->
cursor.moveToNext()
val ownerAccount = cursor.getString(0)
assertEquals(expectedOwnerAccount, ownerAccount)
return cursor.getString(0)
}
}