Remove useless OptIn in tests

2023-05-12 10:05:39 +02:00 · 2023-05-12 10:05:39 +02:00 · c22d181d8c
commit c22d181d8c
parent 363162e252
29 changed files with 42 additions and 127 deletions
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-@file:OptIn(ExperimentalCoroutinesApi::class)
-
 package io.element.android.features.messages

 import app.cash.molecule.RecompositionClock
@ -40,7 +38,6 @@ import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.libraries.mediapickers.test.FakePickerProvider
 import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
 import io.element.android.libraries.textcomposer.MessageComposerMode
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-@file:OptIn(ExperimentalCoroutinesApi::class)
-
 package io.element.android.features.messages.actionlist

 import app.cash.molecule.RecompositionClock
@ -23,9 +21,9 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.messages.impl.actionlist.ActionListEvents
-import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.actionlist.ActionListPresenter
 import io.element.android.features.messages.impl.actionlist.ActionListState
+import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.TimelineItemReactions
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
@ -37,7 +35,6 @@ 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

--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/timelineItemsFactory.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/timelineItemsFactory.kt
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-@file:OptIn(ExperimentalCoroutinesApi::class)
-
 package io.element.android.features.messages.fixtures

 import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactory
@ -34,7 +32,6 @@ import io.element.android.features.messages.impl.timeline.factories.virtual.Time
 import io.element.android.features.messages.impl.timeline.factories.virtual.TimelineItemVirtualFactory
 import io.element.android.libraries.dateformatter.test.FakeDaySeparatorFormatter
 import io.element.android.tests.testutils.testCoroutineDispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi

 internal fun aTimelineItemsFactory() = TimelineItemsFactory(
    dispatchers = testCoroutineDispatchers(),
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-@file:OptIn(ExperimentalCoroutinesApi::class)
-
 package io.element.android.features.messages.textcomposer

 import app.cash.molecule.RecompositionClock
@ -52,14 +50,9 @@ import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
 import io.element.android.libraries.textcomposer.MessageComposerMode
 import io.mockk.mockk
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.android.awaitFrame
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
-import kotlinx.coroutines.test.setMain
 import org.junit.Test
 import java.io.File

@ -302,30 +295,32 @@ class MessageComposerPresenterTest {
        val room = FakeMatrixRoom()
        val presenter = createPresenter(this, room = room)
        pickerProvider.givenMimeType(MimeTypes.Images)
-        mediaPreProcessor.givenResult(Result.success(
-            MediaUploadInfo.Image(
-                file = File("/some/path"),
-                info = ImageInfo(
-                    width = null,
-                    height = null,
-                    mimetype = null,
-                    size = null,
-                    thumbnailInfo = null,
-                    thumbnailUrl = null,
-                    blurhash = null,
-                ),
-                thumbnailInfo = ThumbnailProcessingInfo(
+        mediaPreProcessor.givenResult(
+            Result.success(
+                MediaUploadInfo.Image(
                    file = File("/some/path"),
-                    info = ThumbnailInfo(
+                    info = ImageInfo(
                        width = null,
                        height = null,
                        mimetype = null,
                        size = null,
+                        thumbnailInfo = null,
+                        thumbnailUrl = null,
+                        blurhash = null,
                    ),
-                    blurhash = "",
+                    thumbnailInfo = ThumbnailProcessingInfo(
+                        file = File("/some/path"),
+                        info = ThumbnailInfo(
+                            width = null,
+                            height = null,
+                            mimetype = null,
+                            size = null,
+                        ),
+                        blurhash = "",
+                    )
                )
            )
-        ))
+        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -342,31 +337,33 @@ class MessageComposerPresenterTest {
        val room = FakeMatrixRoom()
        val presenter = createPresenter(this, room = room)
        pickerProvider.givenMimeType(MimeTypes.Videos)
-        mediaPreProcessor.givenResult(Result.success(
-            MediaUploadInfo.Video(
-                file = File("/some/path"),
-                info = VideoInfo(
-                    width = null,
-                    height = null,
-                    mimetype = null,
-                    duration = null,
-                    size = null,
-                    thumbnailInfo = null,
-                    thumbnailUrl = null,
-                    blurhash = null,
-                ),
-                thumbnailInfo = ThumbnailProcessingInfo(
+        mediaPreProcessor.givenResult(
+            Result.success(
+                MediaUploadInfo.Video(
                    file = File("/some/path"),
-                    info = ThumbnailInfo(
+                    info = VideoInfo(
                        width = null,
                        height = null,
                        mimetype = null,
+                        duration = null,
                        size = null,
+                        thumbnailInfo = null,
+                        thumbnailUrl = null,
+                        blurhash = null,
                    ),
-                    blurhash = "",
+                    thumbnailInfo = ThumbnailProcessingInfo(
+                        file = File("/some/path"),
+                        info = ThumbnailInfo(
+                            width = null,
+                            height = null,
+                            mimetype = null,
+                            size = null,
+                        ),
+                        blurhash = "",
+                    )
                )
            )
-        ))
+        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -394,7 +391,7 @@ class MessageComposerPresenterTest {
    @Test
    fun `present - Pick media from gallery & cancel does nothing`() = runTest {
        val presenter = createPresenter(this)
-        with(pickerProvider){
+        with(pickerProvider) {
            givenResult(null) // Simulate a user canceling the flow
            givenMimeType(MimeTypes.Images)
        }
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/timeline/TimelinePresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/timeline/TimelinePresenterTest.kt
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-@file:OptIn(ExperimentalCoroutinesApi::class)
-
 package io.element.android.features.messages.timeline

 import app.cash.molecule.RecompositionClock
@ -27,8 +25,6 @@ import io.element.android.features.messages.impl.timeline.TimelineEvents
 import io.element.android.features.messages.impl.timeline.TimelinePresenter
 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