refactor: rename AppInstallRequestFactory to InstallationRequest (9aed1c57) · Commits · e / os / App Lounge

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ import foundation.e.apps.data.application.data.Application
		import foundation.e.apps.data.enums.ResultStatus
		import foundation.e.apps.data.install.AppInstallComponents
		import foundation.e.apps.data.install.models.AppInstall
		import foundation.e.apps.data.install.core.helper.AppInstallRequestFactory
		import foundation.e.apps.data.install.core.helper.InstallationRequest
		import foundation.e.apps.data.install.core.helper.AppInstallStartCoordinator
		import foundation.e.apps.data.install.core.helper.AppInstallWorkRunner
		import foundation.e.apps.domain.model.install.Status
		@@ -32,7 +32,7 @@ class AppInstallProcessor @Inject constructor(
		private val appInstallComponents: AppInstallComponents,
		private val appInstallStartCoordinator: AppInstallStartCoordinator,
		private val appInstallWorkRunner: AppInstallWorkRunner,
		private val appInstallRequestFactory: AppInstallRequestFactory,
		private val installationRequest: InstallationRequest,
		) {
		/**
		* creates [foundation.e.apps.data.install.models.AppInstall] from [foundation.e.apps.data.application.data.Application] and enqueues into WorkManager to run install process.
		@@ -44,7 +44,7 @@ class AppInstallProcessor @Inject constructor(
		application: Application,
		isAnUpdate: Boolean = false
		): Boolean {
		val appInstall = appInstallRequestFactory.create(application)
		val appInstall = installationRequest.create(application)

		val isUpdate = isAnUpdate \|\|
		application.status == Status.UPDATABLE \|\|

app/src/main/java/foundation/e/apps/data/install/core/helper/AppInstallRequestFactory.kt→app/src/main/java/foundation/e/apps/data/install/core/helper/InstallationRequest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import foundation.e.apps.data.enums.Type
		import foundation.e.apps.data.install.models.AppInstall
		import javax.inject.Inject

		class AppInstallRequestFactory @Inject constructor() {
		class InstallationRequest @Inject constructor() {
		fun create(application: Application): AppInstall {
		val appInstall = AppInstall(
		application._id,

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ import foundation.e.apps.data.install.AppInstallRepository
		import foundation.e.apps.data.install.AppManagerWrapper
		import foundation.e.apps.data.install.models.AppInstall
		import foundation.e.apps.data.install.core.AppInstallProcessor
		import foundation.e.apps.data.install.core.helper.AppInstallRequestFactory
		import foundation.e.apps.data.install.core.helper.InstallationRequest
		import foundation.e.apps.data.install.core.helper.AppInstallStartCoordinator
		import foundation.e.apps.data.install.core.helper.AppInstallWorkRunner
		import foundation.e.apps.util.MainCoroutineRule
		@@ -55,7 +55,7 @@ class AppInstallProcessorTest {

		private lateinit var appManagerWrapper: AppManagerWrapper
		private lateinit var appInstallProcessor: AppInstallProcessor
		private lateinit var appInstallRequestFactory: AppInstallRequestFactory
		private lateinit var installationRequest: InstallationRequest
		private lateinit var appInstallStartCoordinator: AppInstallStartCoordinator
		private lateinit var appInstallWorkRunner: AppInstallWorkRunner

		@@ -64,7 +64,7 @@ class AppInstallProcessorTest {
		appManagerWrapper = mockk(relaxed = true)
		val appInstallRepository = mockk<AppInstallRepository>(relaxed = true)
		val appInstallComponents = AppInstallComponents(appInstallRepository, appManagerWrapper)
		appInstallRequestFactory = mockk(relaxed = true)
		installationRequest = mockk(relaxed = true)
		appInstallStartCoordinator = mockk(relaxed = true)
		appInstallWorkRunner = mockk(relaxed = true)

		@@ -72,7 +72,7 @@ class AppInstallProcessorTest {
		appInstallComponents,
		appInstallStartCoordinator,
		appInstallWorkRunner,
		appInstallRequestFactory
		installationRequest
		)
		}

		@@ -87,7 +87,7 @@ class AppInstallProcessorTest {
		type = Type.NATIVE
		)
		val appInstall = AppInstall(id = "123", packageName = "com.example.app")
		coEvery { appInstallRequestFactory.create(application) } returns appInstall
		coEvery { installationRequest.create(application) } returns appInstall
		coEvery { appManagerWrapper.isFusedDownloadInstalled(appInstall) } returns false
		coEvery {
		appInstallStartCoordinator.enqueue(
		@@ -100,7 +100,7 @@ class AppInstallProcessorTest {
		val result = appInstallProcessor.initAppInstall(application)

		assertTrue(result)
		coVerify { appInstallRequestFactory.create(application) }
		coVerify { installationRequest.create(application) }
		coVerify { appInstallStartCoordinator.enqueue(appInstall, true, application.isSystemApp) }
		}

app/src/test/java/foundation/e/apps/installProcessor/AppInstallRequestFactoryTest.kt→app/src/test/java/foundation/e/apps/installProcessor/InstallationRequestTest.kt

+9 −9

Original line number	Diff line number	Diff line
		@@ -22,19 +22,19 @@ import com.aurora.gplayapi.data.models.ContentRating
		import foundation.e.apps.data.application.data.Application
		import foundation.e.apps.data.enums.Source
		import foundation.e.apps.data.enums.Type
		import foundation.e.apps.data.install.core.helper.AppInstallRequestFactory
		import foundation.e.apps.data.install.core.helper.InstallationRequest
		import foundation.e.apps.domain.model.install.Status
		import org.junit.Assert.assertEquals
		import org.junit.Assert.assertTrue
		import org.junit.Before
		import org.junit.Test

		class AppInstallRequestFactoryTest {
		private lateinit var factory: AppInstallRequestFactory
		class InstallationRequestTest {
		private lateinit var installationRequest: InstallationRequest

		@Before
		fun setup() {
		factory = AppInstallRequestFactory()
		installationRequest = InstallationRequest()
		}

		@Test
		@@ -53,7 +53,7 @@ class AppInstallRequestFactoryTest {
		originalSize = 2048L
		)

		val appInstall = factory.create(application)
		val appInstall = installationRequest.create(application)

		assertEquals("123", appInstall.id)
		assertEquals(Source.PLAY_STORE, appInstall.source)
		@@ -73,7 +73,7 @@ class AppInstallRequestFactoryTest {
		val contentRating = ContentRating()
		val application = Application(contentRating = contentRating)

		val appInstall = factory.create(application)
		val appInstall = installationRequest.create(application)

		assertEquals(contentRating, appInstall.contentRating)
		}
		@@ -82,7 +82,7 @@ class AppInstallRequestFactoryTest {
		fun create_initializesDirectUrlForPwa() {
		val application = Application(type = Type.PWA, url = "https://example.com")

		val appInstall = factory.create(application)
		val appInstall = installationRequest.create(application)

		assertEquals(mutableListOf("https://example.com"), appInstall.downloadURLList)
		}
		@@ -91,7 +91,7 @@ class AppInstallRequestFactoryTest {
		fun create_initializesDirectUrlForSystemApp() {
		val application = Application(source = Source.SYSTEM_APP, url = "file://app.apk")

		val appInstall = factory.create(application)
		val appInstall = installationRequest.create(application)

		assertEquals(mutableListOf("file://app.apk"), appInstall.downloadURLList)
		}
		@@ -101,7 +101,7 @@ class AppInstallRequestFactoryTest {
		val application =
		Application(source = Source.PLAY_STORE, type = Type.NATIVE, url = "ignored")

		val appInstall = factory.create(application)
		val appInstall = installationRequest.create(application)

		assertTrue(appInstall.downloadURLList.isEmpty())
		}