[db] Move InstantTaskExecutorRule into base DbTest class

so all tests can use LiveData helper methods such as getOrFail() without worrying about that rule
This commit is contained in:
Torsten Grote
2023-11-02 12:10:56 -03:00
parent 704234c9df
commit 5c27f7033e
5 changed files with 5 additions and 19 deletions

View File

@@ -1,17 +1,12 @@
package org.fdroid.database
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import org.fdroid.test.TestAppUtils.getRandomMetadataV2
import org.fdroid.test.TestRepoUtils.getRandomFileV2
import org.fdroid.test.TestUtils.getRandomString
import org.fdroid.test.TestUtils.sort
import org.junit.Rule
internal abstract class AppTest : DbTest() {
@get:Rule
val instantTaskExecutorRule = InstantTaskExecutorRule()
protected val packageName = getRandomString()
protected val packageName1 = getRandomString()
protected val packageName2 = getRandomString()

View File

@@ -3,6 +3,7 @@ package org.fdroid.database
import android.content.Context
import android.content.res.AssetManager
import android.os.Build
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.core.os.LocaleListCompat
import androidx.room.Room
import androidx.test.core.app.ApplicationProvider.getApplicationContext
@@ -22,6 +23,7 @@ import org.fdroid.test.VerifierConstants.CERTIFICATE
import org.junit.After
import org.junit.Assume.assumeTrue
import org.junit.Before
import org.junit.Rule
import java.io.IOException
import java.util.Locale
import kotlin.test.assertEquals
@@ -29,6 +31,9 @@ import kotlin.test.fail
internal abstract class DbTest {
@get:Rule
val instantTaskExecutorRule = InstantTaskExecutorRule()
internal lateinit var repoDao: RepositoryDaoInt
internal lateinit var appDao: AppDaoInt
internal lateinit var appPrefsDao: AppPrefsDaoInt

View File

@@ -1,6 +1,5 @@
package org.fdroid.database
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.fdroid.database.TestUtils.assertRepoEquals
import org.fdroid.database.TestUtils.getOrFail
@@ -9,7 +8,6 @@ import org.fdroid.test.TestRepoUtils.getRandomRepo
import org.fdroid.test.TestUtils.getRandomString
import org.fdroid.test.TestUtils.orNull
import org.fdroid.test.TestVersionUtils.getRandomPackageVersionV2
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import kotlin.random.Random
@@ -22,9 +20,6 @@ import kotlin.test.fail
@RunWith(AndroidJUnit4::class)
internal class RepositoryDaoTest : DbTest() {
@get:Rule
val instantTaskExecutorRule = InstantTaskExecutorRule()
@Test
fun testInsertInitialRepository() {
val repo = InitialRepository(

View File

@@ -1,6 +1,5 @@
package org.fdroid.database
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.fdroid.database.TestUtils.getOrFail
import org.fdroid.index.v2.PackageVersionV2
@@ -8,7 +7,6 @@ import org.fdroid.test.TestAppUtils.getRandomMetadataV2
import org.fdroid.test.TestRepoUtils.getRandomRepo
import org.fdroid.test.TestUtils.getRandomString
import org.fdroid.test.TestVersionUtils.getRandomPackageVersionV2
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import kotlin.random.Random
@@ -18,9 +16,6 @@ import kotlin.test.fail
@RunWith(AndroidJUnit4::class)
internal class VersionTest : DbTest() {
@get:Rule
val instantTaskExecutorRule = InstantTaskExecutorRule()
private val packageName = getRandomString()
private val packageVersion1 = getRandomPackageVersionV2()
private val packageVersion2 = getRandomPackageVersionV2()

View File

@@ -2,7 +2,6 @@ package org.fdroid.index.v1
import android.Manifest
import android.net.Uri
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import io.mockk.Runs
import io.mockk.every
@@ -39,9 +38,6 @@ internal class IndexV1UpdaterTest : DbTest() {
@get:Rule
var tmpFolder: TemporaryFolder = TemporaryFolder()
@get:Rule
val instantTaskExecutorRule = InstantTaskExecutorRule()
private val tempFileProvider: TempFileProvider = mockk()
private val downloaderFactory: DownloaderFactory = mockk()
private val downloader: Downloader = mockk()