Fix test.
I'll iterate on the various date format in a separate PR.
This commit is contained in:
parent
145ab9d17b
commit
8748e64242
3 changed files with 15 additions and 11 deletions
|
|
@ -8,6 +8,7 @@
|
||||||
package io.element.android.libraries.mediaviewer.impl.gallery
|
package io.element.android.libraries.mediaviewer.impl.gallery
|
||||||
|
|
||||||
import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
|
import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
|
||||||
|
import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter
|
||||||
import io.element.android.libraries.dateformatter.api.toHumanReadableDuration
|
import io.element.android.libraries.dateformatter.api.toHumanReadableDuration
|
||||||
import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
|
import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
|
||||||
import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
|
import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
|
||||||
|
|
@ -39,21 +40,18 @@ import io.element.android.libraries.matrix.api.timeline.item.event.getDisambigua
|
||||||
import io.element.android.libraries.mediaviewer.api.MediaInfo
|
import io.element.android.libraries.mediaviewer.api.MediaInfo
|
||||||
import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractor
|
import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractor
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
import java.text.DateFormat
|
|
||||||
import java.util.Date
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class EventItemFactory @Inject constructor(
|
class EventItemFactory @Inject constructor(
|
||||||
private val fileSizeFormatter: FileSizeFormatter,
|
private val fileSizeFormatter: FileSizeFormatter,
|
||||||
private val fileExtensionExtractor: FileExtensionExtractor,
|
private val fileExtensionExtractor: FileExtensionExtractor,
|
||||||
|
private val lastMessageTimestampFormatter: LastMessageTimestampFormatter,
|
||||||
) {
|
) {
|
||||||
private val timeFormatter = DateFormat.getDateInstance()
|
|
||||||
|
|
||||||
fun create(
|
fun create(
|
||||||
currentTimelineItem: MatrixTimelineItem.Event,
|
currentTimelineItem: MatrixTimelineItem.Event,
|
||||||
): MediaItem.Event? {
|
): MediaItem.Event? {
|
||||||
val event = currentTimelineItem.event
|
val event = currentTimelineItem.event
|
||||||
val sentTime = timeFormatter.format(Date(currentTimelineItem.event.timestamp))
|
val sentTime = lastMessageTimestampFormatter.format(currentTimelineItem.event.timestamp)
|
||||||
return when (val content = event.content) {
|
return when (val content = event.content) {
|
||||||
CallNotifyContent,
|
CallNotifyContent,
|
||||||
is FailedToParseMessageLikeContent,
|
is FailedToParseMessageLikeContent,
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@ package io.element.android.libraries.mediaviewer.impl.gallery
|
||||||
import com.google.common.truth.Truth.assertThat
|
import com.google.common.truth.Truth.assertThat
|
||||||
import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter
|
import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter
|
||||||
import io.element.android.libraries.core.mimetype.MimeTypes
|
import io.element.android.libraries.core.mimetype.MimeTypes
|
||||||
|
import io.element.android.libraries.dateformatter.test.A_FORMATTED_DATE
|
||||||
|
import io.element.android.libraries.dateformatter.test.FakeLastMessageTimestampFormatter
|
||||||
import io.element.android.libraries.matrix.api.media.AudioDetails
|
import io.element.android.libraries.matrix.api.media.AudioDetails
|
||||||
import io.element.android.libraries.matrix.api.media.AudioInfo
|
import io.element.android.libraries.matrix.api.media.AudioInfo
|
||||||
import io.element.android.libraries.matrix.api.media.FileInfo
|
import io.element.android.libraries.matrix.api.media.FileInfo
|
||||||
|
|
@ -160,7 +162,7 @@ class DefaultEventItemFactoryTest {
|
||||||
senderId = A_USER_ID,
|
senderId = A_USER_ID,
|
||||||
senderName = "alice",
|
senderName = "alice",
|
||||||
senderAvatar = null,
|
senderAvatar = null,
|
||||||
dateSent = "1 Jan 1970",
|
dateSent = A_FORMATTED_DATE,
|
||||||
),
|
),
|
||||||
mediaSource = MediaSource(""),
|
mediaSource = MediaSource(""),
|
||||||
)
|
)
|
||||||
|
|
@ -207,7 +209,7 @@ class DefaultEventItemFactoryTest {
|
||||||
senderId = A_USER_ID,
|
senderId = A_USER_ID,
|
||||||
senderName = "alice",
|
senderName = "alice",
|
||||||
senderAvatar = null,
|
senderAvatar = null,
|
||||||
dateSent = "1 Jan 1970",
|
dateSent = A_FORMATTED_DATE,
|
||||||
),
|
),
|
||||||
mediaSource = MediaSource(""),
|
mediaSource = MediaSource(""),
|
||||||
thumbnailSource = null,
|
thumbnailSource = null,
|
||||||
|
|
@ -251,7 +253,7 @@ class DefaultEventItemFactoryTest {
|
||||||
senderId = A_USER_ID,
|
senderId = A_USER_ID,
|
||||||
senderName = "alice",
|
senderName = "alice",
|
||||||
senderAvatar = null,
|
senderAvatar = null,
|
||||||
dateSent = "1 Jan 1970",
|
dateSent = A_FORMATTED_DATE,
|
||||||
),
|
),
|
||||||
mediaSource = MediaSource(""),
|
mediaSource = MediaSource(""),
|
||||||
)
|
)
|
||||||
|
|
@ -299,7 +301,7 @@ class DefaultEventItemFactoryTest {
|
||||||
senderId = A_USER_ID,
|
senderId = A_USER_ID,
|
||||||
senderName = "alice",
|
senderName = "alice",
|
||||||
senderAvatar = null,
|
senderAvatar = null,
|
||||||
dateSent = "1 Jan 1970",
|
dateSent = A_FORMATTED_DATE,
|
||||||
),
|
),
|
||||||
mediaSource = MediaSource(""),
|
mediaSource = MediaSource(""),
|
||||||
thumbnailSource = null,
|
thumbnailSource = null,
|
||||||
|
|
@ -348,7 +350,7 @@ class DefaultEventItemFactoryTest {
|
||||||
senderId = A_USER_ID,
|
senderId = A_USER_ID,
|
||||||
senderName = "alice",
|
senderName = "alice",
|
||||||
senderAvatar = null,
|
senderAvatar = null,
|
||||||
dateSent = "1 Jan 1970",
|
dateSent = A_FORMATTED_DATE,
|
||||||
),
|
),
|
||||||
mediaSource = MediaSource(""),
|
mediaSource = MediaSource(""),
|
||||||
)
|
)
|
||||||
|
|
@ -395,7 +397,7 @@ class DefaultEventItemFactoryTest {
|
||||||
senderId = A_USER_ID,
|
senderId = A_USER_ID,
|
||||||
senderName = "alice",
|
senderName = "alice",
|
||||||
senderAvatar = null,
|
senderAvatar = null,
|
||||||
dateSent = "1 Jan 1970",
|
dateSent = A_FORMATTED_DATE,
|
||||||
),
|
),
|
||||||
mediaSource = MediaSource(""),
|
mediaSource = MediaSource(""),
|
||||||
thumbnailSource = null,
|
thumbnailSource = null,
|
||||||
|
|
@ -407,4 +409,5 @@ class DefaultEventItemFactoryTest {
|
||||||
private fun createEventItemFactory() = EventItemFactory(
|
private fun createEventItemFactory() = EventItemFactory(
|
||||||
fileSizeFormatter = FakeFileSizeFormatter(),
|
fileSizeFormatter = FakeFileSizeFormatter(),
|
||||||
fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),
|
fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),
|
||||||
|
lastMessageTimestampFormatter = FakeLastMessageTimestampFormatter(A_FORMATTED_DATE),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,9 @@ package io.element.android.libraries.mediaviewer.impl.gallery
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import com.google.common.truth.Truth.assertThat
|
import com.google.common.truth.Truth.assertThat
|
||||||
import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter
|
import io.element.android.libraries.androidutils.filesize.FakeFileSizeFormatter
|
||||||
|
import io.element.android.libraries.dateformatter.test.A_FORMATTED_DATE
|
||||||
import io.element.android.libraries.dateformatter.test.FakeDaySeparatorFormatter
|
import io.element.android.libraries.dateformatter.test.FakeDaySeparatorFormatter
|
||||||
|
import io.element.android.libraries.dateformatter.test.FakeLastMessageTimestampFormatter
|
||||||
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
|
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
|
||||||
import io.element.android.libraries.matrix.api.core.EventId
|
import io.element.android.libraries.matrix.api.core.EventId
|
||||||
import io.element.android.libraries.matrix.api.room.MatrixRoom
|
import io.element.android.libraries.matrix.api.room.MatrixRoom
|
||||||
|
|
@ -257,6 +259,7 @@ class MediaGalleryPresenterTest {
|
||||||
eventItemFactory = EventItemFactory(
|
eventItemFactory = EventItemFactory(
|
||||||
fileSizeFormatter = FakeFileSizeFormatter(),
|
fileSizeFormatter = FakeFileSizeFormatter(),
|
||||||
fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),
|
fileExtensionExtractor = FileExtensionExtractorWithoutValidation(),
|
||||||
|
lastMessageTimestampFormatter = FakeLastMessageTimestampFormatter(A_FORMATTED_DATE),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
localMediaFactory = localMediaFactory,
|
localMediaFactory = localMediaFactory,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue