From fcc9f0c3ed6aede2b270f057d964a5390fb62985 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 20:23:36 +0000 Subject: [PATCH 1/4] fix(deps): update dependency androidx.compose:compose-bom to v2023.08.00 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fac9b6e2..8d517e5c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ androidGradlePlugin = "8.1.0" androidTest = "8.1.0" androidxActivity = "1.7.2" androidxAnnotation = "1.6.0" -androidxComposeBom = "2023.06.01" +androidxComposeBom = "2023.08.00" androidxComposeCompiler = "1.4.7" androidxCore = "1.10.1" androidxCoreTesting = "2.2.0" From 49c42a22ed5a56f47cd774d3ad4db2b373d73c94 Mon Sep 17 00:00:00 2001 From: mslalith Date: Thu, 10 Aug 2023 15:53:38 +0530 Subject: [PATCH 2/4] chore: move minSdk & targetSdk to Version Catalog --- benchmark/build.gradle.kts | 6 +++--- .../src/main/kotlin/AndroidApplicationConventionPlugin.kt | 6 +++++- .../src/main/kotlin/AndroidLibraryConventionPlugin.kt | 2 +- .../kotlin/dev/mslalith/focuslauncher/KotlinAndroid.kt | 8 ++++++-- gradle/libs.versions.toml | 2 ++ 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index cf7a909a..7d4b45d4 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -8,11 +8,11 @@ plugins { android { namespace = "dev.mslalith.focuslauncher.benchmark" - compileSdk = 33 + compileSdk = libs.versions.androidTargetSdk.get().toInt() defaultConfig { - minSdk = 26 - targetSdk = 33 + minSdk = libs.versions.androidMinSdk.get().toInt() + targetSdk = libs.versions.androidTargetSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 2ceea321..c3a0e05a 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -2,10 +2,14 @@ import com.android.build.api.dsl.ApplicationExtension import dev.mslalith.focuslauncher.configureKotlinAndroid import org.gradle.api.Plugin import org.gradle.api.Project +import org.gradle.api.artifacts.VersionCatalogsExtension import org.gradle.kotlin.dsl.configure +import org.gradle.kotlin.dsl.getByType class AndroidApplicationConventionPlugin : Plugin { override fun apply(target: Project) = with(target) { + val libs = extensions.getByType().named("libs") + with(pluginManager) { apply("com.android.application") apply("org.jetbrains.kotlin.android") @@ -14,7 +18,7 @@ class AndroidApplicationConventionPlugin : Plugin { extensions.configure { configureKotlinAndroid(commonExtension = this) - defaultConfig.targetSdk = 33 + defaultConfig.targetSdk = libs.findVersion("androidTargetSdk").get().requiredVersion.toInt() } } } diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index 514c35b3..60dcb701 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -19,7 +19,7 @@ class AndroidLibraryConventionPlugin : Plugin { extensions.configure { configureKotlinAndroid(commonExtension = this) - defaultConfig.targetSdk = 33 + defaultConfig.targetSdk = libs.findVersion("androidTargetSdk").get().requiredVersion.toInt() } } } diff --git a/build-logic/convention/src/main/kotlin/dev/mslalith/focuslauncher/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/dev/mslalith/focuslauncher/KotlinAndroid.kt index fa04bc94..72f58b3e 100644 --- a/build-logic/convention/src/main/kotlin/dev/mslalith/focuslauncher/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/dev/mslalith/focuslauncher/KotlinAndroid.kt @@ -3,16 +3,20 @@ package dev.mslalith.focuslauncher import com.android.build.api.dsl.CommonExtension import org.gradle.api.JavaVersion import org.gradle.api.Project +import org.gradle.api.artifacts.VersionCatalogsExtension import org.gradle.api.plugins.ExtensionAware +import org.gradle.kotlin.dsl.getByType import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions internal fun Project.configureKotlinAndroid( commonExtension: CommonExtension<*, *, *, *, *>, ) = with(commonExtension) { - compileSdk = 33 + val libs = extensions.getByType().named("libs") + + compileSdk = libs.findVersion("androidTargetSdk").get().requiredVersion.toInt() defaultConfig { - minSdk = 26 + minSdk = libs.findVersion("androidMinSdk").get().requiredVersion.toInt() } compileOptions { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8d517e5c..3c9344da 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,8 @@ [versions] accompanist = "0.30.1" androidGradlePlugin = "8.1.0" +androidMinSdk = "26" +androidTargetSdk = "33" androidTest = "8.1.0" androidxActivity = "1.7.2" androidxAnnotation = "1.6.0" From f6aefdc9a16874de6dc3ca264a8d3f8d94b61b55 Mon Sep 17 00:00:00 2001 From: mslalith Date: Thu, 31 Aug 2023 08:33:06 +0530 Subject: [PATCH 3/4] chore: use global configuration for robolectric --- .../core/data/database/MigrationTest.kt | 4 ++-- .../usecase/room/CloseDatabaseUseCaseTest.kt | 4 ++-- .../core/data/repository/AppDrawerRepoTest.kt | 4 ++-- .../core/data/repository/ClockRepoTest.kt | 4 ++-- .../core/data/repository/FavoritesRepoTest.kt | 4 ++-- .../core/data/repository/HiddenAppsRepoTest.kt | 4 ++-- .../data/repository/LunarPhaseDetailsRepoTest.kt | 4 ++-- .../core/data/repository/PlacesRepoTest.kt | 4 ++-- .../core/data/repository/QuotesRepoTest.kt | 4 ++-- .../core/data/repository/ThemeRepoTest.kt | 4 ++-- .../settings/AppDrawerSettingsRepoTest.kt | 4 ++-- .../repository/settings/ClockSettingsRepoTest.kt | 4 ++-- .../repository/settings/GeneralSettingsRepoTest.kt | 4 ++-- .../settings/LunarPhaseSettingsRepoTest.kt | 4 ++-- .../repository/settings/QuotesSettingsRepoTest.kt | 4 ++-- .../apps/GetAllAppsOnIconPackChangeUseCaseTest.kt | 4 ++-- .../domain/apps/GetIconPackIconicAppsUseCaseTest.kt | 4 ++-- .../core/domain/apps/PackageActionUseCaseTest.kt | 4 ++-- .../domain/iconpack/FetchIconPacksUseCaseTest.kt | 4 ++-- .../domain/iconpack/GetIconPackAppsUseCaseTest.kt | 4 ++-- .../core/domain/iconpack/LoadIconPackUseCaseTest.kt | 4 ++-- .../ReloadIconPackAfterFirstLoadUseCaseTest.kt | 4 ++-- .../domain/iconpack/ReloadIconPackUseCaseTest.kt | 4 ++-- .../domain/launcherapps/LoadAllAppsUseCaseTest.kt | 4 ++-- .../core/domain/theme/ChangeThemeUseCaseTest.kt | 4 ++-- .../core/domain/theme/GetThemeUseCaseTest.kt | 4 ++-- .../providers/icons/impl/IconProviderImplTest.kt | 4 ++-- .../core/testing/AppRobolectricTestRunner.kt | 13 +++++++++++++ .../appdrawerpage/AppDrawerPageViewModelTest.kt | 4 ++-- .../feature/clock24/Clock24ViewModelTest.kt | 4 ++-- .../feature/clock24/ClockWidgetKtTest.kt | 4 ++-- .../feature/clock24/CurrentTimeKtTest.kt | 4 ++-- .../feature/favorites/FavoritesViewModelTest.kt | 4 ++-- .../lunarcalendar/LunarCalendarViewModelTest.kt | 4 ++-- .../settingspage/AppDrawerSettingsSheetKtTest.kt | 4 ++-- .../feature/settingspage/SettingsPageKtTest.kt | 4 ++-- .../feature/theme/LauncherThemeViewModelTest.kt | 4 ++-- .../currentplace/CurrentPlaceViewModelTest.kt | 4 ++-- .../editfavorites/EditFavoritesScreenKtTest.kt | 4 ++-- .../editfavorites/EditFavoritesViewModelTest.kt | 4 ++-- .../screens/hideapps/HideAppsScreenKtTest.kt | 4 ++-- .../screens/hideapps/HideAppsViewModelTest.kt | 4 ++-- .../screens/iconpack/IconPackViewModelTest.kt | 4 ++-- .../screens/launcher/LauncherViewModelTest.kt | 4 ++-- 44 files changed, 99 insertions(+), 86 deletions(-) create mode 100644 core/testing/src/main/kotlin/dev/mslalith/focuslauncher/core/testing/AppRobolectricTestRunner.kt diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/database/MigrationTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/database/MigrationTest.kt index d3bb865a..cdedae48 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/database/MigrationTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/database/MigrationTest.kt @@ -6,12 +6,12 @@ import androidx.sqlite.db.SupportSQLiteDatabase import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory import androidx.test.platform.app.InstrumentationRegistry import com.google.common.truth.Truth.assertThat +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) class MigrationTest { private val testDbName = "migration-test" diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/database/usecase/room/CloseDatabaseUseCaseTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/database/usecase/room/CloseDatabaseUseCaseTest.kt index a2ac2300..d04de645 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/database/usecase/room/CloseDatabaseUseCaseTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/database/usecase/room/CloseDatabaseUseCaseTest.kt @@ -5,6 +5,7 @@ import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.data.database.AppDatabase +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import org.junit.Before import org.junit.FixMethodOrder @@ -12,12 +13,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) internal class CloseDatabaseUseCaseTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/AppDrawerRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/AppDrawerRepoTest.kt index d466d57c..6a98421f 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/AppDrawerRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/AppDrawerRepoTest.kt @@ -4,6 +4,7 @@ import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import dagger.hilt.android.testing.HiltTestApplication +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem @@ -12,11 +13,10 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class AppDrawerRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/ClockRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/ClockRepoTest.kt index 80ee36e9..08a1751e 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/ClockRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/ClockRepoTest.kt @@ -5,6 +5,7 @@ import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.common.providers.clock.test.TestClockProvider +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem import dev.mslalith.focuslauncher.core.testing.extensions.instantOf @@ -16,11 +17,10 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class ClockRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/FavoritesRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/FavoritesRepoTest.kt index 2a8b8fe6..3b0d3ceb 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/FavoritesRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/FavoritesRepoTest.kt @@ -7,6 +7,7 @@ import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.data.database.AppDatabase import dev.mslalith.focuslauncher.core.data.dto.toAppRoom import dev.mslalith.focuslauncher.core.model.app.App +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem @@ -17,11 +18,10 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class FavoritesRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/HiddenAppsRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/HiddenAppsRepoTest.kt index 244d32b2..ecbc6309 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/HiddenAppsRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/HiddenAppsRepoTest.kt @@ -7,6 +7,7 @@ import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.data.database.AppDatabase import dev.mslalith.focuslauncher.core.data.dto.toAppRoom import dev.mslalith.focuslauncher.core.model.app.App +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem @@ -17,11 +18,10 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class HiddenAppsRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/LunarPhaseDetailsRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/LunarPhaseDetailsRepoTest.kt index 98aa1836..e470f0cd 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/LunarPhaseDetailsRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/LunarPhaseDetailsRepoTest.kt @@ -13,6 +13,7 @@ import dev.mslalith.focuslauncher.core.model.lunarphase.LunarPhaseDetails import dev.mslalith.focuslauncher.core.model.lunarphase.NextPhaseDetails import dev.mslalith.focuslauncher.core.model.lunarphase.RiseAndSetDetails import dev.mslalith.focuslauncher.core.model.lunarphase.UpcomingLunarPhase +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem import dev.mslalith.focuslauncher.core.testing.extensions.instantOf @@ -23,11 +24,10 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class LunarPhaseDetailsRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/PlacesRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/PlacesRepoTest.kt index df036833..b3a6593f 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/PlacesRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/PlacesRepoTest.kt @@ -6,6 +6,7 @@ import dagger.hilt.android.testing.HiltAndroidTest import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.data.utils.dummyPlaceFor import dev.mslalith.focuslauncher.core.model.location.LatLng +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import javax.inject.Inject import kotlinx.coroutines.runBlocking @@ -13,11 +14,10 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class PlacesRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/QuotesRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/QuotesRepoTest.kt index 4f1b257b..397fce4d 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/QuotesRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/QuotesRepoTest.kt @@ -11,6 +11,7 @@ import dev.mslalith.focuslauncher.core.data.database.AppDatabase import dev.mslalith.focuslauncher.core.data.utils.dummyQuoteFor import dev.mslalith.focuslauncher.core.model.Constants.Defaults.QUOTES_LIMIT_PER_PAGE import dev.mslalith.focuslauncher.core.model.Quote +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem import javax.inject.Inject @@ -20,11 +21,10 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class QuotesRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/ThemeRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/ThemeRepoTest.kt index e79ec7b0..54e2d2b1 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/ThemeRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/ThemeRepoTest.kt @@ -6,17 +6,17 @@ import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.data.helpers.verifyChange import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.General.DEFAULT_THEME import dev.mslalith.focuslauncher.core.model.Theme +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import javax.inject.Inject import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class ThemeRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/AppDrawerSettingsRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/AppDrawerSettingsRepoTest.kt index bc332400..fdc642fe 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/AppDrawerSettingsRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/AppDrawerSettingsRepoTest.kt @@ -11,17 +11,17 @@ import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.AppDraw import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.AppDrawer.DEFAULT_APP_ICONS import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.AppDrawer.DEFAULT_SEARCH_BAR import dev.mslalith.focuslauncher.core.model.appdrawer.AppDrawerIconViewType +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import javax.inject.Inject import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class AppDrawerSettingsRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/ClockSettingsRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/ClockSettingsRepoTest.kt index 76328212..aed4f60e 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/ClockSettingsRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/ClockSettingsRepoTest.kt @@ -8,17 +8,17 @@ import dev.mslalith.focuslauncher.core.model.ClockAlignment import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.Clock.DEFAULT_CLOCK_24_ANIMATION_DURATION import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.Clock.DEFAULT_CLOCK_ALIGNMENT import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.Clock.DEFAULT_SHOW_CLOCK_24 +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import javax.inject.Inject import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class ClockSettingsRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/GeneralSettingsRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/GeneralSettingsRepoTest.kt index 50a8c685..ea28499e 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/GeneralSettingsRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/GeneralSettingsRepoTest.kt @@ -10,17 +10,17 @@ import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.General import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.General.DEFAULT_NOTIFICATION_SHADE import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.General.DEFAULT_STATUS_BAR import dev.mslalith.focuslauncher.core.model.IconPackType +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import javax.inject.Inject import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class GeneralSettingsRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/LunarPhaseSettingsRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/LunarPhaseSettingsRepoTest.kt index 1d06c013..6b267697 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/LunarPhaseSettingsRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/LunarPhaseSettingsRepoTest.kt @@ -10,17 +10,17 @@ import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.LunarPh import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.LunarPhase.DEFAULT_SHOW_UPCOMING_PHASE_DETAILS import dev.mslalith.focuslauncher.core.model.CurrentPlace import dev.mslalith.focuslauncher.core.model.location.LatLng +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import javax.inject.Inject import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class LunarPhaseSettingsRepoTest : CoroutineTest() { diff --git a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/QuotesSettingsRepoTest.kt b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/QuotesSettingsRepoTest.kt index 0df88c69..74d6e43b 100644 --- a/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/QuotesSettingsRepoTest.kt +++ b/core/data/src/test/kotlin/dev/mslalith/focuslauncher/core/data/repository/settings/QuotesSettingsRepoTest.kt @@ -5,17 +5,17 @@ import dagger.hilt.android.testing.HiltAndroidTest import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.data.helpers.verifyChange import dev.mslalith.focuslauncher.core.model.Constants.Defaults.Settings.Quotes.DEFAULT_SHOW_QUOTES +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import javax.inject.Inject import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class QuotesSettingsRepoTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/GetAllAppsOnIconPackChangeUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/GetAllAppsOnIconPackChangeUseCaseTest.kt index 1e8db402..168039b8 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/GetAllAppsOnIconPackChangeUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/GetAllAppsOnIconPackChangeUseCaseTest.kt @@ -13,6 +13,7 @@ import dev.mslalith.focuslauncher.core.launcherapps.providers.icons.test.TestIco import dev.mslalith.focuslauncher.core.model.IconPackType import dev.mslalith.focuslauncher.core.model.app.App import dev.mslalith.focuslauncher.core.model.appdrawer.AppDrawerItem +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.disableAsSystem @@ -25,12 +26,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) internal class GetAllAppsOnIconPackChangeUseCaseTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/GetIconPackIconicAppsUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/GetIconPackIconicAppsUseCaseTest.kt index 826672cb..d308c000 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/GetIconPackIconicAppsUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/GetIconPackIconicAppsUseCaseTest.kt @@ -16,6 +16,7 @@ import dev.mslalith.focuslauncher.core.launcherapps.providers.icons.test.TestIco import dev.mslalith.focuslauncher.core.model.IconPackType import dev.mslalith.focuslauncher.core.model.app.App import dev.mslalith.focuslauncher.core.model.app.AppWithIcon +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.disableAsSystem @@ -28,12 +29,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) internal class GetIconPackIconicAppsUseCaseTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/PackageActionUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/PackageActionUseCaseTest.kt index 75bf7f73..b545bc51 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/PackageActionUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/apps/PackageActionUseCaseTest.kt @@ -12,6 +12,7 @@ import dev.mslalith.focuslauncher.core.domain.PackageActionUseCase import dev.mslalith.focuslauncher.core.launcherapps.manager.launcherapps.test.TestLauncherAppsManager import dev.mslalith.focuslauncher.core.model.PackageAction import dev.mslalith.focuslauncher.core.model.app.AppWithComponent +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.disableAsSystem @@ -27,12 +28,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class PackageActionUseCaseTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/FetchIconPacksUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/FetchIconPacksUseCaseTest.kt index 264bdb60..2142daa2 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/FetchIconPacksUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/FetchIconPacksUseCaseTest.kt @@ -2,6 +2,7 @@ package dev.mslalith.focuslauncher.core.domain.iconpack import com.google.common.truth.Truth.assertThat import dev.mslalith.focuslauncher.core.domain.utils.toIconPacks +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem @@ -11,9 +12,8 @@ import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class FetchIconPacksUseCaseTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/GetIconPackAppsUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/GetIconPackAppsUseCaseTest.kt index 2d8b07ce..44ceb9ed 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/GetIconPackAppsUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/GetIconPackAppsUseCaseTest.kt @@ -6,6 +6,7 @@ import dagger.hilt.android.testing.HiltAndroidTest import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.data.repository.AppDrawerRepo import dev.mslalith.focuslauncher.core.domain.utils.toIconPacks +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem @@ -16,12 +17,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class GetIconPackAppsUseCaseTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/LoadIconPackUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/LoadIconPackUseCaseTest.kt index 3a510aea..38cc1bb5 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/LoadIconPackUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/LoadIconPackUseCaseTest.kt @@ -4,6 +4,7 @@ import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import dev.mslalith.focuslauncher.core.model.IconPackLoadEvent import dev.mslalith.focuslauncher.core.model.IconPackType +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.launcherapps.TestIconPackManager import kotlinx.coroutines.launch @@ -12,9 +13,8 @@ import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class LoadIconPackUseCaseTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/ReloadIconPackAfterFirstLoadUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/ReloadIconPackAfterFirstLoadUseCaseTest.kt index ff9de75f..096a3571 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/ReloadIconPackAfterFirstLoadUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/ReloadIconPackAfterFirstLoadUseCaseTest.kt @@ -4,6 +4,7 @@ import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import dev.mslalith.focuslauncher.core.model.IconPackLoadEvent import dev.mslalith.focuslauncher.core.model.IconPackType +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.launcherapps.TestIconPackManager import kotlinx.coroutines.launch @@ -12,9 +13,8 @@ import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class ReloadIconPackAfterFirstLoadUseCaseTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/ReloadIconPackUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/ReloadIconPackUseCaseTest.kt index 521321e7..8dbf5eba 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/ReloadIconPackUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/iconpack/ReloadIconPackUseCaseTest.kt @@ -4,6 +4,7 @@ import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import dev.mslalith.focuslauncher.core.model.IconPackLoadEvent import dev.mslalith.focuslauncher.core.model.IconPackType +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.launcherapps.TestIconPackManager import kotlinx.coroutines.launch @@ -12,9 +13,8 @@ import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class ReloadIconPackUseCaseTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/launcherapps/LoadAllAppsUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/launcherapps/LoadAllAppsUseCaseTest.kt index 638fa37a..4d0ea3f2 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/launcherapps/LoadAllAppsUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/launcherapps/LoadAllAppsUseCaseTest.kt @@ -7,6 +7,7 @@ import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.data.database.usecase.room.CloseDatabaseUseCase import dev.mslalith.focuslauncher.core.data.repository.AppDrawerRepo import dev.mslalith.focuslauncher.core.launcherapps.manager.launcherapps.test.TestLauncherAppsManager +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem @@ -20,12 +21,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class LoadAllAppsUseCaseTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/theme/ChangeThemeUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/theme/ChangeThemeUseCaseTest.kt index b7334143..f824df32 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/theme/ChangeThemeUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/theme/ChangeThemeUseCaseTest.kt @@ -7,6 +7,7 @@ import dagger.hilt.android.testing.HiltAndroidTest import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.data.repository.ThemeRepo import dev.mslalith.focuslauncher.core.model.Theme +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem import org.junit.Before @@ -15,12 +16,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) internal class ChangeThemeUseCaseTest : CoroutineTest() { diff --git a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/theme/GetThemeUseCaseTest.kt b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/theme/GetThemeUseCaseTest.kt index a242fe3b..bfe9d340 100644 --- a/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/theme/GetThemeUseCaseTest.kt +++ b/core/domain/src/test/kotlin/dev/mslalith/focuslauncher/core/domain/theme/GetThemeUseCaseTest.kt @@ -8,6 +8,7 @@ import dagger.hilt.android.testing.HiltTestApplication import dev.mslalith.focuslauncher.core.data.database.usecase.datastore.ClearThemeDataStoreUseCase import dev.mslalith.focuslauncher.core.data.repository.ThemeRepo import dev.mslalith.focuslauncher.core.model.Theme +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem import kotlinx.coroutines.runBlocking @@ -17,12 +18,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) internal class GetThemeUseCaseTest : CoroutineTest() { diff --git a/core/launcherapps/src/test/kotlin/dev/mslalith/focuslauncher/core/launcherapps/providers/icons/impl/IconProviderImplTest.kt b/core/launcherapps/src/test/kotlin/dev/mslalith/focuslauncher/core/launcherapps/providers/icons/impl/IconProviderImplTest.kt index f17d1d31..535c0f7b 100644 --- a/core/launcherapps/src/test/kotlin/dev/mslalith/focuslauncher/core/launcherapps/providers/icons/impl/IconProviderImplTest.kt +++ b/core/launcherapps/src/test/kotlin/dev/mslalith/focuslauncher/core/launcherapps/providers/icons/impl/IconProviderImplTest.kt @@ -7,6 +7,7 @@ import dev.mslalith.focuslauncher.core.launcherapps.manager.iconcache.IconCacheM import dev.mslalith.focuslauncher.core.model.IconPackType import dev.mslalith.focuslauncher.core.model.app.App import dev.mslalith.focuslauncher.core.model.app.AppWithComponent +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.TestApps import io.mockk.every import io.mockk.mockk @@ -14,9 +15,8 @@ import org.junit.FixMethodOrder import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) internal class IconProviderImplTest { diff --git a/core/testing/src/main/kotlin/dev/mslalith/focuslauncher/core/testing/AppRobolectricTestRunner.kt b/core/testing/src/main/kotlin/dev/mslalith/focuslauncher/core/testing/AppRobolectricTestRunner.kt new file mode 100644 index 00000000..ae7e794e --- /dev/null +++ b/core/testing/src/main/kotlin/dev/mslalith/focuslauncher/core/testing/AppRobolectricTestRunner.kt @@ -0,0 +1,13 @@ +package dev.mslalith.focuslauncher.core.testing + +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +class AppRobolectricTestRunner(testClass: Class<*>?) : RobolectricTestRunner(testClass) { + + override fun buildGlobalConfig(): Config { + return Config.Builder() + .setSdk(33) + .build() + } +} diff --git a/feature/appdrawerpage/src/test/kotlin/dev/mslalith/focuslauncher/feature/appdrawerpage/AppDrawerPageViewModelTest.kt b/feature/appdrawerpage/src/test/kotlin/dev/mslalith/focuslauncher/feature/appdrawerpage/AppDrawerPageViewModelTest.kt index 99d6b0c4..a5ddcab7 100644 --- a/feature/appdrawerpage/src/test/kotlin/dev/mslalith/focuslauncher/feature/appdrawerpage/AppDrawerPageViewModelTest.kt +++ b/feature/appdrawerpage/src/test/kotlin/dev/mslalith/focuslauncher/feature/appdrawerpage/AppDrawerPageViewModelTest.kt @@ -16,6 +16,7 @@ import dev.mslalith.focuslauncher.core.domain.iconpack.ReloadIconPackAfterFirstL import dev.mslalith.focuslauncher.core.domain.iconpack.ReloadIconPackUseCase import dev.mslalith.focuslauncher.core.model.app.App import dev.mslalith.focuslauncher.core.model.appdrawer.AppDrawerItem +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.disableAsSystem @@ -29,12 +30,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class AppDrawerPageViewModelTest : CoroutineTest() { diff --git a/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/Clock24ViewModelTest.kt b/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/Clock24ViewModelTest.kt index 940f86bf..9e69f448 100644 --- a/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/Clock24ViewModelTest.kt +++ b/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/Clock24ViewModelTest.kt @@ -10,6 +10,7 @@ import dev.mslalith.focuslauncher.core.data.database.usecase.datastore.ClearSett import dev.mslalith.focuslauncher.core.data.repository.ClockRepo import dev.mslalith.focuslauncher.core.data.repository.settings.ClockSettingsRepo import dev.mslalith.focuslauncher.core.model.ClockAlignment +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.extensions.assertFor import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem @@ -21,11 +22,10 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) internal class Clock24ViewModelTest : CoroutineTest() { diff --git a/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/ClockWidgetKtTest.kt b/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/ClockWidgetKtTest.kt index aa47a248..20e80c1a 100644 --- a/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/ClockWidgetKtTest.kt +++ b/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/ClockWidgetKtTest.kt @@ -9,6 +9,7 @@ import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.unit.dp import dev.mslalith.focuslauncher.core.model.ClockAlignment +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.compose.assertion.assertBiasAlignment import dev.mslalith.focuslauncher.feature.clock24.model.Clock24State import dev.mslalith.focuslauncher.feature.clock24.utils.TestTags @@ -17,10 +18,9 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(instrumentedPackages = ["androidx.loader.content"]) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class ClockWidgetKtTest { diff --git a/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/CurrentTimeKtTest.kt b/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/CurrentTimeKtTest.kt index a6d19bf3..b230c31a 100644 --- a/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/CurrentTimeKtTest.kt +++ b/feature/clock24/src/test/kotlin/dev/mslalith/focuslauncher/feature/clock24/CurrentTimeKtTest.kt @@ -8,16 +8,16 @@ import androidx.compose.ui.test.hasText import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onChildren import androidx.compose.ui.test.onNodeWithTag +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.feature.clock24.utils.TestTags import org.junit.FixMethodOrder import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(instrumentedPackages = ["androidx.loader.content"]) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class CurrentTimeKtTest { diff --git a/feature/favorites/src/test/kotlin/dev/mslalith/focuslauncher/feature/favorites/FavoritesViewModelTest.kt b/feature/favorites/src/test/kotlin/dev/mslalith/focuslauncher/feature/favorites/FavoritesViewModelTest.kt index 78bb2ccf..a835b358 100644 --- a/feature/favorites/src/test/kotlin/dev/mslalith/focuslauncher/feature/favorites/FavoritesViewModelTest.kt +++ b/feature/favorites/src/test/kotlin/dev/mslalith/focuslauncher/feature/favorites/FavoritesViewModelTest.kt @@ -11,6 +11,7 @@ import dev.mslalith.focuslauncher.core.data.repository.settings.GeneralSettingsR import dev.mslalith.focuslauncher.core.domain.apps.GetFavoriteColoredAppsUseCase import dev.mslalith.focuslauncher.core.domain.launcherapps.GetDefaultFavoriteAppsUseCase import dev.mslalith.focuslauncher.core.domain.theme.GetThemeUseCase +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.extensions.assertFor @@ -22,12 +23,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class FavoritesViewModelTest : CoroutineTest() { diff --git a/feature/lunarcalendar/src/test/kotlin/dev/mslalith/focuslauncher/feature/lunarcalendar/LunarCalendarViewModelTest.kt b/feature/lunarcalendar/src/test/kotlin/dev/mslalith/focuslauncher/feature/lunarcalendar/LunarCalendarViewModelTest.kt index 6ba3b115..55e7d451 100644 --- a/feature/lunarcalendar/src/test/kotlin/dev/mslalith/focuslauncher/feature/lunarcalendar/LunarCalendarViewModelTest.kt +++ b/feature/lunarcalendar/src/test/kotlin/dev/mslalith/focuslauncher/feature/lunarcalendar/LunarCalendarViewModelTest.kt @@ -8,6 +8,7 @@ import dev.mslalith.focuslauncher.core.common.appcoroutinedispatcher.AppCoroutin import dev.mslalith.focuslauncher.core.data.repository.ClockRepo import dev.mslalith.focuslauncher.core.data.repository.LunarPhaseDetailsRepo import dev.mslalith.focuslauncher.core.data.repository.settings.LunarPhaseSettingsRepo +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.extensions.assertFor import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem @@ -16,11 +17,10 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) class LunarCalendarViewModelTest : CoroutineTest() { diff --git a/feature/settingspage/src/test/kotlin/dev/mslalith/focuslauncher/feature/settingspage/AppDrawerSettingsSheetKtTest.kt b/feature/settingspage/src/test/kotlin/dev/mslalith/focuslauncher/feature/settingspage/AppDrawerSettingsSheetKtTest.kt index 64513da5..f9966f55 100644 --- a/feature/settingspage/src/test/kotlin/dev/mslalith/focuslauncher/feature/settingspage/AppDrawerSettingsSheetKtTest.kt +++ b/feature/settingspage/src/test/kotlin/dev/mslalith/focuslauncher/feature/settingspage/AppDrawerSettingsSheetKtTest.kt @@ -21,6 +21,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule import dev.mslalith.focuslauncher.core.model.AppDrawerViewType import dev.mslalith.focuslauncher.core.model.R import dev.mslalith.focuslauncher.core.model.appdrawer.AppDrawerIconViewType +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.compose.assertion.assertBooleanType import dev.mslalith.focuslauncher.core.testing.compose.assertion.assertStringType import dev.mslalith.focuslauncher.feature.settingspage.model.SettingsSheetState @@ -31,10 +32,9 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(instrumentedPackages = ["androidx.loader.content"]) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class AppDrawerSettingsSheetKtTest { diff --git a/feature/settingspage/src/test/kotlin/dev/mslalith/focuslauncher/feature/settingspage/SettingsPageKtTest.kt b/feature/settingspage/src/test/kotlin/dev/mslalith/focuslauncher/feature/settingspage/SettingsPageKtTest.kt index 52409340..6fea83da 100644 --- a/feature/settingspage/src/test/kotlin/dev/mslalith/focuslauncher/feature/settingspage/SettingsPageKtTest.kt +++ b/feature/settingspage/src/test/kotlin/dev/mslalith/focuslauncher/feature/settingspage/SettingsPageKtTest.kt @@ -14,6 +14,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule import com.google.common.truth.Truth.assertThat import dev.mslalith.focuslauncher.core.model.Screen import dev.mslalith.focuslauncher.core.model.WidgetType +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.compose.assertion.waitForTagAndAssertIsDisplayed import dev.mslalith.focuslauncher.core.testing.compose.assertion.waitForTextAndAssertIsDisplayed import dev.mslalith.focuslauncher.core.testing.compose.extensions.performScrollToAndClick @@ -28,10 +29,9 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(instrumentedPackages = ["androidx.loader.content"]) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class SettingsPageKtTest { diff --git a/feature/theme/src/test/kotlin/dev/mslalith/focuslauncher/feature/theme/LauncherThemeViewModelTest.kt b/feature/theme/src/test/kotlin/dev/mslalith/focuslauncher/feature/theme/LauncherThemeViewModelTest.kt index 49442a79..c2e3fdb2 100644 --- a/feature/theme/src/test/kotlin/dev/mslalith/focuslauncher/feature/theme/LauncherThemeViewModelTest.kt +++ b/feature/theme/src/test/kotlin/dev/mslalith/focuslauncher/feature/theme/LauncherThemeViewModelTest.kt @@ -9,6 +9,7 @@ import dev.mslalith.focuslauncher.core.data.database.usecase.datastore.ClearThem import dev.mslalith.focuslauncher.core.domain.theme.ChangeThemeUseCase import dev.mslalith.focuslauncher.core.domain.theme.GetThemeUseCase import dev.mslalith.focuslauncher.core.model.Theme +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.extensions.assertFor import kotlinx.coroutines.runBlocking @@ -18,12 +19,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) internal class LauncherThemeViewModelTest : CoroutineTest() { diff --git a/screens/currentplace/src/test/kotlin/dev/mslalith/focuslauncher/screens/currentplace/CurrentPlaceViewModelTest.kt b/screens/currentplace/src/test/kotlin/dev/mslalith/focuslauncher/screens/currentplace/CurrentPlaceViewModelTest.kt index e7c397bf..4fde67f7 100644 --- a/screens/currentplace/src/test/kotlin/dev/mslalith/focuslauncher/screens/currentplace/CurrentPlaceViewModelTest.kt +++ b/screens/currentplace/src/test/kotlin/dev/mslalith/focuslauncher/screens/currentplace/CurrentPlaceViewModelTest.kt @@ -13,6 +13,7 @@ import dev.mslalith.focuslauncher.core.data.utils.dummyPlaceFor import dev.mslalith.focuslauncher.core.model.Constants import dev.mslalith.focuslauncher.core.model.CurrentPlace import dev.mslalith.focuslauncher.core.model.location.LatLng +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.extensions.assertFor import dev.mslalith.focuslauncher.core.testing.extensions.awaitItemChangeUntil @@ -25,11 +26,10 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class CurrentPlaceViewModelTest : CoroutineTest() { diff --git a/screens/editfavorites/src/test/kotlin/dev/mslalith/focuslauncher/screens/editfavorites/EditFavoritesScreenKtTest.kt b/screens/editfavorites/src/test/kotlin/dev/mslalith/focuslauncher/screens/editfavorites/EditFavoritesScreenKtTest.kt index 1801c817..d03f4454 100644 --- a/screens/editfavorites/src/test/kotlin/dev/mslalith/focuslauncher/screens/editfavorites/EditFavoritesScreenKtTest.kt +++ b/screens/editfavorites/src/test/kotlin/dev/mslalith/focuslauncher/screens/editfavorites/EditFavoritesScreenKtTest.kt @@ -11,6 +11,7 @@ import androidx.compose.ui.test.performClick import androidx.test.ext.junit.rules.ActivityScenarioRule import dev.mslalith.focuslauncher.core.model.app.App import dev.mslalith.focuslauncher.core.model.app.SelectedApp +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.compose.assertion.assertSelectedApp import dev.mslalith.focuslauncher.core.testing.compose.assertion.waitForTextAndAssertIsDisplayed @@ -27,10 +28,9 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(instrumentedPackages = ["androidx.loader.content"]) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class EditFavoritesScreenKtTest { diff --git a/screens/editfavorites/src/test/kotlin/dev/mslalith/focuslauncher/screens/editfavorites/EditFavoritesViewModelTest.kt b/screens/editfavorites/src/test/kotlin/dev/mslalith/focuslauncher/screens/editfavorites/EditFavoritesViewModelTest.kt index 383fa650..2a439df3 100644 --- a/screens/editfavorites/src/test/kotlin/dev/mslalith/focuslauncher/screens/editfavorites/EditFavoritesViewModelTest.kt +++ b/screens/editfavorites/src/test/kotlin/dev/mslalith/focuslauncher/screens/editfavorites/EditFavoritesViewModelTest.kt @@ -10,6 +10,7 @@ import dev.mslalith.focuslauncher.core.data.repository.FavoritesRepo import dev.mslalith.focuslauncher.core.data.repository.HiddenAppsRepo import dev.mslalith.focuslauncher.core.model.app.App import dev.mslalith.focuslauncher.core.model.app.SelectedApp +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem @@ -21,11 +22,10 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class EditFavoritesViewModelTest : CoroutineTest() { diff --git a/screens/hideapps/src/test/kotlin/dev/mslalith/focuslauncher/screens/hideapps/HideAppsScreenKtTest.kt b/screens/hideapps/src/test/kotlin/dev/mslalith/focuslauncher/screens/hideapps/HideAppsScreenKtTest.kt index 746ae3e0..04b00013 100644 --- a/screens/hideapps/src/test/kotlin/dev/mslalith/focuslauncher/screens/hideapps/HideAppsScreenKtTest.kt +++ b/screens/hideapps/src/test/kotlin/dev/mslalith/focuslauncher/screens/hideapps/HideAppsScreenKtTest.kt @@ -15,6 +15,7 @@ import com.google.common.truth.Truth.assertThat import dev.mslalith.focuslauncher.core.model.app.App import dev.mslalith.focuslauncher.core.model.app.SelectedHiddenApp import dev.mslalith.focuslauncher.core.resources.R +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.compose.assertion.assertSelectedHiddenApp import dev.mslalith.focuslauncher.core.testing.compose.assertion.waitForTextAndAssertIsDisplayed @@ -32,10 +33,9 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(instrumentedPackages = ["androidx.loader.content"]) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class HideAppsScreenKtTest { diff --git a/screens/hideapps/src/test/kotlin/dev/mslalith/focuslauncher/screens/hideapps/HideAppsViewModelTest.kt b/screens/hideapps/src/test/kotlin/dev/mslalith/focuslauncher/screens/hideapps/HideAppsViewModelTest.kt index 439b45bc..7eec2641 100644 --- a/screens/hideapps/src/test/kotlin/dev/mslalith/focuslauncher/screens/hideapps/HideAppsViewModelTest.kt +++ b/screens/hideapps/src/test/kotlin/dev/mslalith/focuslauncher/screens/hideapps/HideAppsViewModelTest.kt @@ -10,6 +10,7 @@ import dev.mslalith.focuslauncher.core.data.repository.FavoritesRepo import dev.mslalith.focuslauncher.core.data.repository.HiddenAppsRepo import dev.mslalith.focuslauncher.core.model.app.App import dev.mslalith.focuslauncher.core.model.app.SelectedHiddenApp +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.extensions.awaitItem @@ -21,11 +22,10 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class HideAppsViewModelTest : CoroutineTest() { diff --git a/screens/iconpack/src/test/kotlin/dev/mslalith/focuslauncher/screens/iconpack/IconPackViewModelTest.kt b/screens/iconpack/src/test/kotlin/dev/mslalith/focuslauncher/screens/iconpack/IconPackViewModelTest.kt index 90bf19db..16011985 100644 --- a/screens/iconpack/src/test/kotlin/dev/mslalith/focuslauncher/screens/iconpack/IconPackViewModelTest.kt +++ b/screens/iconpack/src/test/kotlin/dev/mslalith/focuslauncher/screens/iconpack/IconPackViewModelTest.kt @@ -21,6 +21,7 @@ import dev.mslalith.focuslauncher.core.model.IconPackType import dev.mslalith.focuslauncher.core.model.app.App import dev.mslalith.focuslauncher.core.model.app.AppWithComponent import dev.mslalith.focuslauncher.core.model.appdrawer.AppDrawerItem +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.disableAsSystem @@ -36,12 +37,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) class IconPackViewModelTest : CoroutineTest() { diff --git a/screens/launcher/src/test/kotlin/dev/mslalith/focuslauncher/screens/launcher/LauncherViewModelTest.kt b/screens/launcher/src/test/kotlin/dev/mslalith/focuslauncher/screens/launcher/LauncherViewModelTest.kt index 69cfe7d0..6183e74f 100644 --- a/screens/launcher/src/test/kotlin/dev/mslalith/focuslauncher/screens/launcher/LauncherViewModelTest.kt +++ b/screens/launcher/src/test/kotlin/dev/mslalith/focuslauncher/screens/launcher/LauncherViewModelTest.kt @@ -9,6 +9,7 @@ import dev.mslalith.focuslauncher.core.data.database.usecase.room.CloseDatabaseU import dev.mslalith.focuslauncher.core.data.repository.AppDrawerRepo import dev.mslalith.focuslauncher.core.domain.launcherapps.LoadAllAppsUseCase import dev.mslalith.focuslauncher.core.launcherapps.manager.launcherapps.test.TestLauncherAppsManager +import dev.mslalith.focuslauncher.core.testing.AppRobolectricTestRunner import dev.mslalith.focuslauncher.core.testing.CoroutineTest import dev.mslalith.focuslauncher.core.testing.TestApps import dev.mslalith.focuslauncher.core.testing.extensions.assertFor @@ -21,12 +22,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters -import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config import javax.inject.Inject @HiltAndroidTest -@RunWith(RobolectricTestRunner::class) +@RunWith(AppRobolectricTestRunner::class) @Config(application = HiltTestApplication::class) @FixMethodOrder(value = MethodSorters.NAME_ASCENDING) internal class LauncherViewModelTest : CoroutineTest() { From 7bb71415c8bbeb708443a8c0c32bc8e921637e96 Mon Sep 17 00:00:00 2001 From: mslalith Date: Thu, 31 Aug 2023 08:38:08 +0530 Subject: [PATCH 4/4] chore: bump Kotlin to 1.9.0, target SDK to 34, Compose Compiler to 1.5.1 --- .../gradle/wrapper/gradle-wrapper.properties | 1 + .../core/ui/providers/ProvideLauncherPagerState.kt | 5 ++++- gradle/libs.versions.toml | 14 +++++++------- .../screens/launcher/LauncherScreen.kt | 1 - 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties index 17a8ddce..9f4197d5 100644 --- a/build-logic/gradle/wrapper/gradle-wrapper.properties +++ b/build-logic/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/core/ui/src/main/kotlin/dev/mslalith/focuslauncher/core/ui/providers/ProvideLauncherPagerState.kt b/core/ui/src/main/kotlin/dev/mslalith/focuslauncher/core/ui/providers/ProvideLauncherPagerState.kt index ed04054d..c6fe1fa9 100644 --- a/core/ui/src/main/kotlin/dev/mslalith/focuslauncher/core/ui/providers/ProvideLauncherPagerState.kt +++ b/core/ui/src/main/kotlin/dev/mslalith/focuslauncher/core/ui/providers/ProvideLauncherPagerState.kt @@ -17,7 +17,10 @@ val LocalLauncherPagerState = compositionLocalOf { fun ProvideLauncherPagerState( content: @Composable () -> Unit ) { - val pagerState = rememberPagerState(initialPage = 1) + val pagerState = rememberPagerState( + initialPage = 1, + pageCount = { 3 } + ) CompositionLocalProvider(LocalLauncherPagerState provides pagerState) { content() } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3c9344da..32ae06be 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,12 +2,12 @@ accompanist = "0.30.1" androidGradlePlugin = "8.1.0" androidMinSdk = "26" -androidTargetSdk = "33" +androidTargetSdk = "34" androidTest = "8.1.0" androidxActivity = "1.7.2" androidxAnnotation = "1.6.0" androidxComposeBom = "2023.08.00" -androidxComposeCompiler = "1.4.7" +androidxComposeCompiler = "1.5.1" androidxCore = "1.10.1" androidxCoreTesting = "2.2.0" androidxDataStore = "1.0.0" @@ -26,13 +26,13 @@ espressoCore = "3.5.1" hilt = "2.47" hiltCompiler = "1.0.0" junit4 = "4.13.2" -kotlin = "1.8.21" +kotlin = "1.9.0" kotlinxCollectionImmutable = "0.3.5" -kotlinxCoroutines = "1.7.1" +kotlinxCoroutines = "1.7.3" kotlinxDatetime = "0.4.0" -kotlinxSerialization = "1.5.1" -kover = "0.7.1" -ksp = "1.8.21-1.0.11" +kotlinxSerialization = "1.6.0" +kover = "0.7.3" +ksp = "1.9.0-1.0.13" ktorClient = "2.3.3" mockk = "1.13.5" osmdroid = "6.1.16" diff --git a/screens/launcher/src/main/kotlin/dev/mslalith/focuslauncher/screens/launcher/LauncherScreen.kt b/screens/launcher/src/main/kotlin/dev/mslalith/focuslauncher/screens/launcher/LauncherScreen.kt index 741efcbe..3a48a611 100644 --- a/screens/launcher/src/main/kotlin/dev/mslalith/focuslauncher/screens/launcher/LauncherScreen.kt +++ b/screens/launcher/src/main/kotlin/dev/mslalith/focuslauncher/screens/launcher/LauncherScreen.kt @@ -58,7 +58,6 @@ internal fun LauncherScreenInternal( ) { paddingValues -> HorizontalPager( state = pagerState, - pageCount = 3, beyondBoundsPageCount = 2, modifier = Modifier .padding(paddingValues = paddingValues)