Merge pull request #6559 from element-hq/feature/bma/fixModuleDependencies

Fix module dependencies

libraries/matrix/test/build.gradle.kts

@@ -19,7 +19,6 @@ dependencies {
     api(projects.libraries.matrix.api)
     api(libs.coroutines.core)
     implementation(libs.coroutines.test)
-    implementation(projects.libraries.matrix.impl)
     implementation(projects.services.analytics.api)
     implementation(projects.tests.testutils)
     implementation(libs.kotlinx.collections.immutable)

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

@@ -8,8 +8,12 @@
 package io.element.android.libraries.matrix.test.mxc
 
 import io.element.android.libraries.matrix.api.mxc.MxcTools
-import io.element.android.libraries.matrix.impl.mxc.DefaultMxcTools
+import io.element.android.tests.testutils.lambda.lambdaError
 
 class FakeMxcTools(
-    private val delegate: MxcTools = DefaultMxcTools()
-) : MxcTools by delegate
+    private val mxcUri2FilePathResult: (String) -> String? = { lambdaError() }
+) : MxcTools {
+    override fun mxcUri2FilePath(mxcUri: String): String? {
+        return mxcUri2FilePathResult(mxcUri)
+    }
+}

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt

@@ -56,7 +56,6 @@ import io.element.android.libraries.push.impl.notifications.model.FallbackNotifi
 import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent
 import io.element.android.libraries.push.impl.notifications.model.ResolvedPushEvent
-import io.element.android.libraries.push.test.notifications.FakeCallNotificationEventResolver
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
 import io.element.android.services.toolbox.test.systemclock.FakeSystemClock

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultOnMissedCallNotificationHandlerTest.kt

@@ -18,7 +18,6 @@ import io.element.android.libraries.matrix.test.notification.FakeNotificationSer
 import io.element.android.libraries.matrix.test.notification.aNotificationData
 import io.element.android.libraries.push.impl.notifications.fake.FakeNotificationDataFactory
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
-import io.element.android.libraries.push.test.notifications.FakeCallNotificationEventResolver
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runCurrent

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/FakeCallNotificationEventResolver.kt

@@ -6,11 +6,10 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.push.test.notifications
+package io.element.android.libraries.push.impl.notifications
 
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.notification.NotificationData
-import io.element.android.libraries.push.impl.notifications.CallNotificationEventResolver
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
 import io.element.android.tests.testutils.lambda.lambdaError
 

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt

@@ -26,8 +26,8 @@ import io.element.android.libraries.push.impl.history.PushHistoryService
 import io.element.android.libraries.push.impl.notifications.FakeNotificationResultProcessor
 import io.element.android.libraries.push.impl.test.DefaultTestPush
 import io.element.android.libraries.push.impl.troubleshoot.DiagnosticPushHandler
+import io.element.android.libraries.push.impl.workmanager.FakeSyncPendingNotificationsRequestBuilder
 import io.element.android.libraries.push.impl.workmanager.SyncPendingNotificationsRequestBuilder
-import io.element.android.libraries.push.test.workmanager.FakeSyncPendingNotificationsRequestBuilder
 import io.element.android.libraries.pushproviders.api.PushData
 import io.element.android.libraries.pushstore.api.clientsecret.PushClientSecret
 import io.element.android.libraries.pushstore.test.userpushstore.FakeUserPushStore

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FakeSyncPendingNotificationsRequestBuilder.kt

@@ -5,9 +5,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.libraries.push.test.workmanager
+package io.element.android.libraries.push.impl.workmanager
 
-import io.element.android.libraries.push.impl.workmanager.SyncPendingNotificationsRequestBuilder
 import io.element.android.libraries.workmanager.api.WorkManagerRequestWrapper
 
 class FakeSyncPendingNotificationsRequestBuilder(

libraries/push/test/build.gradle.kts

@@ -18,7 +18,6 @@ dependencies {
     api(projects.libraries.push.api)
     api(projects.libraries.pushproviders.api)
     implementation(projects.libraries.designsystem)
-    implementation(projects.libraries.push.impl)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.workmanager.api)

libraries/voiceplayer/impl/src/test/kotlin/io/element/android/libraries/voiceplayer/impl/DefaultVoiceMessageMediaRepoTest.kt

@@ -32,6 +32,9 @@ class DefaultVoiceMessageMediaRepoTest {
         val repo = createDefaultVoiceMessageMediaRepo(
             temporaryFolder = temporaryFolder,
             matrixMediaLoader = matrixMediaLoader,
+            mxcUri2FilePathResult = {
+                "matrix.org/1234567890abcdefg"
+            },
         )
 
         repo.getMediaFile().let { result ->
@@ -76,6 +79,9 @@ class DefaultVoiceMessageMediaRepoTest {
         val repo = createDefaultVoiceMessageMediaRepo(
             temporaryFolder = temporaryFolder,
             matrixMediaLoader = matrixMediaLoader,
+            mxcUri2FilePathResult = {
+                "matrix.org/1234567890abcdefg"
+            },
         )
 
         repo.getMediaFile().let { result ->
@@ -98,6 +104,9 @@ class DefaultVoiceMessageMediaRepoTest {
         val repo = createDefaultVoiceMessageMediaRepo(
             temporaryFolder = temporaryFolder,
             matrixMediaLoader = matrixMediaLoader,
+            mxcUri2FilePathResult = {
+                "matrix.org/1234567890abcdefg"
+            },
         )
 
         repo.getMediaFile().let { result ->
@@ -128,10 +137,13 @@ class DefaultVoiceMessageMediaRepoTest {
 private fun createDefaultVoiceMessageMediaRepo(
     temporaryFolder: TemporaryFolder,
     matrixMediaLoader: MatrixMediaLoader = FakeMatrixMediaLoader(),
+    mxcUri2FilePathResult: (String) -> String? = { null },
     mxcUri: String = MXC_URI,
 ) = DefaultVoiceMessageMediaRepo(
     cacheDir = temporaryFolder.root,
-    mxcTools = FakeMxcTools(),
+    mxcTools = FakeMxcTools(
+        mxcUri2FilePathResult = mxcUri2FilePathResult,
+    ),
     matrixMediaLoader = matrixMediaLoader,
     mediaSource = MediaSource(
         url = mxcUri,