44
55package at.bitfire.davdroid.sync
66
7+ import android.accounts.Account
78import android.content.ContentProviderClient
89import android.content.Context
910import at.bitfire.davdroid.db.Collection
@@ -24,6 +25,7 @@ import dagger.hilt.android.testing.HiltAndroidTest
2425import okhttp3.HttpUrl.Companion.toHttpUrl
2526import org.junit.After
2627import org.junit.Assert.assertEquals
28+ import org.junit.Assume.assumeNotNull
2729import org.junit.Assume.assumeTrue
2830import org.junit.Before
2931import org.junit.Rule
@@ -61,7 +63,7 @@ class JtxSyncManagerTest {
6163 @get:Rule
6264 val permissionRule = GrantPermissionOrSkipRule (TaskProvider .PERMISSIONS_JTX .toSet())
6365
64- private val account = TestAccount .create()
66+ lateinit var account: Account
6567
6668 private lateinit var provider: ContentProviderClient
6769 private lateinit var syncManager: JtxSyncManager
@@ -75,7 +77,11 @@ class JtxSyncManagerTest {
7577 assumeTrue(PermissionUtils .havePermissions(context, TaskProvider .PERMISSIONS_JTX ))
7678
7779 // Acquire the jtx content provider
78- provider = context.contentResolver.acquireContentProviderClient(JtxContract .AUTHORITY )!!
80+ val providerOrNull = context.contentResolver.acquireContentProviderClient(JtxContract .AUTHORITY )
81+ assumeNotNull(providerOrNull)
82+ provider = providerOrNull!!
83+
84+ account = TestAccount .create()
7985
8086 // Create dummy dependencies
8187 val service = Service (0 , account.name, Service .TYPE_CALDAV , null )
@@ -102,9 +108,12 @@ class JtxSyncManagerTest {
102108 if (this ::localJtxCollection.isInitialized)
103109 localJtxCollectionStore.delete(localJtxCollection)
104110 serviceRepository.deleteAllBlocking()
111+
105112 if (this ::provider.isInitialized)
106113 provider.closeCompat()
107- TestAccount .remove(account)
114+
115+ if (this ::account.isInitialized)
116+ TestAccount .remove(account)
108117 }
109118
110119
0 commit comments