Fix some timeline issues and rename EnrichedEvent to TimelineEvent as it's only used in this context.

This commit is contained in:
ganfra
2019-01-14 16:18:39 +01:00
parent 34e08705dd
commit b2cdeb87f4
31 changed files with 170 additions and 179 deletions

View File

@ -7,7 +7,7 @@ import im.vector.matrix.android.InstrumentedTest
import im.vector.matrix.android.LiveDataTestObserver
import im.vector.matrix.android.api.thread.MainThreadExecutor
import im.vector.matrix.android.internal.session.room.members.RoomMemberExtractor
import im.vector.matrix.android.internal.session.room.timeline.DefaultTimelineHolder
import im.vector.matrix.android.internal.session.room.timeline.DefaultTimelineService
import im.vector.matrix.android.internal.session.room.timeline.TimelineBoundaryCallback
import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEventPersistor
import im.vector.matrix.android.internal.task.TaskExecutor
@ -44,17 +44,17 @@ internal class TimelineHolderTest : InstrumentedTest {
val boundaryCallback = TimelineBoundaryCallback(roomId, taskExecutor, paginationTask, monarchy, PagingRequestHelper(MainThreadExecutor()))
RoomDataHelper.fakeInitialSync(monarchy, roomId)
val timelineHolder = DefaultTimelineHolder(roomId, monarchy, taskExecutor, boundaryCallback, getContextOfEventTask, RoomMemberExtractor(monarchy, roomId))
val timelineHolder = DefaultTimelineService(roomId, monarchy, taskExecutor, boundaryCallback, getContextOfEventTask, RoomMemberExtractor(monarchy, roomId))
val timelineObserver = LiveDataTestObserver.test(timelineHolder.timeline())
timelineObserver.awaitNextValue().assertHasValue()
var pagedList = timelineObserver.value()
pagedList.size shouldEqual 30
(0 until pagedList.size).map {
pagedList.loadAround(it)
var timelineData = timelineObserver.value()
timelineData.events.size shouldEqual 30
(0 until timelineData.events.size).map {
timelineData.events.loadAround(it)
}
timelineObserver.awaitNextValue().assertHasValue()
pagedList = timelineObserver.value()
pagedList.size shouldEqual 60
timelineData = timelineObserver.value()
timelineData.events.size shouldEqual 60
}