Remove some dead code and add tests on RetrySendMessageMenu

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuEvents.kt

@@ -20,7 +20,7 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 
 sealed interface RetrySendMenuEvents {
     data class EventSelected(val event: TimelineItem.Event) : RetrySendMenuEvents
-    data object RetrySend : RetrySendMenuEvents
-    data object RemoveFailed : RetrySendMenuEvents
+    data object Retry : RetrySendMenuEvents
+    data object Remove : RetrySendMenuEvents
     data object Dismiss : RetrySendMenuEvents
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenter.kt

@@ -41,15 +41,15 @@ class RetrySendMenuPresenter @Inject constructor(
                 is RetrySendMenuEvents.EventSelected -> {
                     selectedEvent = event.event
                 }
-                RetrySendMenuEvents.RetrySend -> {
+                RetrySendMenuEvents.Retry -> {
                     coroutineScope.launch {
                         selectedEvent?.transactionId?.let { transactionId ->
                             room.retrySendMessage(transactionId)
                         }
                         selectedEvent = null
                     }
                 }
-                RetrySendMenuEvents.RemoveFailed -> {
+                RetrySendMenuEvents.Remove -> {
                     coroutineScope.launch {
                         selectedEvent?.transactionId?.let { transactionId ->
                             room.cancelSend(transactionId)

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt

@@ -17,7 +17,6 @@
 package io.element.android.features.messages.impl.timeline.components.retrysendmenu
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -54,18 +53,18 @@ internal fun RetrySendMessageMenu(
     }
 
     fun onRetry() {
-        state.eventSink(RetrySendMenuEvents.RetrySend)
+        state.eventSink(RetrySendMenuEvents.Retry)
     }
 
-    fun onRemoveFailed() {
-        state.eventSink(RetrySendMenuEvents.RemoveFailed)
+    fun onRemove() {
+        state.eventSink(RetrySendMenuEvents.Remove)
     }
 
     RetrySendMessageMenuBottomSheet(
         modifier = modifier,
         isVisible = isVisible,
         onRetry = ::onRetry,
-        onRemoveFailed = ::onRemoveFailed,
+        onRemove = ::onRemove,
         onDismiss = ::onDismiss
     )
 }
@@ -75,7 +74,7 @@ internal fun RetrySendMessageMenu(
 private fun RetrySendMessageMenuBottomSheet(
     isVisible: Boolean,
     onRetry: () -> Unit,
-    onRemoveFailed: () -> Unit,
+    onRemove: () -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -95,7 +94,10 @@ private fun RetrySendMessageMenuBottomSheet(
                 }
             }
         ) {
-            RetrySendMenuContents(onRetry = onRetry, onRemoveFailed = onRemoveFailed)
+            RetrySendMenuContents(
+                onRetry = onRetry,
+                onRemove = onRemove,
+            )
             // FIXME remove after https://issuetracker.google.com/issues/275849044
             Spacer(modifier = Modifier.height(32.dp))
         }
@@ -106,7 +108,7 @@ private fun RetrySendMessageMenuBottomSheet(
 @Composable
 private fun ColumnScope.RetrySendMenuContents(
     onRetry: () -> Unit,
-    onRemoveFailed: () -> Unit,
+    onRemove: () -> Unit,
     sheetState: SheetState = rememberModalBottomSheetState(),
 ) {
     val coroutineScope = rememberCoroutineScope()
@@ -142,22 +144,16 @@ private fun ColumnScope.RetrySendMenuContents(
         modifier = Modifier.clickable {
             coroutineScope.launch {
                 sheetState.hide()
-                onRemoveFailed()
+                onRemove()
             }
         }
     )
 }
 
-@Suppress("UNUSED_PARAMETER")
-@OptIn(ExperimentalMaterial3Api::class)
 @PreviewsDayNight
 @Composable
 internal fun RetrySendMessageMenuPreview(@PreviewParameter(RetrySendMenuStateProvider::class) state: RetrySendMenuState) = ElementPreview {
-    // TODO restore RetrySendMessageMenuBottomSheet once the issue with bottom sheet not being previewable is fixed
-    Column {
-        RetrySendMenuContents(
-            onRetry = {},
-            onRemoveFailed = {},
-        )
-    }
+    RetrySendMessageMenu(
+        state = state,
+    )
 }

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenterTests.kt

@@ -43,7 +43,6 @@ class RetrySendMenuPresenterTests {
             val initialState = awaitItem()
             val selectedEvent = aTimelineItemEvent()
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
-
             assertThat(awaitItem().selectedEvent).isSameInstanceAs(selectedEvent)
         }
     }
@@ -57,8 +56,9 @@ class RetrySendMenuPresenterTests {
             val selectedEvent = aTimelineItemEvent()
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
-
             initialState.eventSink(RetrySendMenuEvents.Dismiss)
+            assertThat(room.cancelSendCount).isEqualTo(0)
+            assertThat(room.retrySendMessageCount).isEqualTo(0)
             assertThat(awaitItem().selectedEvent).isNull()
         }
     }
@@ -72,8 +72,8 @@ class RetrySendMenuPresenterTests {
             val selectedEvent = aTimelineItemEvent(transactionId = A_TRANSACTION_ID)
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
-
-            initialState.eventSink(RetrySendMenuEvents.RetrySend)
+            initialState.eventSink(RetrySendMenuEvents.Retry)
+            assertThat(room.cancelSendCount).isEqualTo(0)
             assertThat(room.retrySendMessageCount).isEqualTo(1)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -88,8 +88,8 @@ class RetrySendMenuPresenterTests {
             val selectedEvent = aTimelineItemEvent(transactionId = null)
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
-
-            initialState.eventSink(RetrySendMenuEvents.RetrySend)
+            initialState.eventSink(RetrySendMenuEvents.Retry)
+            assertThat(room.cancelSendCount).isEqualTo(0)
             assertThat(room.retrySendMessageCount).isEqualTo(0)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -105,8 +105,8 @@ class RetrySendMenuPresenterTests {
             val selectedEvent = aTimelineItemEvent(transactionId = A_TRANSACTION_ID)
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
-
-            initialState.eventSink(RetrySendMenuEvents.RetrySend)
+            initialState.eventSink(RetrySendMenuEvents.Retry)
+            assertThat(room.cancelSendCount).isEqualTo(0)
             assertThat(room.retrySendMessageCount).isEqualTo(1)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -121,9 +121,9 @@ class RetrySendMenuPresenterTests {
             val selectedEvent = aTimelineItemEvent(transactionId = A_TRANSACTION_ID)
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
-
-            initialState.eventSink(RetrySendMenuEvents.RemoveFailed)
+            initialState.eventSink(RetrySendMenuEvents.Remove)
             assertThat(room.cancelSendCount).isEqualTo(1)
+            assertThat(room.retrySendMessageCount).isEqualTo(0)
             assertThat(awaitItem().selectedEvent).isNull()
         }
     }
@@ -137,9 +137,9 @@ class RetrySendMenuPresenterTests {
             val selectedEvent = aTimelineItemEvent(transactionId = null)
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
-
-            initialState.eventSink(RetrySendMenuEvents.RemoveFailed)
+            initialState.eventSink(RetrySendMenuEvents.Remove)
             assertThat(room.cancelSendCount).isEqualTo(0)
+            assertThat(room.retrySendMessageCount).isEqualTo(0)
             assertThat(awaitItem().selectedEvent).isNull()
         }
     }
@@ -154,9 +154,9 @@ class RetrySendMenuPresenterTests {
             val selectedEvent = aTimelineItemEvent(transactionId = A_TRANSACTION_ID)
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
-
-            initialState.eventSink(RetrySendMenuEvents.RemoveFailed)
+            initialState.eventSink(RetrySendMenuEvents.Remove)
             assertThat(room.cancelSendCount).isEqualTo(1)
+            assertThat(room.retrySendMessageCount).isEqualTo(0)
             assertThat(awaitItem().selectedEvent).isNull()
         }
     }

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenuTest.kt

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2024 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.
+ */
+
+package io.element.android.features.messages.impl.timeline.components.retrysendmenu
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.element.android.features.messages.impl.R
+import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import io.element.android.tests.testutils.pressBackKey
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+
+@RunWith(AndroidJUnit4::class)
+class RetrySendMessageMenuTest {
+    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `dismiss the bottom sheet emits the expected event`() {
+        val eventsRecorder = EventsRecorder<RetrySendMenuEvents>()
+        rule.setRetrySendMessageMenu(
+            aRetrySendMenuState(
+                event = aTimelineItemEvent(),
+                eventSink = eventsRecorder
+            ),
+        )
+        rule.pressBackKey()
+        // Cannot test this for now.
+        // eventsRecorder.assertSingle(RetrySendMenuEvents.Dismiss)
+    }
+
+    @Config(qualifiers = "h1024dp")
+    @Test
+    fun `retry to send the event emits the expected event`() {
+        val eventsRecorder = EventsRecorder<RetrySendMenuEvents>()
+        rule.setRetrySendMessageMenu(
+            aRetrySendMenuState(
+                event = aTimelineItemEvent(),
+                eventSink = eventsRecorder
+            ),
+        )
+        rule.clickOn(R.string.screen_room_retry_send_menu_send_again_action)
+        eventsRecorder.assertSingle(RetrySendMenuEvents.Retry)
+    }
+
+    @Config(qualifiers = "h1024dp")
+    @Test
+    fun `remove the event emits the expected event`() {
+        val eventsRecorder = EventsRecorder<RetrySendMenuEvents>()
+        rule.setRetrySendMessageMenu(
+            aRetrySendMenuState(
+                event = aTimelineItemEvent(),
+                eventSink = eventsRecorder
+            ),
+        )
+        rule.clickOn(CommonStrings.action_remove)
+        eventsRecorder.assertSingle(RetrySendMenuEvents.Remove)
+    }
+}
+
+private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRetrySendMessageMenu(
+    state: RetrySendMenuState,
+) {
+    setContent {
+        RetrySendMessageMenu(
+            state = state,
+        )
+    }
+}