Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.mozilla.tryfox.data

import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import org.mozilla.tryfox.data.repositories.HistoryRepository

class FakeHistoryRepository : HistoryRepository {
private val _historyEntries = MutableStateFlow<List<TreeherderInstallHistoryEntry>>(emptyList())
override val historyEntries: StateFlow<List<TreeherderInstallHistoryEntry>> = _historyEntries.asStateFlow()

val recordedEntries = mutableListOf<TreeherderInstallHistoryEntry>()

override suspend fun refresh() = Unit

override suspend fun recordInstallerLaunch(entry: TreeherderInstallHistoryEntry) {
recordedEntries.removeAll { it.uniqueKey == entry.uniqueKey }
recordedEntries.add(entry)
_historyEntries.value = recordedEntries.sortedByDescending { it.lastInstallerLaunchTimestamp }
}

override suspend fun delete(uniqueKey: String) {
recordedEntries.removeAll { it.uniqueKey == uniqueKey }
_historyEntries.value = recordedEntries.sortedByDescending { it.lastInstallerLaunchTimestamp }
}

fun setEntries(entries: List<TreeherderInstallHistoryEntry>) {
recordedEntries.clear()
recordedEntries.addAll(entries)
_historyEntries.value = entries
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
package org.mozilla.tryfox.ui.screens

import androidx.compose.ui.test.assertCountEquals
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onAllNodesWithText
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Assert.assertEquals
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.tryfox.R
import org.mozilla.tryfox.data.FakeCacheManager
import org.mozilla.tryfox.data.FakeDownloadFileRepository
import org.mozilla.tryfox.data.FakeHistoryRepository
import org.mozilla.tryfox.data.FakeIntentManager
import org.mozilla.tryfox.data.TreeherderInstallHistoryEntry
import org.mozilla.tryfox.ui.theme.TryFoxTheme

@RunWith(AndroidJUnit4::class)
class HistoryScreenTest {

@get:Rule
val composeTestRule = createComposeRule()

@Test
fun clickingRevisionInvokesTreeherderRevisionNavigation() {
val revision = "abcdef1234567890"
val historyRepository = FakeHistoryRepository().apply {
setEntries(listOf(historyEntry(project = "mozilla-central", revision = revision)))
}
val historyViewModel = HistoryViewModel(
historyRepository = historyRepository,
downloadFileRepository = FakeDownloadFileRepository(),
cacheManager = FakeCacheManager(),
intentManager = FakeIntentManager(),
)
var selectedProject: String? = null
var selectedRevision: String? = null

composeTestRule.setContent {
TryFoxTheme {
HistoryScreen(
onNavigateUp = {},
onNavigateToTreeherderRevision = { project, clickedRevision ->
selectedProject = project
selectedRevision = clickedRevision
},
historyViewModel = historyViewModel,
)
}
}

composeTestRule.onNodeWithText("Revision: ${revision.take(12)}").performClick()

assertEquals("mozilla-central", selectedProject)
assertEquals(revision, selectedRevision)
}

@Test
fun clickingRemoveHistoryEntryRemovesCard() {
val revision = "abcdef1234567890"
val historyRepository = FakeHistoryRepository().apply {
setEntries(listOf(historyEntry(project = "mozilla-central", revision = revision)))
}
val historyViewModel = HistoryViewModel(
historyRepository = historyRepository,
downloadFileRepository = FakeDownloadFileRepository(),
cacheManager = FakeCacheManager(),
intentManager = FakeIntentManager(),
)

composeTestRule.setContent {
TryFoxTheme {
HistoryScreen(
onNavigateUp = {},
onNavigateToTreeherderRevision = { _, _ -> },
historyViewModel = historyViewModel,
)
}
}

composeTestRule
.onNodeWithContentDescription(
InstrumentationRegistry.getInstrumentation().targetContext.getString(
R.string.history_screen_delete_entry_description,
),
)
.performClick()

composeTestRule.onAllNodesWithText("Revision: ${revision.take(12)}").assertCountEquals(0)
assertEquals(emptyList<TreeherderInstallHistoryEntry>(), historyRepository.recordedEntries)
}

private fun historyEntry(
project: String,
revision: String,
): TreeherderInstallHistoryEntry =
TreeherderInstallHistoryEntry(
project = project,
revision = revision,
commitMessage = "Bug 123 - Test history",
author = "author@mozilla.com",
pushTimestamp = 1_716_460_800L,
appName = "fenix",
jobName = "signing-apk-fenix-nightly",
jobSymbol = "Bfs",
taskId = "task-id",
artifactName = "public/build/target.arm64-v8a.apk",
artifactFileName = "target.arm64-v8a.apk",
downloadUrl = "https://example.com/task/artifact",
abiName = "arm64-v8a",
abiSupported = true,
expires = "2026-01-01T00:00:00.000Z",
cacheRelativePath = "treeherder/task-id/target.arm64-v8a.apk",
lastInstallerLaunchTimestamp = 123L,
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ 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.FakeHistoryRepository
import org.mozilla.tryfox.data.FakeIntentManager
import org.mozilla.tryfox.data.FakeTreeherderRepository
import org.mozilla.tryfox.data.FakeUserDataRepository
Expand All @@ -32,6 +33,7 @@ class ProfileScreenTest {
private val userDataRepository: UserDataRepository = FakeUserDataRepository()
private val cacheManager: CacheManager = FakeCacheManager()
private val intentManager = FakeIntentManager()
private val historyRepository = FakeHistoryRepository()
private val emailInputTag = "profile_email_input"
private val emailClearButtonTag = "profile_email_clear_button"
private val searchButtonTag = "profile_search_button"
Expand All @@ -50,6 +52,7 @@ class ProfileScreenTest {
userDataRepository = userDataRepository,
cacheManager = cacheManager,
intentManager = intentManager,
historyRepository = historyRepository,
authorEmail = null,
)

Expand Down Expand Up @@ -109,6 +112,7 @@ class ProfileScreenTest {
userDataRepository = userDataRepository,
cacheManager = cacheManager,
intentManager = intentManager,
historyRepository = historyRepository,
authorEmail = initialEmail,
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import org.mozilla.tryfox.data.Artifact
import org.mozilla.tryfox.data.ArtifactsResponse
import org.mozilla.tryfox.data.FakeCacheManager
import org.mozilla.tryfox.data.FakeDownloadFileRepository
import org.mozilla.tryfox.data.FakeHistoryRepository
import org.mozilla.tryfox.data.FakeIntentManager
import org.mozilla.tryfox.data.JobDetails
import org.mozilla.tryfox.data.NetworkResult
Expand All @@ -42,6 +43,7 @@ class TreeherderApksScreenTest {
downloadFileRepository = FakeDownloadFileRepository(),
cacheManager = FakeCacheManager(),
intentManager = FakeIntentManager(),
historyRepository = FakeHistoryRepository(),
project = "mozilla-central",
revision = "ed209aa2136b241686ff20489c5cb622348e2ecf",
supportedAbis = listOf("arm64-v8a"),
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/mozilla/tryfox/AppRoutes.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import java.net.URLEncoder

object AppRoutes {
const val HOME = "home"
const val HISTORY = "history"
const val QR_SCANNER = "qr_scanner"
const val TREEHERDER_SEARCH = "treeherder_search"
const val TREEHERDER_SEARCH_WITH_ARGS = "treeherder_search/{project}/{revision}"
Expand Down
18 changes: 18 additions & 0 deletions app/src/main/java/org/mozilla/tryfox/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import androidx.navigation.compose.rememberNavController
import androidx.navigation.navArgument
import org.koin.androidx.compose.koinViewModel
import org.koin.core.parameter.parametersOf
import org.mozilla.tryfox.ui.screens.HistoryScreen
import org.mozilla.tryfox.ui.screens.HomeScreen
import org.mozilla.tryfox.ui.screens.ProfileScreen
import org.mozilla.tryfox.ui.screens.QrCodeScannerScreen
Expand All @@ -32,6 +33,11 @@ sealed class NavScreen(val route: String) {
*/
data object Home : NavScreen(AppRoutes.HOME)

/**
* Represents the History screen.
*/
data object History : NavScreen(AppRoutes.HISTORY)

/**
* Represents the QR code scanner screen.
*/
Expand Down Expand Up @@ -118,9 +124,21 @@ class MainActivity : ComponentActivity() {
onNavigateToTreeherder = { localNavController.navigate(NavScreen.TreeherderSearch.route) },
onNavigateToProfile = { localNavController.navigate(NavScreen.Profile.route) },
onNavigateToQrScanner = { localNavController.navigate(NavScreen.QrScanner.route) },
onNavigateToHistory = { localNavController.navigate(NavScreen.History.route) },
homeViewModel = koinViewModel(),
)
}
composable(NavScreen.History.route) {
HistoryScreen(
onNavigateUp = { localNavController.popBackStack() },
onNavigateToTreeherderRevision = { project, revision ->
localNavController.navigate(
NavScreen.TreeherderSearchWithArgs.createRoute(project, revision),
)
},
historyViewModel = koinViewModel(),
)
}
composable(NavScreen.QrScanner.route) {
QrCodeScannerScreen(
onNavigateUp = { localNavController.popBackStack() },
Expand Down
Loading
Loading