Rename class (code quality)

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

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

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

@@ -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.verification.SessionVerificationService
 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.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.pushers.FakePushersService
@@ -66,7 +66,7 @@ class FakeMatrixClient(
     private val userDisplayName: String? = A_USER_NAME,
     private val userAvatarUrl: String? = AN_AVATAR_URL,
     override val roomListService: RoomListService = FakeRoomListService(),
-    override val mediaLoader: MatrixMediaLoader = FakeMediaLoader(),
+    override val mediaLoader: MatrixMediaLoader = FakeMatrixMediaLoader(),
     private val sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),
     private val pushersService: FakePushersService = FakePushersService(),
     private val notificationService: FakeNotificationService = FakeNotificationService(),

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMatrixMediaLoader.kt

@@ -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.tests.testutils.simulateLongTask
 
-class FakeMediaLoader : MatrixMediaLoader {
+class FakeMatrixMediaLoader : MatrixMediaLoader {
     var shouldFail = false
     var path: String = ""
 

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

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