Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Use MimeTypes object instead of hard-coded strings.

Browse source
This commit is contained in:
Benoit Marty 2023-11-27 21:55:39 +01:00 • committed by Benoit Marty
parent 04be1f0385
commit 4f32299280
14 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTests.kt
View file

@ -18,6 +18,7 @@ package io.element.android.libraries.mediaupload.api
import android.net.Uri
import com.google.common.truth.Truth.assertThat
import io.element.android.libraries.core.mimetype.MimeTypes
import io.element.android.libraries.matrix.api.room.MatrixRoom
import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
@ -39,7 +40,7 @@ class MediaSenderTests {
val sender = aMediaSender(preProcessor)
val uri = Uri.parse("content://image.jpg")
sender.sendMedia(uri = uri, mimeType = "image/jpeg", compressIfPossible = true)
sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, compressIfPossible = true)
assertThat(preProcessor.processCallCount).isEqualTo(1)
}
@ -50,7 +51,7 @@ class MediaSenderTests {
val sender = aMediaSender(room = room)
val uri = Uri.parse("content://image.jpg")
sender.sendMedia(uri = uri, mimeType = "image/jpeg", compressIfPossible = true)
sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, compressIfPossible = true)
assertThat(room.sendMediaCount).isEqualTo(1)
}
@ -63,7 +64,7 @@ class MediaSenderTests {
val sender = aMediaSender(preProcessor)
val uri = Uri.parse("content://image.jpg")
val result = sender.sendMedia(uri = uri, mimeType = "image/jpeg", compressIfPossible = true)
val result = sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, compressIfPossible = true)
assertThat(result.exceptionOrNull()).isNotNull()
}
@ -76,7 +77,7 @@ class MediaSenderTests {
val sender = aMediaSender(room = room)
val uri = Uri.parse("content://image.jpg")
val result = sender.sendMedia(uri = uri, mimeType = "image/jpeg", compressIfPossible = true)
val result = sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, compressIfPossible = true)
assertThat(result.exceptionOrNull()).isNotNull()
}
@ -88,7 +89,7 @@ class MediaSenderTests {
val sender = aMediaSender(room = room)
val sendJob = launch {
val uri = Uri.parse("content://image.jpg")
sender.sendMedia(uri = uri, mimeType = "image/jpeg", compressIfPossible = true)
sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg, compressIfPossible = true)
}
// Wait until several internal tasks run and the file is being uploaded
advanceTimeBy(3L)

1
libraries/mediaupload/test/build.gradle.kts
View file

@ -24,5 +24,6 @@ android {
dependencies {
api(projects.libraries.mediaupload.api)
implementation(projects.libraries.core)
implementation(projects.tests.testutils)
}

5
libraries/mediaupload/test/src/main/kotlin/io/element/android/libraries/mediaupload/test/FakeMediaPreProcessor.kt
View file

@ -17,6 +17,7 @@
package io.element.android.libraries.mediaupload.test
import android.net.Uri
import io.element.android.libraries.core.mimetype.MimeTypes
import io.element.android.libraries.matrix.api.media.AudioInfo
import io.element.android.libraries.matrix.api.media.FileInfo
import io.element.android.libraries.mediaupload.api.MediaPreProcessor
@ -34,7 +35,7 @@ class FakeMediaPreProcessor : MediaPreProcessor {
MediaUploadInfo.AnyFile(
File("test"),
FileInfo(
mimetype = "*/*",
mimetype = MimeTypes.Any,
size = 999L,
thumbnailInfo = null,
thumbnailSource = null,
@ -64,7 +65,7 @@ class FakeMediaPreProcessor : MediaPreProcessor {
audioInfo = AudioInfo(
duration = 1000.seconds,
size = 1000,
mimetype = "audio/ogg",
mimetype = MimeTypes.Ogg,
),
)
)