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

Rename class (code quality)

Browse source
This commit is contained in:
Benoit Marty 2024-05-23 11:06:53 +02:00 • committed by Benoit Marty
parent d9cfecacce
commit d4d12503c6
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessageMediaRepoTest.kt
View file

@ -21,7 +21,7 @@ import io.element.android.libraries.core.mimetype.MimeTypes
import io.element.android.libraries.matrix.api.media.MatrixMediaLoader import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
import io.element.android.libraries.matrix.api.media.MediaSource import io.element.android.libraries.matrix.api.media.MediaSource
import io.element.android.libraries.matrix.api.mxc.MxcTools import io.element.android.libraries.matrix.api.mxc.MxcTools
import io.element.android.libraries.matrix.test.media.FakeMediaLoader import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.runTest
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
@ -34,12 +34,12 @@ class DefaultVoiceMessageMediaRepoTest {
@Test @Test
fun `cache miss - downloads and returns cached file successfully`() = runTest { fun `cache miss - downloads and returns cached file successfully`() = runTest {
val fakeMediaLoader = FakeMediaLoader().apply { val matrixMediaLoader = FakeMatrixMediaLoader().apply {
path = temporaryFolder.createRustMediaFile().path path = temporaryFolder.createRustMediaFile().path
} }
val repo = createDefaultVoiceMessageMediaRepo( val repo = createDefaultVoiceMessageMediaRepo(
temporaryFolder = temporaryFolder, temporaryFolder = temporaryFolder,
matrixMediaLoader = fakeMediaLoader, matrixMediaLoader = matrixMediaLoader,
) )
repo.getMediaFile().let { result -> repo.getMediaFile().let { result ->
@ -53,12 +53,12 @@ class DefaultVoiceMessageMediaRepoTest {
@Test @Test
fun `cache miss - download fails`() = runTest { fun `cache miss - download fails`() = runTest {
val fakeMediaLoader = FakeMediaLoader().apply { val matrixMediaLoader = FakeMatrixMediaLoader().apply {
shouldFail = true shouldFail = true
} }
val repo = createDefaultVoiceMessageMediaRepo( val repo = createDefaultVoiceMessageMediaRepo(
temporaryFolder = temporaryFolder, temporaryFolder = temporaryFolder,
matrixMediaLoader = fakeMediaLoader, matrixMediaLoader = matrixMediaLoader,
) )
repo.getMediaFile().let { result -> repo.getMediaFile().let { result ->
@ -71,7 +71,7 @@ class DefaultVoiceMessageMediaRepoTest {
@Test @Test
fun `cache miss - download succeeds but file move fails`() = runTest { fun `cache miss - download succeeds but file move fails`() = runTest {
val fakeMediaLoader = FakeMediaLoader().apply { val matrixMediaLoader = FakeMatrixMediaLoader().apply {
path = temporaryFolder.createRustMediaFile().path path = temporaryFolder.createRustMediaFile().path
} }
File(temporaryFolder.cachedFilePath).apply { File(temporaryFolder.cachedFilePath).apply {
@ -83,7 +83,7 @@ class DefaultVoiceMessageMediaRepoTest {
} }
val repo = createDefaultVoiceMessageMediaRepo( val repo = createDefaultVoiceMessageMediaRepo(
temporaryFolder = temporaryFolder, temporaryFolder = temporaryFolder,
matrixMediaLoader = fakeMediaLoader, matrixMediaLoader = matrixMediaLoader,
) )
repo.getMediaFile().let { result -> repo.getMediaFile().let { result ->
@ -100,12 +100,12 @@ class DefaultVoiceMessageMediaRepoTest {
@Test @Test
fun `cache hit - returns cached file successfully`() = runTest { fun `cache hit - returns cached file successfully`() = runTest {
temporaryFolder.createCachedFile() temporaryFolder.createCachedFile()
val fakeMediaLoader = FakeMediaLoader().apply { val matrixMediaLoader = FakeMatrixMediaLoader().apply {
shouldFail = true // so that if we hit the media loader it will crash shouldFail = true // so that if we hit the media loader it will crash
} }
val repo = createDefaultVoiceMessageMediaRepo( val repo = createDefaultVoiceMessageMediaRepo(
temporaryFolder = temporaryFolder, temporaryFolder = temporaryFolder,
matrixMediaLoader = fakeMediaLoader, matrixMediaLoader = matrixMediaLoader,
) )
repo.getMediaFile().let { result -> repo.getMediaFile().let { result ->
@ -135,7 +135,7 @@ class DefaultVoiceMessageMediaRepoTest {
private fun createDefaultVoiceMessageMediaRepo( private fun createDefaultVoiceMessageMediaRepo(
temporaryFolder: TemporaryFolder, temporaryFolder: TemporaryFolder,
matrixMediaLoader: MatrixMediaLoader = FakeMediaLoader(), matrixMediaLoader: MatrixMediaLoader = FakeMatrixMediaLoader(),
mxcUri: String = MXC_URI, mxcUri: String = MXC_URI,
) = DefaultVoiceMessageMediaRepo( ) = DefaultVoiceMessageMediaRepo(
cacheDir = temporaryFolder.root, cacheDir = temporaryFolder.root,

4
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
View file

@ -40,7 +40,7 @@ import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults
import io.element.android.libraries.matrix.api.user.MatrixUser import io.element.android.libraries.matrix.api.user.MatrixUser
import io.element.android.libraries.matrix.api.verification.SessionVerificationService import io.element.android.libraries.matrix.api.verification.SessionVerificationService
import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
import io.element.android.libraries.matrix.test.media.FakeMediaLoader import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
import io.element.android.libraries.matrix.test.notification.FakeNotificationService import io.element.android.libraries.matrix.test.notification.FakeNotificationService
import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
import io.element.android.libraries.matrix.test.pushers.FakePushersService import io.element.android.libraries.matrix.test.pushers.FakePushersService
@ -66,7 +66,7 @@ class FakeMatrixClient(
private val userDisplayName: String? = A_USER_NAME, private val userDisplayName: String? = A_USER_NAME,
private val userAvatarUrl: String? = AN_AVATAR_URL, private val userAvatarUrl: String? = AN_AVATAR_URL,
override val roomListService: RoomListService = FakeRoomListService(), override val roomListService: RoomListService = FakeRoomListService(),
override val mediaLoader: MatrixMediaLoader = FakeMediaLoader(), override val mediaLoader: MatrixMediaLoader = FakeMatrixMediaLoader(),
private val sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(), private val sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),
private val pushersService: FakePushersService = FakePushersService(), private val pushersService: FakePushersService = FakePushersService(),
private val notificationService: FakeNotificationService = FakeNotificationService(), private val notificationService: FakeNotificationService = FakeNotificationService(),

2
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaLoader.kt → libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMatrixMediaLoader.kt
View file

@ -21,7 +21,7 @@ import io.element.android.libraries.matrix.api.media.MediaFile
import io.element.android.libraries.matrix.api.media.MediaSource import io.element.android.libraries.matrix.api.media.MediaSource
import io.element.android.tests.testutils.simulateLongTask import io.element.android.tests.testutils.simulateLongTask
class FakeMediaLoader : MatrixMediaLoader { class FakeMatrixMediaLoader : MatrixMediaLoader {
var shouldFail = false var shouldFail = false
var path: String = "" var path: String = ""

22
libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/MediaViewerPresenterTest.kt
View file

@ -25,7 +25,7 @@ import app.cash.turbine.test
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import io.element.android.libraries.architecture.AsyncData import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
import io.element.android.libraries.matrix.test.media.FakeMediaLoader import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
import io.element.android.libraries.matrix.test.media.aMediaSource import io.element.android.libraries.matrix.test.media.aMediaSource
import io.element.android.libraries.mediaviewer.api.local.anApkMediaInfo import io.element.android.libraries.mediaviewer.api.local.anApkMediaInfo
import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerEvents import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerEvents
@ -51,9 +51,9 @@ class MediaViewerPresenterTest {
@Test @Test
fun `present - download media success scenario`() = runTest { fun `present - download media success scenario`() = runTest {
val mediaLoader = FakeMediaLoader() val matrixMediaLoader = FakeMatrixMediaLoader()
val mediaActions = FakeLocalMediaActions() val mediaActions = FakeLocalMediaActions()
val presenter = createMediaViewerPresenter(mediaLoader, mediaActions) val presenter = createMediaViewerPresenter(matrixMediaLoader, mediaActions)
moleculeFlow(RecompositionMode.Immediate) { moleculeFlow(RecompositionMode.Immediate) {
presenter.present() presenter.present()
}.test { }.test {
@ -71,10 +71,10 @@ class MediaViewerPresenterTest {
@Test @Test
fun `present - check all actions `() = runTest { fun `present - check all actions `() = runTest {
val mediaLoader = FakeMediaLoader() val matrixMediaLoader = FakeMatrixMediaLoader()
val mediaActions = FakeLocalMediaActions() val mediaActions = FakeLocalMediaActions()
val snackbarDispatcher = SnackbarDispatcher() val snackbarDispatcher = SnackbarDispatcher()
val presenter = createMediaViewerPresenter(mediaLoader, mediaActions, snackbarDispatcher) val presenter = createMediaViewerPresenter(matrixMediaLoader, mediaActions, snackbarDispatcher)
moleculeFlow(RecompositionMode.Immediate) { moleculeFlow(RecompositionMode.Immediate) {
presenter.present() presenter.present()
}.test { }.test {
@ -118,13 +118,13 @@ class MediaViewerPresenterTest {
@Test @Test
fun `present - download media failure then retry with success scenario`() = runTest { fun `present - download media failure then retry with success scenario`() = runTest {
val mediaLoader = FakeMediaLoader() val matrixMediaLoader = FakeMatrixMediaLoader()
val mediaActions = FakeLocalMediaActions() val mediaActions = FakeLocalMediaActions()
val presenter = createMediaViewerPresenter(mediaLoader, mediaActions) val presenter = createMediaViewerPresenter(matrixMediaLoader, mediaActions)
moleculeFlow(RecompositionMode.Immediate) { moleculeFlow(RecompositionMode.Immediate) {
presenter.present() presenter.present()
}.test { }.test {
mediaLoader.shouldFail = true matrixMediaLoader.shouldFail = true
val initialState = awaitItem() val initialState = awaitItem()
assertThat(initialState.downloadedMedia).isEqualTo(AsyncData.Uninitialized) assertThat(initialState.downloadedMedia).isEqualTo(AsyncData.Uninitialized)
assertThat(initialState.mediaInfo).isEqualTo(TESTED_MEDIA_INFO) assertThat(initialState.mediaInfo).isEqualTo(TESTED_MEDIA_INFO)
@ -132,7 +132,7 @@ class MediaViewerPresenterTest {
assertThat(loadingState.downloadedMedia).isInstanceOf(AsyncData.Loading::class.java) assertThat(loadingState.downloadedMedia).isInstanceOf(AsyncData.Loading::class.java)
val failureState = awaitItem() val failureState = awaitItem()
assertThat(failureState.downloadedMedia).isInstanceOf(AsyncData.Failure::class.java) assertThat(failureState.downloadedMedia).isInstanceOf(AsyncData.Failure::class.java)
mediaLoader.shouldFail = false matrixMediaLoader.shouldFail = false
failureState.eventSink(MediaViewerEvents.RetryLoading) failureState.eventSink(MediaViewerEvents.RetryLoading)
// There is one recomposition because of the retry mechanism // There is one recomposition because of the retry mechanism
skipItems(1) skipItems(1)
@ -146,7 +146,7 @@ class MediaViewerPresenterTest {
} }
private fun createMediaViewerPresenter( private fun createMediaViewerPresenter(
mediaLoader: FakeMediaLoader, matrixMediaLoader: FakeMatrixMediaLoader,
localMediaActions: FakeLocalMediaActions, localMediaActions: FakeLocalMediaActions,
snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(), snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),
canShare: Boolean = true, canShare: Boolean = true,
@ -161,7 +161,7 @@ class MediaViewerPresenterTest {
canDownload = canDownload, canDownload = canDownload,
), ),
localMediaFactory = localMediaFactory, localMediaFactory = localMediaFactory,
mediaLoader = mediaLoader, mediaLoader = matrixMediaLoader,
localMediaActions = localMediaActions, localMediaActions = localMediaActions,
snackbarDispatcher = snackbarDispatcher, snackbarDispatcher = snackbarDispatcher,
) )