Cover every branch of the forward pagination gate

Codecov reported 55.55% patch coverage on the previous commit: four of the nine
measured lines were only partially covered. No test paginates forwards in a
thread timeline, and the focus states Requested, Loading and Failure were never
live when a forward pagination arrived, so only the Success branch of
isPending() was ever evaluated both ways.

Add a test per uncovered state: a forward pagination is deferred while the focus
request is still being debounced and while the focused timeline is being
created, it is performed again once the request has failed, and it is dropped in
a thread timeline while a backward one still goes through.

The pagination recorder now also sits on the live timeline, and the presenter is
built on that same timeline. Before the detached timeline exists, a pagination
that escaped the gate would go to the live one, so without this the new guards
would pass against the unfixed presenter. The deferred cases end on the emitted
state rather than on cancelAndIgnoreRemainingEvents for the same reason: the
recorder throws from inside the presenter coroutine and cancelling swallows it.

Verified by reverting the gate: the three deferred-pagination tests then fail
with "This lambda should never be called."
This commit is contained in:
hayaksi1
2026-08-18 00:49:03 +03:00
parent 11e3cb9b19
commit 0aa283729c
@@ -1064,8 +1064,10 @@ class TimelinePresenterTest {
val paginateLambda = lambdaRecorder(ensureNeverCalled = true) { _: Timeline.PaginationDirection ->
Result.success(true)
}
val room = aRoomWithDetachedTimeline(paginateLambda = paginateLambda)
val presenter = createTimelinePresenter(
room = aRoomWithDetachedTimeline(paginateLambda = paginateLambda),
room = room,
timeline = room.liveTimeline,
)
presenter.test {
val initialState = awaitFirstItem()
@@ -1084,8 +1086,10 @@ class TimelinePresenterTest {
val paginateLambda = lambdaRecorder { _: Timeline.PaginationDirection ->
Result.success(true)
}
val room = aRoomWithDetachedTimeline(paginateLambda = paginateLambda)
val presenter = createTimelinePresenter(
room = aRoomWithDetachedTimeline(paginateLambda = paginateLambda),
room = room,
timeline = room.liveTimeline,
)
presenter.test {
val initialState = awaitFirstItem()
@@ -1106,8 +1110,10 @@ class TimelinePresenterTest {
val paginateLambda = lambdaRecorder { _: Timeline.PaginationDirection ->
Result.success(false)
}
val room = aRoomWithDetachedTimeline(paginateLambda = paginateLambda)
val presenter = createTimelinePresenter(
room = aRoomWithDetachedTimeline(paginateLambda = paginateLambda),
room = room,
timeline = room.liveTimeline,
)
presenter.test {
val initialState = awaitFirstItem()
@@ -1122,6 +1128,100 @@ class TimelinePresenterTest {
}
}
@Test
fun `present - a forward pagination while the focus request is debounced is ignored`() = runTest {
val paginateLambda = lambdaRecorder(ensureNeverCalled = true) { _: Timeline.PaginationDirection ->
Result.success(true)
}
val room = aRoomWithDetachedTimeline(paginateLambda = paginateLambda)
val presenter = createTimelinePresenter(
room = room,
timeline = room.liveTimeline,
)
presenter.test {
val initialState = awaitFirstItem()
initialState.eventSink.invoke(TimelineEvent.FocusOnEvent(AN_EVENT_ID, debounce = 1.seconds))
// The focus request has started and is now waiting for the debounce to elapse
consumeItemsUntilPredicate { it.focusRequestState is FocusRequestState.Requested }
initialState.eventSink.invoke(TimelineEvent.LoadMore(Timeline.PaginationDirection.FORWARDS))
advanceUntilIdle()
assert(paginateLambda).isNeverCalled()
assertThat(expectMostRecentItem().isLive).isFalse()
}
}
@Test
fun `present - a forward pagination while the focused timeline is loading is ignored`() = runTest {
val paginateLambda = lambdaRecorder(ensureNeverCalled = true) { _: Timeline.PaginationDirection ->
Result.success(true)
}
val room = aRoomWithDetachedTimeline(paginateLambda = paginateLambda)
val presenter = createTimelinePresenter(
room = room,
timeline = room.liveTimeline,
)
presenter.test {
val initialState = awaitFirstItem()
initialState.eventSink.invoke(TimelineEvent.FocusOnEvent(AN_EVENT_ID))
// The focused timeline is being created, the focus request has not resolved yet
consumeItemsUntilPredicate { it.focusRequestState is FocusRequestState.Loading }
initialState.eventSink.invoke(TimelineEvent.LoadMore(Timeline.PaginationDirection.FORWARDS))
advanceUntilIdle()
assert(paginateLambda).isNeverCalled()
assertThat(expectMostRecentItem().isLive).isFalse()
}
}
@Test
fun `present - a forward pagination after a failed focus request is performed`() = runTest {
val paginateLambda = lambdaRecorder { _: Timeline.PaginationDirection ->
Result.success(false)
}
val room = aRoomWithDetachedTimeline(
paginateLambda = paginateLambda,
createTimelineResult = { Result.failure(RuntimeException("An error")) },
)
val presenter = createTimelinePresenter(
room = room,
timeline = room.liveTimeline,
)
presenter.test {
val initialState = awaitFirstItem()
initialState.eventSink.invoke(TimelineEvent.FocusOnEvent(AN_EVENT_ID))
consumeItemsUntilPredicate { it.focusRequestState is FocusRequestState.Failure }
initialState.eventSink.invoke(TimelineEvent.LoadMore(Timeline.PaginationDirection.FORWARDS))
advanceUntilIdle()
assert(paginateLambda)
.isCalledOnce()
.with(value(Timeline.PaginationDirection.FORWARDS))
cancelAndIgnoreRemainingEvents()
}
}
@Test
fun `present - a forward pagination in a thread timeline is ignored`() = runTest {
val paginateLambda = lambdaRecorder { _: Timeline.PaginationDirection ->
Result.success(true)
}
val timeline = FakeTimeline(mode = Timeline.Mode.Thread(A_THREAD_ID)).apply {
this.paginateLambda = paginateLambda
}
val presenter = createTimelinePresenter(timeline = timeline)
presenter.test {
val initialState = awaitFirstItem()
initialState.eventSink.invoke(TimelineEvent.LoadMore(Timeline.PaginationDirection.FORWARDS))
advanceUntilIdle()
assert(paginateLambda).isNeverCalled()
// A backward pagination is still performed in a thread timeline
initialState.eventSink.invoke(TimelineEvent.LoadMore(Timeline.PaginationDirection.BACKWARDS))
advanceUntilIdle()
assert(paginateLambda)
.isCalledOnce()
.with(value(Timeline.PaginationDirection.BACKWARDS))
cancelAndIgnoreRemainingEvents()
}
}
@Test
fun `present - focus on known event retrieves the event from cache`() = runTest {
val timelineItemIndexer = TimelineItemIndexer()
@@ -1617,22 +1717,13 @@ class TimelinePresenterTest {
private fun aRoomWithDetachedTimeline(
paginateLambda: (Timeline.PaginationDirection) -> Result<Boolean>,
createTimelineResult: () -> Result<Timeline> = { Result.success(aDetachedTimeline(paginateLambda)) },
): FakeJoinedRoom {
val detachedTimeline = FakeTimeline(
timelineItems = flowOf(
listOf(
MatrixTimelineItem.Event(
uniqueId = A_UNIQUE_ID,
event = anEventTimelineItem(eventId = AN_EVENT_ID),
)
)
)
).apply {
this.paginateLambda = paginateLambda
}
return FakeJoinedRoom(
liveTimeline = FakeTimeline(timelineItems = flowOf(emptyList())),
createTimelineResult = { Result.success(detachedTimeline) },
liveTimeline = FakeTimeline(timelineItems = flowOf(emptyList())).apply {
this.paginateLambda = paginateLambda
},
createTimelineResult = { createTimelineResult() },
baseRoom = FakeBaseRoom(
roomPermissions = roomPermissions(),
threadRootIdForEventResult = { _ -> Result.success(null) },
@@ -1640,6 +1731,21 @@ class TimelinePresenterTest {
)
}
private fun aDetachedTimeline(
paginateLambda: (Timeline.PaginationDirection) -> Result<Boolean>,
) = FakeTimeline(
timelineItems = flowOf(
listOf(
MatrixTimelineItem.Event(
uniqueId = A_UNIQUE_ID,
event = anEventTimelineItem(eventId = AN_EVENT_ID),
)
)
)
).apply {
this.paginateLambda = paginateLambda
}
private fun roomPermissions(
canRedactOther: Boolean = false,
canRedactOwn: Boolean = true,