Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit ccf4d93a authored by Fahim M. Choudhury's avatar Fahim M. Choudhury
Browse files

refactor: rename AppInstallWorkRunner to InstallationProcessor

parent 07804c83

app/src/main/java/foundation/e/apps/data/install/core/AppInstallationFacade.kt

+3 −3
Original line number Diff line number Diff line
@@ -24,14 +24,14 @@ import foundation.e.apps.data.install.AppInstallComponents 
import foundation.e.apps.data.install.models.AppInstall

import foundation.e.apps.data.install.core.helper.InstallationRequest

import foundation.e.apps.data.install.core.helper.InstallationEnqueuer

import foundation.e.apps.data.install.core.helper.AppInstallWorkRunner

import foundation.e.apps.data.install.core.helper.InstallationProcessor

import foundation.e.apps.domain.model.install.Status

import javax.inject.Inject



class AppInstallationFacade @Inject constructor(

    private val appInstallComponents: AppInstallComponents,

    private val installationEnqueuer: InstallationEnqueuer,

    private val appInstallWorkRunner: AppInstallWorkRunner,

    private val installationProcessor: InstallationProcessor,

    private val installationRequest: InstallationRequest,

) {

    /**
@@ -73,6 +73,6 @@ class AppInstallationFacade @Inject constructor( 
        isItUpdateWork: Boolean,

        runInForeground: (suspend (String) -> Unit)

    ): Result<ResultStatus> {

        return appInstallWorkRunner.processInstall(fusedDownloadId, isItUpdateWork, runInForeground)

        return installationProcessor.processInstall(fusedDownloadId, isItUpdateWork, runInForeground)

    }

}

app/src/main/java/foundation/e/apps/data/install/core/helper/AppInstallWorkRunner.kt→app/src/main/java/foundation/e/apps/data/install/core/helper/InstallationProcessor.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import kotlinx.coroutines.flow.transformWhile 
import timber.log.Timber

import javax.inject.Inject



class AppInstallWorkRunner @Inject constructor(

class InstallationProcessor @Inject constructor(

    private val appInstallRepository: AppInstallRepository,

    private val appManagerWrapper: AppManagerWrapper,

    private val downloadManager: DownloadManagerUtils,

app/src/test/java/foundation/e/apps/installProcessor/AppInstallationFacadeTest.kt

+6 −6
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import foundation.e.apps.data.install.models.AppInstall 
import foundation.e.apps.data.install.core.AppInstallationFacade

import foundation.e.apps.data.install.core.helper.InstallationRequest

import foundation.e.apps.data.install.core.helper.InstallationEnqueuer

import foundation.e.apps.data.install.core.helper.AppInstallWorkRunner

import foundation.e.apps.data.install.core.helper.InstallationProcessor

import foundation.e.apps.util.MainCoroutineRule

import io.mockk.coEvery

import io.mockk.coVerify
@@ -57,7 +57,7 @@ class AppInstallationFacadeTest { 
    private lateinit var appInstallationFacade: AppInstallationFacade

    private lateinit var installationRequest: InstallationRequest

    private lateinit var installationEnqueuer: InstallationEnqueuer

    private lateinit var appInstallWorkRunner: AppInstallWorkRunner

    private lateinit var installationProcessor: InstallationProcessor



    @Before

    fun setup() {
@@ -66,12 +66,12 @@ class AppInstallationFacadeTest { 
        val appInstallComponents = AppInstallComponents(appInstallRepository, appManagerWrapper)

        installationRequest = mockk(relaxed = true)

        installationEnqueuer = mockk(relaxed = true)

        appInstallWorkRunner = mockk(relaxed = true)

        installationProcessor = mockk(relaxed = true)



        appInstallationFacade = AppInstallationFacade(

            appInstallComponents,

            installationEnqueuer,

            appInstallWorkRunner,

            installationProcessor,

            installationRequest

        )

    }
@@ -118,7 +118,7 @@ class AppInstallationFacadeTest { 
    @Test

    fun processInstall_delegatesResult() = runTest {

        coEvery {

            appInstallWorkRunner.processInstall("123", false, any())

            installationProcessor.processInstall("123", false, any())

        } returns Result.success(ResultStatus.OK)



        val result = appInstallationFacade.processInstall("123", false) {
@@ -126,6 +126,6 @@ class AppInstallationFacadeTest { 
        }



        assertEquals(ResultStatus.OK, result.getOrNull())

        coVerify { appInstallWorkRunner.processInstall("123", false, any()) }

        coVerify { installationProcessor.processInstall("123", false, any()) }

    }

}

app/src/test/java/foundation/e/apps/installProcessor/AppInstallWorkRunnerTest.kt→app/src/test/java/foundation/e/apps/installProcessor/InstallationProcessorTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import foundation.e.apps.data.install.AppInstallRepository 
import foundation.e.apps.data.install.AppManager

import foundation.e.apps.data.install.download.DownloadManagerUtils

import foundation.e.apps.data.install.models.AppInstall

import foundation.e.apps.data.install.core.helper.AppInstallWorkRunner

import foundation.e.apps.data.install.core.helper.InstallationProcessor

import foundation.e.apps.data.install.core.helper.AppUpdateCompletionHandler

import foundation.e.apps.domain.model.install.Status

import foundation.e.apps.util.MainCoroutineRule
@@ -42,7 +42,7 @@ import org.mockito.Mock 
import org.mockito.MockitoAnnotations



@OptIn(ExperimentalCoroutinesApi::class)

class AppInstallWorkRunnerTest {

class InstallationProcessorTest {

    @Rule

    @JvmField

    val instantExecutorRule = InstantTaskExecutorRule()
@@ -55,7 +55,7 @@ class AppInstallWorkRunnerTest { 
    private lateinit var fakeFusedManagerRepository: FakeAppManagerWrapper

    private lateinit var downloadManagerUtils: DownloadManagerUtils

    private lateinit var appUpdateCompletionHandler: AppUpdateCompletionHandler

    private lateinit var workRunner: AppInstallWorkRunner

    private lateinit var workRunner: InstallationProcessor

    private lateinit var context: Context



    @Mock
@@ -74,7 +74,7 @@ class AppInstallWorkRunnerTest { 
            FakeAppManagerWrapper(fakeFusedDownloadDAO, context, fakeFusedManager, fakeFDroidRepository)

        downloadManagerUtils = mockk(relaxed = true)

        appUpdateCompletionHandler = mockk(relaxed = true)

        workRunner = AppInstallWorkRunner(

        workRunner = InstallationProcessor(

            appInstallRepository,

            fakeFusedManagerRepository,

            downloadManagerUtils,