Skip to content

Commit 9ea08fb

Browse files
bmartybmarty
committed
Fix test and add tests.
1 parent 73f175a commit 9ea08fb

File tree

4 files changed

+31
-4
lines changed

4 files changed

+31
-4
lines changed

‎libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/DefaultEventItemFactoryTest.kt‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
5050
import io.element.android.libraries.mediaviewer.api.MediaInfo
5151
import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation
5252
import kotlinx.collections.immutable.persistentListOf
53+
import kotlinx.collections.immutable.toImmutableList
5354
import org.junit.Test
5455
import kotlin.time.Duration.Companion.seconds
5556

@@ -163,6 +164,7 @@ class DefaultEventItemFactoryTest {
163164
senderAvatar = null,
164165
dateSent = "0 Day false",
165166
dateSentFull = "0 Full false",
167+
waveform = null,
166168
),
167169
mediaSource = MediaSource(""),
168170
)
@@ -211,6 +213,7 @@ class DefaultEventItemFactoryTest {
211213
senderAvatar = null,
212214
dateSent = "0 Day false",
213215
dateSentFull = "0 Full false",
216+
waveform = null,
214217
),
215218
mediaSource = MediaSource(""),
216219
thumbnailSource = null,
@@ -242,7 +245,7 @@ class DefaultEventItemFactoryTest {
242245
)
243246
)
244247
assertThat(result).isEqualTo(
245-
MediaItem.File(
248+
MediaItem.Audio(
246249
id = A_UNIQUE_ID,
247250
eventId = AN_EVENT_ID,
248251
mediaInfo = MediaInfo(
@@ -256,8 +259,11 @@ class DefaultEventItemFactoryTest {
256259
senderAvatar = null,
257260
dateSent = "0 Day false",
258261
dateSentFull = "0 Full false",
262+
waveform = null,
259263
),
260264
mediaSource = MediaSource(""),
265+
duration = "7:36",
266+
waveform = null,
261267
)
262268
)
263269
}
@@ -305,6 +311,7 @@ class DefaultEventItemFactoryTest {
305311
senderAvatar = null,
306312
dateSent = "0 Day false",
307313
dateSentFull = "0 Full false",
314+
waveform = null,
308315
),
309316
mediaSource = MediaSource(""),
310317
thumbnailSource = null,
@@ -333,15 +340,15 @@ class DefaultEventItemFactoryTest {
333340
),
334341
details = AudioDetails(
335342
duration = 456.seconds,
336-
waveform = persistentListOf(),
343+
waveform = persistentListOf(1f, 2f),
337344
)
338345
)
339346
)
340347
)
341348
)
342349
)
343350
assertThat(result).isEqualTo(
344-
MediaItem.File(
351+
MediaItem.Audio(
345352
id = A_UNIQUE_ID,
346353
eventId = AN_EVENT_ID,
347354
mediaInfo = MediaInfo(
@@ -355,8 +362,11 @@ class DefaultEventItemFactoryTest {
355362
senderAvatar = null,
356363
dateSent = "0 Day false",
357364
dateSentFull = "0 Full false",
365+
waveform = listOf(1f, 2f).toImmutableList(),
358366
),
359367
mediaSource = MediaSource(""),
368+
duration = "7:36",
369+
waveform = listOf(1f, 2f).toImmutableList(),
360370
)
361371
)
362372
}
@@ -403,6 +413,7 @@ class DefaultEventItemFactoryTest {
403413
senderAvatar = null,
404414
dateSent = "0 Day false",
405415
dateSentFull = "0 Full false",
416+
waveform = null,
406417
),
407418
mediaSource = MediaSource(""),
408419
thumbnailSource = null,

‎libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaItemsPostProcessorTest.kt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.google.common.truth.Truth.assertThat
1111
import io.element.android.libraries.architecture.AsyncData
1212
import io.element.android.libraries.matrix.api.core.UniqueId
1313
import io.element.android.libraries.matrix.test.AN_EXCEPTION
14+
import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemAudio
1415
import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemDateSeparator
1516
import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemFile
1617
import io.element.android.libraries.mediaviewer.impl.gallery.ui.aMediaItemImage
@@ -23,6 +24,9 @@ class MediaItemsPostProcessorTest {
2324
private val file1 = aMediaItemFile(id = UniqueId("1"))
2425
private val file2 = aMediaItemFile(id = UniqueId("2"))
2526
private val file3 = aMediaItemFile(id = UniqueId("3"))
27+
private val audio1 = aMediaItemAudio(id = UniqueId("1"))
28+
private val audio2 = aMediaItemAudio(id = UniqueId("2"))
29+
private val audio3 = aMediaItemAudio(id = UniqueId("3"))
2630
private val image1 = aMediaItemImage(id = UniqueId("1"))
2731
private val image2 = aMediaItemImage(id = UniqueId("2"))
2832
private val image3 = aMediaItemImage(id = UniqueId("3"))
@@ -68,6 +72,7 @@ class MediaItemsPostProcessorTest {
6872
fun `process will reorder files`() {
6973
test(
7074
mediaItems = listOf(
75+
audio1,
7176
file3,
7277
file2,
7378
file1,
@@ -79,6 +84,7 @@ class MediaItemsPostProcessorTest {
7984
file1,
8085
file2,
8186
file3,
87+
audio1,
8288
),
8389
)
8490
}
@@ -106,6 +112,7 @@ class MediaItemsPostProcessorTest {
106112
fun `process will split images, videos and files`() {
107113
test(
108114
mediaItems = listOf(
115+
audio1,
109116
file1,
110117
image1,
111118
video1,
@@ -119,6 +126,7 @@ class MediaItemsPostProcessorTest {
119126
expectedFileItems = listOf(
120127
date1,
121128
file1,
129+
audio1,
122130
),
123131
)
124132
}
@@ -155,6 +163,9 @@ class MediaItemsPostProcessorTest {
155163
fun `process will handle complex case`() {
156164
test(
157165
mediaItems = listOf(
166+
audio3,
167+
audio2,
168+
audio1,
158169
file1,
159170
image1,
160171
video1,
@@ -178,6 +189,9 @@ class MediaItemsPostProcessorTest {
178189
expectedFileItems = listOf(
179190
date1,
180191
file1,
192+
audio1,
193+
audio2,
194+
audio3,
181195
date3,
182196
file3,
183197
loading1,

‎libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/local/AndroidLocalMediaFactoryTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ class AndroidLocalMediaFactoryTest {
4848
senderName = A_USER_NAME,
4949
senderAvatar = null,
5050
dateSent = "12:34",
51-
dateSentFull = "full"
51+
dateSentFull = "full",
52+
waveform = null,
5253
)
5354
)
5455
}

‎libraries/mediaviewer/test/src/main/kotlin/io/element/android/libraries/mediaviewer/test/FakeLocalMediaFactory.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class FakeLocalMediaFactory(
4242
senderAvatar = null,
4343
dateSent = null,
4444
dateSentFull = null,
45+
waveform = null,
4546
)
4647
return aLocalMedia(uri, mediaInfo)
4748
}

0 commit comments

Comments
 (0)