Update UI tests and fix linter issues.

Titouan Thibaud · titooan · commit 1f0a4b793a8e · 2025-11-26T15:42:25.000+01:00
diff --git a/app/src/androidTest/java/org/mozilla/tryfox/ui/screens/HomeScreenTest.kt b/app/src/androidTest/java/org/mozilla/tryfox/ui/screens/HomeScreenTest.kt
@@ -1,15 +1,13 @@
 package org.mozilla.tryfox.ui.screens
 
 import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.hasContentDescription
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.tryfox.MainActivity
-import org.mozilla.tryfox.R
 
 @RunWith(AndroidJUnit4::class)
 class HomeScreenTest {
@@ -18,29 +16,44 @@ class HomeScreenTest {
     val composeTestRule = createAndroidComposeRule<MainActivity>()
 
     @Test
-    fun homeScreen_showsFenixAndFocusCards() {
-        val activity = composeTestRule.activity
-
+    fun homeScreen_showsFenixNightlyCard() {
         // --- Fenix (Nightly) Card ---
-        val fenixIconDesc = activity.getString(R.string.app_icon_firefox_nightly_description)
-        val fenixIconMatcher = hasContentDescription(fenixIconDesc)
         val fenixTitleTag = "app_title_text_fenix"
 
-        // Assert Fenix icon is displayed
-        composeTestRule.onNode(fenixIconMatcher, useUnmergedTree = true).assertIsDisplayed()
-
         // Assert Fenix text (found by tag) is displayed
         composeTestRule.onNodeWithTag(fenixTitleTag, useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun homeScreen_showsFenixBetaCard() {
+        // --- Fenix Beta Card ---
+        val betaTitleTag = "app_title_text_fenix-beta"
+
+        // Assert Beta text (found by tag) is displayed
+        composeTestRule.onNodeWithTag(betaTitleTag, useUnmergedTree = true).assertIsDisplayed()
+    }
 
-        // --- Focus Card ---
-        val focusIconDesc = activity.getString(R.string.app_icon_focus_description)
-        val focusIconMatcher = hasContentDescription(focusIconDesc)
-        val focusTitleTag = "app_title_text_focus"
+    @Test
+    fun homeScreen_showsFenixReleaseCard() {
+        // --- Fenix Release Card ---
+        val releaseTitleTag = "app_title_text_fenix-release"
+
+        // Assert Release text (found by tag) is displayed
+        composeTestRule.onNodeWithTag(releaseTitleTag, useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun homeScreen_showsAllThreeFenixVariants() {
+        // --- Fenix (Nightly) Card ---
+        val fenixTitleTag = "app_title_text_fenix"
+        composeTestRule.onNodeWithTag(fenixTitleTag, useUnmergedTree = true).assertIsDisplayed()
 
-        // Assert Focus icon is displayed
-        composeTestRule.onNode(focusIconMatcher, useUnmergedTree = true).assertIsDisplayed()
+        // --- Fenix Beta Card ---
+        val betaTitleTag = "app_title_text_fenix-beta"
+        composeTestRule.onNodeWithTag(betaTitleTag, useUnmergedTree = true).assertIsDisplayed()
 
-        // Assert Focus text (found by tag) is displayed
-        composeTestRule.onNodeWithTag(focusTitleTag, useUnmergedTree = true).assertIsDisplayed()
+        // --- Fenix Release Card ---
+        val releaseTitleTag = "app_title_text_fenix-release"
+        composeTestRule.onNodeWithTag(releaseTitleTag, useUnmergedTree = true).assertIsDisplayed()
     }
 }
diff --git a/app/src/androidTest/java/org/mozilla/tryfox/ui/screens/ProfileScreenTest.kt b/app/src/androidTest/java/org/mozilla/tryfox/ui/screens/ProfileScreenTest.kt
@@ -15,11 +15,11 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.tryfox.data.FakeCacheManager
 import org.mozilla.tryfox.data.FakeDownloadFileRepository
-import org.mozilla.tryfox.data.FakeTreeherderRepository
 import org.mozilla.tryfox.data.FakeIntentManager
+import org.mozilla.tryfox.data.FakeTreeherderRepository
 import org.mozilla.tryfox.data.FakeUserDataRepository
-import org.mozilla.tryfox.data.repositories.UserDataRepository
 import org.mozilla.tryfox.data.managers.CacheManager
+import org.mozilla.tryfox.data.repositories.UserDataRepository
 
 @RunWith(AndroidJUnit4::class)
 class ProfileScreenTest {
diff --git a/app/src/main/java/org/mozilla/tryfox/TryFoxViewModel.kt b/app/src/main/java/org/mozilla/tryfox/TryFoxViewModel.kt
@@ -17,12 +17,12 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import org.mozilla.tryfox.data.repositories.DownloadFileRepository
 import org.mozilla.tryfox.data.DownloadState
-import org.mozilla.tryfox.data.repositories.TreeherderRepository
 import org.mozilla.tryfox.data.NetworkResult
 import org.mozilla.tryfox.data.managers.CacheManager
 import org.mozilla.tryfox.data.managers.IntentManager
+import org.mozilla.tryfox.data.repositories.DownloadFileRepository
+import org.mozilla.tryfox.data.repositories.TreeherderRepository
 import org.mozilla.tryfox.model.CacheManagementState
 import org.mozilla.tryfox.ui.models.AbiUiModel
 import org.mozilla.tryfox.ui.models.ArtifactUiModel
diff --git a/app/src/main/java/org/mozilla/tryfox/data/DefaultMozillaPackageManager.kt b/app/src/main/java/org/mozilla/tryfox/data/DefaultMozillaPackageManager.kt
@@ -13,11 +13,11 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import org.mozilla.tryfox.model.AppState
 import org.mozilla.tryfox.util.FENIX_BETA
-import org.mozilla.tryfox.util.FENIX_NIGHTLY_PACKAGE
-import org.mozilla.tryfox.util.FENIX_RELEASE_PACKAGE
 import org.mozilla.tryfox.util.FENIX_BETA_PACKAGE
 import org.mozilla.tryfox.util.FENIX_NIGHTLY
+import org.mozilla.tryfox.util.FENIX_NIGHTLY_PACKAGE
 import org.mozilla.tryfox.util.FENIX_RELEASE
+import org.mozilla.tryfox.util.FENIX_RELEASE_PACKAGE
 import org.mozilla.tryfox.util.FOCUS
 import org.mozilla.tryfox.util.FOCUS_NIGHTLY_PACKAGE
 import org.mozilla.tryfox.util.REFERENCE_BROWSER
@@ -28,7 +28,6 @@ import org.mozilla.tryfox.util.TRYFOX_PACKAGE
 class DefaultMozillaPackageManager(private val context: Context) : MozillaPackageManager {
 
     private val packageManager: PackageManager = context.packageManager
-    private val TAG = "MozillaPackageManager"
 
     private fun getPackageInfo(packageName: String): PackageInfo? {
         return try {
@@ -114,4 +113,8 @@ class DefaultMozillaPackageManager(private val context: Context) : MozillaPackag
         val intent = packageManager.getLaunchIntentForPackage(appName)
         intent?.let(context::startActivity)
     }
+
+    companion object {
+        private const val TAG = "MozillaPackageManager"
+    }
 }
diff --git a/app/src/main/java/org/mozilla/tryfox/data/MozillaArchiveHtmlParser.kt b/app/src/main/java/org/mozilla/tryfox/data/MozillaArchiveHtmlParser.kt
@@ -55,7 +55,7 @@ class MozillaArchiveHtmlParser {
                     val isBeta = version.contains(Regex("[ab]\\d+|beta|alpha|rc"))
                     !isBeta && version.matches(Regex("\\d+\\.\\d+(\\.\\d+)?"))
                 }
-                
+
                 // Use Version comparison to find the latest stable release
                 stableReleases.mapNotNull { Version.from(it) }
                     .maxOrNull()?.toString() ?: ""
@@ -73,18 +73,18 @@ class MozillaArchiveHtmlParser {
             .toList()
 
         val abis = mutableListOf<String>()
-        
+
         for (buildString in rawBuildStrings) {
             // Pattern: {appName}-D+.D+(.D+)?[ab]D+-android-ABI/ or {appName}-D+.D+(.D+)?-android/
             // Also supports: {appName}-D+.D+(.D+)?-android-ABI/ (stable releases)
-            // Examples: 
+            // Examples:
             // - fenix-145.0-android-arm64-v8a/ (stable)
             // - fenix-145.0-android/ (stable universal)
             // - fenix-146.0b5-android-arm64-v8a/ (beta)
             // - fenix-146.0b5-android/ (beta universal)
             val pattern = Regex("^$appName-\\d+\\.\\d+(?:\\.\\d+)?(?:[ab]\\d+)?-android(?:-(.+?))?/$")
             val matchResult = pattern.find(buildString)
-            
+
             if (matchResult != null) {
                 val abi = matchResult.groups[1]?.value
                 abis.add(abi ?: "universal")
@@ -133,6 +133,5 @@ class MozillaArchiveHtmlParser {
         }
 
         return null
-
     }
 }
diff --git a/app/src/main/java/org/mozilla/tryfox/data/ReleaseType.kt b/app/src/main/java/org/mozilla/tryfox/data/ReleaseType.kt
@@ -2,5 +2,5 @@ package org.mozilla.tryfox.data
 
 enum class ReleaseType {
     Beta,
-    Release
+    Release,
 }
diff --git a/app/src/main/java/org/mozilla/tryfox/data/repositories/DefaultMozillaArchiveRepository.kt b/app/src/main/java/org/mozilla/tryfox/data/repositories/DefaultMozillaArchiveRepository.kt
@@ -12,8 +12,8 @@ import org.mozilla.tryfox.data.ReleaseType
 import org.mozilla.tryfox.model.MozillaArchiveApk
 import org.mozilla.tryfox.network.MozillaArchivesApiService
 import org.mozilla.tryfox.util.FENIX
-import org.mozilla.tryfox.util.FENIX_RELEASE
 import org.mozilla.tryfox.util.FENIX_BETA
+import org.mozilla.tryfox.util.FENIX_RELEASE
 import org.mozilla.tryfox.util.FOCUS
 import retrofit2.HttpException
 
@@ -35,7 +35,7 @@ class DefaultMozillaArchiveRepository(
         }
 
         internal fun archiveUrlForRelease(number: String): String {
-            return "${RELEASES_FENIX_BASE_URL}${number}/android/"
+            return "${RELEASES_FENIX_BASE_URL}$number/android/"
         }
     }
 
@@ -49,28 +49,28 @@ class DefaultMozillaArchiveRepository(
             val releasesPageUrl = RELEASES_FENIX_BASE_URL
             val releasesHtml = mozillaArchivesApiService.getHtmlPage(releasesPageUrl)
             val latestReleaseVersion = mozillaArchiveHtmlParser.parseFenixReleasesFromHtml(releasesHtml, releaseType)
-            
+
             if (latestReleaseVersion.isEmpty()) {
                 return NetworkResult.Error("No releases found for type $releaseType", null)
             }
-            
+
             // Get the release directory listing to find available ABIs
             val releaseUrl = archiveUrlForRelease(latestReleaseVersion)
             val releaseHtml = mozillaArchivesApiService.getHtmlPage(releaseUrl)
             val abis = mozillaArchiveHtmlParser.parseFenixReleaseAbisFromHtml(releaseHtml, FENIX)
-            
+
             if (abis.isEmpty()) {
                 return NetworkResult.Error("No ABIs found for release $latestReleaseVersion", null)
             }
-            
+
             val apks = abis.map { abi ->
                 constructReleaseApk(latestReleaseVersion, abi, releaseUrl, releaseType)
             }
-            
+
             if (apks.isEmpty()) {
                 return NetworkResult.Error("Failed to construct APKs for release $latestReleaseVersion", null)
             }
-            
+
             NetworkResult.Success(apks)
         } catch (e: Exception) {
             NetworkResult.Error("Failed to fetch or parse Fenix releases: ${e.message}", e)
@@ -80,8 +80,8 @@ class DefaultMozillaArchiveRepository(
     private fun constructReleaseApk(version: String, abi: String, releaseBaseUrl: String, releaseType: ReleaseType): MozillaArchiveApk {
         val buildString = "fenix-$version-android${if (abi == "universal") "" else "-$abi"}/"
         val fileName = "fenix-$version.multi.android-$abi.apk"
-        val fullUrl = "${releaseBaseUrl}${buildString}${fileName}"
-        
+        val fullUrl = "${releaseBaseUrl}${buildString}$fileName"
+
         val appName = when (releaseType) {
             ReleaseType.Release -> FENIX_RELEASE
             ReleaseType.Beta -> FENIX_BETA
diff --git a/app/src/main/java/org/mozilla/tryfox/data/repositories/TreeherderRepository.kt b/app/src/main/java/org/mozilla/tryfox/data/repositories/TreeherderRepository.kt
@@ -10,4 +10,4 @@ interface TreeherderRepository {
     suspend fun getPushesByAuthor(author: String): NetworkResult<TreeherderRevisionResponse>
     suspend fun getJobsForPush(pushId: Int): NetworkResult<TreeherderJobsResponse>
     suspend fun getArtifactsForTask(taskId: String): NetworkResult<ArtifactsResponse>
-}
+}
diff --git a/app/src/main/java/org/mozilla/tryfox/data/repositories/UserDataRepository.kt b/app/src/main/java/org/mozilla/tryfox/data/repositories/UserDataRepository.kt
@@ -17,4 +17,4 @@ interface UserDataRepository {
      * @param email The email to save.
      */
     suspend fun saveLastSearchedEmail(email: String)
-}
+}
diff --git a/app/src/main/java/org/mozilla/tryfox/di/AppModule.kt b/app/src/main/java/org/mozilla/tryfox/di/AppModule.kt
@@ -13,27 +13,27 @@ import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import org.mozilla.tryfox.BuildConfig
 import org.mozilla.tryfox.TryFoxViewModel
-import org.mozilla.tryfox.data.repositories.DefaultDownloadFileRepository
 import org.mozilla.tryfox.data.DefaultMozillaPackageManager
+import org.mozilla.tryfox.data.MozillaPackageManager
+import org.mozilla.tryfox.data.managers.CacheManager
+import org.mozilla.tryfox.data.managers.DefaultCacheManager
+import org.mozilla.tryfox.data.managers.DefaultIntentManager
+import org.mozilla.tryfox.data.managers.IntentManager
+import org.mozilla.tryfox.data.repositories.DefaultDownloadFileRepository
+import org.mozilla.tryfox.data.repositories.DefaultMozillaArchiveRepository
+import org.mozilla.tryfox.data.repositories.DefaultTreeherderRepository
 import org.mozilla.tryfox.data.repositories.DefaultUserDataRepository
 import org.mozilla.tryfox.data.repositories.DownloadFileRepository
 import org.mozilla.tryfox.data.repositories.FenixBetaReleaseRepository
 import org.mozilla.tryfox.data.repositories.FenixReleaseReleaseRepository
 import org.mozilla.tryfox.data.repositories.FenixReleaseRepository
-import org.mozilla.tryfox.data.repositories.DefaultTreeherderRepository
 import org.mozilla.tryfox.data.repositories.FocusReleaseRepository
-import org.mozilla.tryfox.data.repositories.TreeherderRepository
 import org.mozilla.tryfox.data.repositories.MozillaArchiveRepository
-import org.mozilla.tryfox.data.repositories.DefaultMozillaArchiveRepository
-import org.mozilla.tryfox.data.MozillaPackageManager
 import org.mozilla.tryfox.data.repositories.ReferenceBrowserReleaseRepository
 import org.mozilla.tryfox.data.repositories.ReleaseRepository
+import org.mozilla.tryfox.data.repositories.TreeherderRepository
 import org.mozilla.tryfox.data.repositories.TryFoxReleaseRepository
 import org.mozilla.tryfox.data.repositories.UserDataRepository
-import org.mozilla.tryfox.data.managers.CacheManager
-import org.mozilla.tryfox.data.managers.DefaultCacheManager
-import org.mozilla.tryfox.data.managers.DefaultIntentManager
-import org.mozilla.tryfox.data.managers.IntentManager
 import org.mozilla.tryfox.network.DownloadApiService
 import org.mozilla.tryfox.network.GithubApiService
 import org.mozilla.tryfox.network.MozillaArchivesApiService
diff --git a/app/src/main/java/org/mozilla/tryfox/ui/composables/AppCard.kt b/app/src/main/java/org/mozilla/tryfox/ui/composables/AppCard.kt
@@ -27,7 +27,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
diff --git a/app/src/main/java/org/mozilla/tryfox/ui/composables/ArchiveGroupCard.kt b/app/src/main/java/org/mozilla/tryfox/ui/composables/ArchiveGroupCard.kt
@@ -282,8 +282,7 @@ private fun ArchiveGroupAbiSelector(
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier.fillMaxWidth(),
     ) {
-
-        if (FeatureFlags.showAbiSelector) {
+        if (FeatureFlags.SHOW_ABI_SELECTOR) {
             SingleChoiceSegmentedButtonRow {
                 apks.forEachIndexed { index, apk ->
                     val colors =
diff --git a/app/src/main/java/org/mozilla/tryfox/ui/screens/HomeViewModel.kt b/app/src/main/java/org/mozilla/tryfox/ui/screens/HomeViewModel.kt
@@ -18,14 +18,14 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.format.FormatStringsInDatetimeFormats
 import kotlinx.datetime.format.byUnicodePattern
 import kotlinx.datetime.todayIn
-import org.mozilla.tryfox.data.repositories.DateAwareReleaseRepository
-import org.mozilla.tryfox.data.repositories.DownloadFileRepository
 import org.mozilla.tryfox.data.DownloadState
 import org.mozilla.tryfox.data.MozillaPackageManager
 import org.mozilla.tryfox.data.NetworkResult
-import org.mozilla.tryfox.data.repositories.ReleaseRepository
 import org.mozilla.tryfox.data.managers.CacheManager
 import org.mozilla.tryfox.data.managers.IntentManager
+import org.mozilla.tryfox.data.repositories.DateAwareReleaseRepository
+import org.mozilla.tryfox.data.repositories.DownloadFileRepository
+import org.mozilla.tryfox.data.repositories.ReleaseRepository
 import org.mozilla.tryfox.model.CacheManagementState
 import org.mozilla.tryfox.model.MozillaArchiveApk
 import org.mozilla.tryfox.ui.models.AbiUiModel
diff --git a/app/src/main/java/org/mozilla/tryfox/ui/screens/ProfileViewModel.kt b/app/src/main/java/org/mozilla/tryfox/ui/screens/ProfileViewModel.kt
@@ -14,13 +14,13 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import logcat.LogPriority
 import logcat.logcat
-import org.mozilla.tryfox.data.repositories.DownloadFileRepository
 import org.mozilla.tryfox.data.DownloadState
-import org.mozilla.tryfox.data.repositories.TreeherderRepository
 import org.mozilla.tryfox.data.NetworkResult
-import org.mozilla.tryfox.data.repositories.UserDataRepository
 import org.mozilla.tryfox.data.managers.CacheManager
 import org.mozilla.tryfox.data.managers.IntentManager
+import org.mozilla.tryfox.data.repositories.DownloadFileRepository
+import org.mozilla.tryfox.data.repositories.TreeherderRepository
+import org.mozilla.tryfox.data.repositories.UserDataRepository
 import org.mozilla.tryfox.model.CacheManagementState
 import org.mozilla.tryfox.ui.models.AbiUiModel
 import org.mozilla.tryfox.ui.models.ArtifactUiModel
diff --git a/app/src/main/java/org/mozilla/tryfox/util/FeatureFlags.kt b/app/src/main/java/org/mozilla/tryfox/util/FeatureFlags.kt
@@ -1,5 +1,5 @@
 package org.mozilla.tryfox.util
 
 object FeatureFlags {
-    const val showAbiSelector: Boolean = false
-}
+    const val SHOW_ABI_SELECTOR: Boolean = false
+}
diff --git a/app/src/test/java/org/mozilla/tryfox/FenixReleaseTest.kt b/app/src/test/java/org/mozilla/tryfox/FenixReleaseTest.kt
diff --git a/app/src/test/java/org/mozilla/tryfox/ui/screens/HomeViewModelTest.kt b/app/src/test/java/org/mozilla/tryfox/ui/screens/HomeViewModelTest.kt
diff --git a/app/src/test/java/org/mozilla/tryfox/ui/screens/ProfileViewModelTest.kt b/app/src/test/java/org/mozilla/tryfox/ui/screens/ProfileViewModelTest.kt

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ package org.mozilla.tryfox.data`
`2`	`2`
`3`	`3`	`enum class ReleaseType {`
`4`	`4`	`Beta,`
`5`		`- Release`
	`5`	`+ Release,`
`6`	`6`	`}`