From 0b5abc7a73d6beeefd91d10bb4f88b59dd83d1d6 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 2 Mar 2023 16:27:47 +0100 Subject: [PATCH] Move module `matrixtest` to `matrix.test` --- app/build.gradle.kts | 2 +- .../element/android/x/root/FakeBugReporter.kt | 2 +- features/login/build.gradle.kts | 2 +- .../changeserver/ChangeServerPresenterTest.kt | 4 +-- .../login/root/LoginRootPresenterTest.kt | 14 ++++----- features/logout/build.gradle.kts | 2 +- .../logout/LogoutPreferencePresenterTest.kt | 6 ++-- features/messages/build.gradle.kts | 2 +- .../messages/MessagesPresenterTest.kt | 17 ++--------- .../actionlist/ActionListPresenterTest.kt | 9 +++--- .../messages/fixtures/aMessageEvent.kt | 8 ++--- .../MessageComposerPresenterTest.kt | 12 ++++---- .../timeline/TimelinePresenterTest.kt | 6 ++-- features/preferences/build.gradle.kts | 2 +- .../root/PreferencesRootPresenterTest.kt | 2 +- features/rageshake/build.gradle.kts | 2 +- .../bugreport/BugReportPresenterTest.kt | 2 +- .../rageshake/bugreport/FakeBugReporter.kt | 2 +- .../RageshakeDetectionPresenterTest.kt | 2 +- features/roomlist/build.gradle.kts | 2 +- .../roomlist/RoomListPresenterTests.kt | 21 +++++++------ features/template/build.gradle.kts | 2 +- libraries/matrix/test/build.gradle.kts | 10 ++----- .../matrix/test}/FakeMatrixClient.kt | 8 ++--- .../libraries/matrix/test}/TestData.kt | 2 +- .../test}/auth/FakeAuthenticationService.kt | 6 ++-- .../matrix/test}/media/FakeMediaResolver.kt | 2 +- .../matrix/test}/room/FakeMatrixRoom.kt | 6 ++-- .../test}/room/FakeRoomSummaryDataSource.kt | 2 +- .../matrix/test}/room/RoomSummaryFixture.kt | 8 ++--- .../test}/timeline/FakeMatrixTimeline.kt | 2 +- libraries/matrixtest/build.gradle.kts | 30 ------------------- .../matrixtest/src/main/AndroidManifest.xml | 18 ----------- settings.gradle.kts | 1 - 34 files changed, 74 insertions(+), 144 deletions(-) rename libraries/{matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest => matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test}/FakeMatrixClient.kt (90%) rename libraries/{matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest => matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test}/TestData.kt (96%) rename libraries/{matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest => matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test}/auth/FakeAuthenticationService.kt (91%) rename libraries/{matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest => matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test}/media/FakeMediaResolver.kt (94%) rename libraries/{matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest => matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test}/room/FakeMatrixRoom.kt (93%) rename libraries/{matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest => matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test}/room/FakeRoomSummaryDataSource.kt (96%) rename libraries/{matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest => matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test}/room/RoomSummaryFixture.kt (89%) rename libraries/{matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest => matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test}/timeline/FakeMatrixTimeline.kt (98%) delete mode 100644 libraries/matrixtest/build.gradle.kts delete mode 100644 libraries/matrixtest/src/main/AndroidManifest.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b279c693ea..0f5ba569ff 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -221,5 +221,5 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(projects.libraries.matrixtest) + testImplementation(projects.libraries.matrix.test) } diff --git a/app/src/test/kotlin/io/element/android/x/root/FakeBugReporter.kt b/app/src/test/kotlin/io/element/android/x/root/FakeBugReporter.kt index c6f7000cdf..46df2bfcac 100644 --- a/app/src/test/kotlin/io/element/android/x/root/FakeBugReporter.kt +++ b/app/src/test/kotlin/io/element/android/x/root/FakeBugReporter.kt @@ -19,7 +19,7 @@ package io.element.android.x.root import io.element.android.features.rageshake.reporter.BugReporter import io.element.android.features.rageshake.reporter.BugReporterListener import io.element.android.features.rageshake.reporter.ReportType -import io.element.android.libraries.matrixtest.A_FAILURE_REASON +import io.element.android.libraries.matrix.test.A_FAILURE_REASON import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts index 076a299e77..f2a60f2fa3 100644 --- a/features/login/build.gradle.kts +++ b/features/login/build.gradle.kts @@ -48,7 +48,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(projects.libraries.matrixtest) + testImplementation(projects.libraries.matrix.test) androidTestImplementation(libs.test.junitext) } diff --git a/features/login/src/test/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenterTest.kt b/features/login/src/test/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenterTest.kt index b22c03dc35..391db25f6a 100644 --- a/features/login/src/test/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenterTest.kt +++ b/features/login/src/test/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenterTest.kt @@ -23,8 +23,8 @@ import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import io.element.android.libraries.architecture.Async -import io.element.android.libraries.matrixtest.A_HOMESERVER -import io.element.android.libraries.matrixtest.auth.FakeAuthenticationService +import io.element.android.libraries.matrix.test.A_HOMESERVER +import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/features/login/src/test/kotlin/io/element/android/features/login/root/LoginRootPresenterTest.kt b/features/login/src/test/kotlin/io/element/android/features/login/root/LoginRootPresenterTest.kt index d3e18acb0e..4aa8eb7476 100644 --- a/features/login/src/test/kotlin/io/element/android/features/login/root/LoginRootPresenterTest.kt +++ b/features/login/src/test/kotlin/io/element/android/features/login/root/LoginRootPresenterTest.kt @@ -22,13 +22,13 @@ import app.cash.molecule.RecompositionClock import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat -import io.element.android.libraries.matrixtest.A_HOMESERVER -import io.element.android.libraries.matrixtest.A_HOMESERVER_2 -import io.element.android.libraries.matrixtest.A_PASSWORD -import io.element.android.libraries.matrixtest.A_SESSION_ID -import io.element.android.libraries.matrixtest.A_THROWABLE -import io.element.android.libraries.matrixtest.A_USER_NAME -import io.element.android.libraries.matrixtest.auth.FakeAuthenticationService +import io.element.android.libraries.matrix.test.A_HOMESERVER +import io.element.android.libraries.matrix.test.A_HOMESERVER_2 +import io.element.android.libraries.matrix.test.A_PASSWORD +import io.element.android.libraries.matrix.test.A_SESSION_ID +import io.element.android.libraries.matrix.test.A_THROWABLE +import io.element.android.libraries.matrix.test.A_USER_NAME +import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/features/logout/build.gradle.kts b/features/logout/build.gradle.kts index 8d4f43cb73..dfb74b8170 100644 --- a/features/logout/build.gradle.kts +++ b/features/logout/build.gradle.kts @@ -46,7 +46,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(projects.libraries.matrixtest) + testImplementation(projects.libraries.matrix.test) androidTestImplementation(libs.test.junitext) } diff --git a/features/logout/src/test/kotlin/io/element/android/features/logout/LogoutPreferencePresenterTest.kt b/features/logout/src/test/kotlin/io/element/android/features/logout/LogoutPreferencePresenterTest.kt index f00ede65db..e161e4037f 100644 --- a/features/logout/src/test/kotlin/io/element/android/features/logout/LogoutPreferencePresenterTest.kt +++ b/features/logout/src/test/kotlin/io/element/android/features/logout/LogoutPreferencePresenterTest.kt @@ -23,10 +23,8 @@ import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import io.element.android.libraries.architecture.Async -import io.element.android.libraries.matrixtest.A_SESSION_ID -import io.element.android.libraries.matrixtest.A_THROWABLE -import io.element.android.libraries.matrixtest.A_USER_ID -import io.element.android.libraries.matrixtest.FakeMatrixClient +import io.element.android.libraries.matrix.test.A_THROWABLE +import io.element.android.libraries.matrix.test.FakeMatrixClient import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/features/messages/build.gradle.kts b/features/messages/build.gradle.kts index cb9c0bd11e..eb73115c8a 100644 --- a/features/messages/build.gradle.kts +++ b/features/messages/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(projects.libraries.matrixtest) + testImplementation(projects.libraries.matrix.test) androidTestImplementation(libs.test.junitext) ksp(libs.showkase.processor) diff --git a/features/messages/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt b/features/messages/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt index 49786d1c49..2a2a503f27 100644 --- a/features/messages/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt +++ b/features/messages/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt @@ -28,24 +28,13 @@ import io.element.android.features.messages.fixtures.aMessageEvent import io.element.android.features.messages.fixtures.aTimelineItemsFactory import io.element.android.features.messages.textcomposer.MessageComposerPresenter import io.element.android.features.messages.timeline.TimelinePresenter -import io.element.android.features.messages.timeline.model.TimelineItem -import io.element.android.features.messages.timeline.model.TimelineItemReactions -import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent -import io.element.android.features.messages.timeline.model.event.TimelineItemTextContent -import io.element.android.libraries.core.coroutine.CoroutineDispatchers -import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.matrix.room.MatrixRoom -import io.element.android.libraries.matrixtest.AN_EVENT_ID -import io.element.android.libraries.matrixtest.A_MESSAGE -import io.element.android.libraries.matrixtest.A_ROOM_ID -import io.element.android.libraries.matrixtest.A_USER_ID -import io.element.android.libraries.matrixtest.A_USER_NAME -import io.element.android.libraries.matrixtest.room.FakeMatrixRoom +import io.element.android.libraries.matrix.test.AN_EVENT_ID +import io.element.android.libraries.matrix.test.A_ROOM_ID +import io.element.android.libraries.matrix.test.room.FakeMatrixRoom import io.element.android.libraries.textcomposer.MessageComposerMode -import kotlinx.collections.immutable.persistentListOf import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestScope -import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/features/messages/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt b/features/messages/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt index 2c0f9164a3..66dbb6caca 100644 --- a/features/messages/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt +++ b/features/messages/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt @@ -29,15 +29,14 @@ import io.element.android.features.messages.timeline.model.event.TimelineItemEve import io.element.android.features.messages.timeline.model.event.TimelineItemRedactedContent import io.element.android.features.messages.timeline.model.event.TimelineItemTextContent import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.libraries.matrixtest.AN_EVENT_ID -import io.element.android.libraries.matrixtest.A_MESSAGE -import io.element.android.libraries.matrixtest.A_USER_ID -import io.element.android.libraries.matrixtest.A_USER_NAME +import io.element.android.libraries.matrix.test.AN_EVENT_ID +import io.element.android.libraries.matrix.test.A_MESSAGE +import io.element.android.libraries.matrix.test.A_USER_ID +import io.element.android.libraries.matrix.test.A_USER_NAME import kotlinx.collections.immutable.persistentListOf import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Test -import org.matrix.rustcomponents.sdk.TimelineItemContent class ActionListPresenterTest { @Test diff --git a/features/messages/src/test/kotlin/io/element/android/features/messages/fixtures/aMessageEvent.kt b/features/messages/src/test/kotlin/io/element/android/features/messages/fixtures/aMessageEvent.kt index 9e665be409..9679148a16 100644 --- a/features/messages/src/test/kotlin/io/element/android/features/messages/fixtures/aMessageEvent.kt +++ b/features/messages/src/test/kotlin/io/element/android/features/messages/fixtures/aMessageEvent.kt @@ -21,10 +21,10 @@ import io.element.android.features.messages.timeline.model.TimelineItemReactions import io.element.android.features.messages.timeline.model.event.TimelineItemEventContent import io.element.android.features.messages.timeline.model.event.TimelineItemTextContent import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.libraries.matrixtest.AN_EVENT_ID -import io.element.android.libraries.matrixtest.A_MESSAGE -import io.element.android.libraries.matrixtest.A_USER_ID -import io.element.android.libraries.matrixtest.A_USER_NAME +import io.element.android.libraries.matrix.test.AN_EVENT_ID +import io.element.android.libraries.matrix.test.A_MESSAGE +import io.element.android.libraries.matrix.test.A_USER_ID +import io.element.android.libraries.matrix.test.A_USER_NAME import kotlinx.collections.immutable.persistentListOf internal fun aMessageEvent( diff --git a/features/messages/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt b/features/messages/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt index 8278acd13e..03284239ce 100644 --- a/features/messages/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt +++ b/features/messages/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt @@ -24,12 +24,12 @@ import app.cash.turbine.ReceiveTurbine import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import io.element.android.libraries.core.data.StableCharSequence -import io.element.android.libraries.matrixtest.ANOTHER_MESSAGE -import io.element.android.libraries.matrixtest.AN_EVENT_ID -import io.element.android.libraries.matrixtest.A_MESSAGE -import io.element.android.libraries.matrixtest.A_REPLY -import io.element.android.libraries.matrixtest.A_USER_NAME -import io.element.android.libraries.matrixtest.room.FakeMatrixRoom +import io.element.android.libraries.matrix.test.ANOTHER_MESSAGE +import io.element.android.libraries.matrix.test.AN_EVENT_ID +import io.element.android.libraries.matrix.test.A_MESSAGE +import io.element.android.libraries.matrix.test.A_REPLY +import io.element.android.libraries.matrix.test.A_USER_NAME +import io.element.android.libraries.matrix.test.room.FakeMatrixRoom import io.element.android.libraries.textcomposer.MessageComposerMode import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest diff --git a/features/messages/src/test/kotlin/io/element/android/features/messages/timeline/TimelinePresenterTest.kt b/features/messages/src/test/kotlin/io/element/android/features/messages/timeline/TimelinePresenterTest.kt index b209d4ce5e..193c9eca9f 100644 --- a/features/messages/src/test/kotlin/io/element/android/features/messages/timeline/TimelinePresenterTest.kt +++ b/features/messages/src/test/kotlin/io/element/android/features/messages/timeline/TimelinePresenterTest.kt @@ -23,9 +23,9 @@ import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import io.element.android.features.messages.fixtures.aTimelineItemsFactory -import io.element.android.libraries.matrixtest.AN_EVENT_ID -import io.element.android.libraries.matrixtest.room.FakeMatrixRoom -import io.element.android.libraries.matrixtest.timeline.FakeMatrixTimeline +import io.element.android.libraries.matrix.test.AN_EVENT_ID +import io.element.android.libraries.matrix.test.room.FakeMatrixRoom +import io.element.android.libraries.matrix.test.timeline.FakeMatrixTimeline import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/features/preferences/build.gradle.kts b/features/preferences/build.gradle.kts index ba069e6333..690c43abb9 100644 --- a/features/preferences/build.gradle.kts +++ b/features/preferences/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(projects.libraries.matrixtest) + testImplementation(projects.libraries.matrix.test) androidTestImplementation(libs.test.junitext) ksp(libs.showkase.processor) diff --git a/features/preferences/src/test/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenterTest.kt b/features/preferences/src/test/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenterTest.kt index 77d5ff9a07..b91db2fb44 100644 --- a/features/preferences/src/test/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenterTest.kt +++ b/features/preferences/src/test/kotlin/io/element/android/features/preferences/root/PreferencesRootPresenterTest.kt @@ -25,7 +25,7 @@ import com.google.common.truth.Truth.assertThat import io.element.android.features.logout.LogoutPreferencePresenter import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter import io.element.android.libraries.architecture.Async -import io.element.android.libraries.matrixtest.FakeMatrixClient +import io.element.android.libraries.matrix.test.FakeMatrixClient import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/features/rageshake/build.gradle.kts b/features/rageshake/build.gradle.kts index 45cc9cdd64..096fa2b186 100644 --- a/features/rageshake/build.gradle.kts +++ b/features/rageshake/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(projects.libraries.matrixtest) + testImplementation(projects.libraries.matrix.test) testImplementation(libs.test.mockk) androidTestImplementation(libs.test.junitext) diff --git a/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenterTest.kt b/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenterTest.kt index 484c3bd1b0..93252c8891 100644 --- a/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenterTest.kt +++ b/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/bugreport/BugReportPresenterTest.kt @@ -25,7 +25,7 @@ import com.google.common.truth.Truth.assertThat import io.element.android.features.rageshake.crash.ui.A_CRASH_DATA import io.element.android.features.rageshake.crash.ui.FakeCrashDataStore import io.element.android.libraries.architecture.Async -import io.element.android.libraries.matrixtest.A_FAILURE_REASON +import io.element.android.libraries.matrix.test.A_FAILURE_REASON import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/bugreport/FakeBugReporter.kt b/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/bugreport/FakeBugReporter.kt index 29977d7a95..558edf0b15 100644 --- a/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/bugreport/FakeBugReporter.kt +++ b/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/bugreport/FakeBugReporter.kt @@ -19,7 +19,7 @@ package io.element.android.features.rageshake.bugreport import io.element.android.features.rageshake.reporter.BugReporter import io.element.android.features.rageshake.reporter.BugReporterListener import io.element.android.features.rageshake.reporter.ReportType -import io.element.android.libraries.matrixtest.A_FAILURE_REASON +import io.element.android.libraries.matrix.test.A_FAILURE_REASON import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenterTest.kt b/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenterTest.kt index 1ef8941bff..2993ab41f1 100644 --- a/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenterTest.kt +++ b/features/rageshake/src/test/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenterTest.kt @@ -28,7 +28,7 @@ import io.element.android.features.rageshake.preferences.FakeRageShake import io.element.android.features.rageshake.preferences.FakeRageshakeDataStore import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter import io.element.android.features.rageshake.screenshot.ImageResult -import io.element.android.libraries.matrixtest.AN_EXCEPTION +import io.element.android.libraries.matrix.test.AN_EXCEPTION import io.mockk.mockk import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.first diff --git a/features/roomlist/build.gradle.kts b/features/roomlist/build.gradle.kts index 409af4c97a..9293ebe035 100644 --- a/features/roomlist/build.gradle.kts +++ b/features/roomlist/build.gradle.kts @@ -49,7 +49,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(projects.libraries.matrixtest) + testImplementation(projects.libraries.matrix.test) //testImplementation(testFixtures(projects.libraries.matrix)) diff --git a/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt b/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt index 5ea1636d3f..6bb7400db9 100644 --- a/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt +++ b/features/roomlist/src/test/kotlin/io/element/android/features/roomlist/RoomListPresenterTests.kt @@ -26,17 +26,16 @@ import io.element.android.features.roomlist.model.RoomListEvents import io.element.android.features.roomlist.model.RoomListRoomSummary import io.element.android.libraries.dateformatter.LastMessageFormatter import io.element.android.libraries.designsystem.components.avatar.AvatarData -import io.element.android.libraries.matrixtest.AN_AVATAR_URL -import io.element.android.libraries.matrixtest.AN_EXCEPTION -import io.element.android.libraries.matrixtest.A_MESSAGE -import io.element.android.libraries.matrixtest.A_ROOM_ID -import io.element.android.libraries.matrixtest.A_ROOM_NAME -import io.element.android.libraries.matrixtest.A_SESSION_ID -import io.element.android.libraries.matrixtest.A_USER_ID -import io.element.android.libraries.matrixtest.A_USER_NAME -import io.element.android.libraries.matrixtest.FakeMatrixClient -import io.element.android.libraries.matrixtest.room.FakeRoomSummaryDataSource -import io.element.android.libraries.matrixtest.room.aRoomSummaryFilled +import io.element.android.libraries.matrix.test.AN_AVATAR_URL +import io.element.android.libraries.matrix.test.AN_EXCEPTION +import io.element.android.libraries.matrix.test.A_MESSAGE +import io.element.android.libraries.matrix.test.A_ROOM_ID +import io.element.android.libraries.matrix.test.A_ROOM_NAME +import io.element.android.libraries.matrix.test.A_USER_ID +import io.element.android.libraries.matrix.test.A_USER_NAME +import io.element.android.libraries.matrix.test.FakeMatrixClient +import io.element.android.libraries.matrix.test.room.FakeRoomSummaryDataSource +import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/features/template/build.gradle.kts b/features/template/build.gradle.kts index 13a97eb770..fb28cb3b45 100644 --- a/features/template/build.gradle.kts +++ b/features/template/build.gradle.kts @@ -48,7 +48,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(projects.libraries.matrixtest) + testImplementation(projects.libraries.matrix.test) androidTestImplementation(libs.test.junitext) diff --git a/libraries/matrix/test/build.gradle.kts b/libraries/matrix/test/build.gradle.kts index 4a39cb1340..42b3658f20 100644 --- a/libraries/matrix/test/build.gradle.kts +++ b/libraries/matrix/test/build.gradle.kts @@ -18,19 +18,13 @@ @Suppress("DSL_SCOPE_VIOLATION") plugins { id("io.element.android-library") - alias(libs.plugins.anvil) - kotlin("plugin.serialization") version "1.8.10" } android { namespace = "io.element.android.libraries.matrix.test" } -anvil { - generateDaggerFactories.set(true) -} - dependencies { - implementation(projects.libraries.di) - implementation(projects.libraries.matrix.api) + api(projects.libraries.matrix.api) + api(libs.coroutines.core) } diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt similarity index 90% rename from libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt index 7c211c102f..b1e06c60a0 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.matrixtest +package io.element.android.libraries.matrix.test import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.core.RoomId @@ -22,9 +22,9 @@ import io.element.android.libraries.matrix.core.SessionId import io.element.android.libraries.matrix.media.MediaResolver import io.element.android.libraries.matrix.room.MatrixRoom import io.element.android.libraries.matrix.room.RoomSummaryDataSource -import io.element.android.libraries.matrixtest.media.FakeMediaResolver -import io.element.android.libraries.matrixtest.room.FakeMatrixRoom -import io.element.android.libraries.matrixtest.room.FakeRoomSummaryDataSource +import io.element.android.libraries.matrix.test.media.FakeMediaResolver +import io.element.android.libraries.matrix.test.room.FakeMatrixRoom +import io.element.android.libraries.matrix.test.room.FakeRoomSummaryDataSource import kotlinx.coroutines.delay import org.matrix.rustcomponents.sdk.MediaSource diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/TestData.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt similarity index 96% rename from libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/TestData.kt rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt index 3aa3c2aba3..8ea1b303a7 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/TestData.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/TestData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.matrixtest +package io.element.android.libraries.matrix.test import io.element.android.libraries.matrix.core.EventId import io.element.android.libraries.matrix.core.RoomId diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/auth/FakeAuthenticationService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt similarity index 91% rename from libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/auth/FakeAuthenticationService.kt rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt index b5981aa2f1..ce9c2d61bc 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/auth/FakeAuthenticationService.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.element.android.libraries.matrixtest.auth +package io.element.android.libraries.matrix.test.auth import io.element.android.libraries.matrix.MatrixClient import io.element.android.libraries.matrix.auth.MatrixAuthenticationService import io.element.android.libraries.matrix.core.UserId -import io.element.android.libraries.matrixtest.A_HOMESERVER -import io.element.android.libraries.matrixtest.A_USER_ID +import io.element.android.libraries.matrix.test.A_HOMESERVER +import io.element.android.libraries.matrix.test.A_USER_ID import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaResolver.kt similarity index 94% rename from libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaResolver.kt index ef171e5a09..3184166216 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/media/FakeMediaResolver.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaResolver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.matrixtest.media +package io.element.android.libraries.matrix.test.media import io.element.android.libraries.matrix.media.MediaResolver diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt similarity index 93% rename from libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt index 3f5028291c..ae78f24b98 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeMatrixRoom.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.element.android.libraries.matrixtest.room +package io.element.android.libraries.matrix.test.room import io.element.android.libraries.matrix.core.EventId import io.element.android.libraries.matrix.core.RoomId import io.element.android.libraries.matrix.room.MatrixRoom +import io.element.android.libraries.matrix.test.A_ROOM_ID +import io.element.android.libraries.matrix.test.timeline.FakeMatrixTimeline import io.element.android.libraries.matrix.timeline.MatrixTimeline -import io.element.android.libraries.matrixtest.A_ROOM_ID -import io.element.android.libraries.matrixtest.timeline.FakeMatrixTimeline import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeRoomSummaryDataSource.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeRoomSummaryDataSource.kt similarity index 96% rename from libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeRoomSummaryDataSource.kt rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeRoomSummaryDataSource.kt index 9d7cb3e377..2bbdf38e6f 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/FakeRoomSummaryDataSource.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeRoomSummaryDataSource.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.matrixtest.room +package io.element.android.libraries.matrix.test.room import io.element.android.libraries.matrix.room.RoomSummary import io.element.android.libraries.matrix.room.RoomSummaryDataSource diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/RoomSummaryFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt similarity index 89% rename from libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/RoomSummaryFixture.kt rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt index 41d9f6d524..58a96dc853 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/RoomSummaryFixture.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.element.android.libraries.matrixtest.room +package io.element.android.libraries.matrix.test.room import io.element.android.libraries.matrix.core.RoomId import io.element.android.libraries.matrix.room.RoomSummary import io.element.android.libraries.matrix.room.RoomSummaryDetails -import io.element.android.libraries.matrixtest.A_MESSAGE -import io.element.android.libraries.matrixtest.A_ROOM_ID -import io.element.android.libraries.matrixtest.A_ROOM_NAME +import io.element.android.libraries.matrix.test.A_MESSAGE +import io.element.android.libraries.matrix.test.A_ROOM_ID +import io.element.android.libraries.matrix.test.A_ROOM_NAME fun aRoomSummaryFilled( roomId: RoomId = A_ROOM_ID, diff --git a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeMatrixTimeline.kt similarity index 98% rename from libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeMatrixTimeline.kt index 1fdf17260f..b0e899cf85 100644 --- a/libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeMatrixTimeline.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.libraries.matrixtest.timeline +package io.element.android.libraries.matrix.test.timeline import io.element.android.libraries.matrix.core.EventId import io.element.android.libraries.matrix.timeline.MatrixTimeline diff --git a/libraries/matrixtest/build.gradle.kts b/libraries/matrixtest/build.gradle.kts deleted file mode 100644 index 7eedee1b28..0000000000 --- a/libraries/matrixtest/build.gradle.kts +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2023 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed -@Suppress("DSL_SCOPE_VIOLATION") -plugins { - id("io.element.android-library") -} - -android { - namespace = "io.element.android.libraries.matrix.test" -} - -dependencies { - api(projects.libraries.matrix.api) - api(libs.coroutines.core) -} diff --git a/libraries/matrixtest/src/main/AndroidManifest.xml b/libraries/matrixtest/src/main/AndroidManifest.xml deleted file mode 100644 index 6a35d06cce..0000000000 --- a/libraries/matrixtest/src/main/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - diff --git a/settings.gradle.kts b/settings.gradle.kts index 5031d83c89..2e5312a9f4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -61,7 +61,6 @@ include(":tests:uitests") include(":anvilannotations") include(":anvilcodegen") include(":libraries:architecture") -include(":libraries:matrixtest") include(":features:template") include(":libraries:androidutils") include(":samples:minimal")