Updating unit tests

Author: mnaturel

vector/src/test/java/im/vector/app/features/home/room/detail/timeline/render/ProcessBodyOfReplyToEventUseCaseTest.kt

@@ -31,16 +31,23 @@ import org.junit.Test
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.getPollQuestion
+import org.matrix.android.sdk.api.session.events.model.getRelationContent
 import org.matrix.android.sdk.api.session.events.model.isAudioMessage
 import org.matrix.android.sdk.api.session.events.model.isFileMessage
 import org.matrix.android.sdk.api.session.events.model.isImageMessage
 import org.matrix.android.sdk.api.session.events.model.isLiveLocation
-import org.matrix.android.sdk.api.session.events.model.isPoll
+import org.matrix.android.sdk.api.session.events.model.isPollEnd
+import org.matrix.android.sdk.api.session.events.model.isPollStart
 import org.matrix.android.sdk.api.session.events.model.isSticker
 import org.matrix.android.sdk.api.session.events.model.isVideoMessage
 import org.matrix.android.sdk.api.session.events.model.isVoiceMessage
+import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
+import org.matrix.android.sdk.api.session.room.model.message.PollCreationInfo
+import org.matrix.android.sdk.api.session.room.model.message.PollQuestion
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 import org.matrix.android.sdk.api.session.room.model.relation.ReplyToContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 
 private const val A_ROOM_ID = "room-id"
 private const val AN_EVENT_ID = "event-id"
@@ -93,6 +100,7 @@ class ProcessBodyOfReplyToEventUseCaseTest {
     fun setup() {
         givenNewPrefix()
         mockkStatic("org.matrix.android.sdk.api.session.events.model.EventKt")
+        mockkStatic("org.matrix.android.sdk.api.session.room.timeline.TimelineEventKt")
     }
 
     @After
@@ -104,7 +112,7 @@ class ProcessBodyOfReplyToEventUseCaseTest {
     fun `given a replied event of type file message when process the formatted body then content is replaced by correct string`() {
         // Given
         givenTypeOfRepliedEvent(isFileMessage = true)
-        givenNewContentForId(R.string.message_reply_to_sender_sent_file)
+        givenContentForId(R.string.message_reply_to_sender_sent_file, content = A_NEW_CONTENT)
 
         executeAndAssertResult()
     }
@@ -113,7 +121,7 @@ class ProcessBodyOfReplyToEventUseCaseTest {
     fun `given a replied event of type voice message when process the formatted body then content is replaced by correct string`() {
         // Given
         givenTypeOfRepliedEvent(isVoiceMessage = true)
-        givenNewContentForId(R.string.message_reply_to_sender_sent_voice_message)
+        givenContentForId(R.string.message_reply_to_sender_sent_voice_message, content = A_NEW_CONTENT)
 
         executeAndAssertResult()
     }
@@ -122,7 +130,7 @@ class ProcessBodyOfReplyToEventUseCaseTest {
     fun `given a replied event of type audio message when process the formatted body then content is replaced by correct string`() {
         // Given
         givenTypeOfRepliedEvent(isAudioMessage = true)
-        givenNewContentForId(R.string.message_reply_to_sender_sent_audio_file)
+        givenContentForId(R.string.message_reply_to_sender_sent_audio_file, content = A_NEW_CONTENT)
 
         executeAndAssertResult()
     }
@@ -131,7 +139,7 @@ class ProcessBodyOfReplyToEventUseCaseTest {
     fun `given a replied event of type image message when process the formatted body then content is replaced by correct string`() {
         // Given
         givenTypeOfRepliedEvent(isImageMessage = true)
-        givenNewContentForId(R.string.message_reply_to_sender_sent_image)
+        givenContentForId(R.string.message_reply_to_sender_sent_image, content = A_NEW_CONTENT)
 
         executeAndAssertResult()
     }
@@ -140,7 +148,7 @@ class ProcessBodyOfReplyToEventUseCaseTest {
     fun `given a replied event of type video message when process the formatted body then content is replaced by correct string`() {
         // Given
         givenTypeOfRepliedEvent(isVideoMessage = true)
-        givenNewContentForId(R.string.message_reply_to_sender_sent_video)
+        givenContentForId(R.string.message_reply_to_sender_sent_video, content = A_NEW_CONTENT)
 
         executeAndAssertResult()
     }
@@ -149,49 +157,58 @@ class ProcessBodyOfReplyToEventUseCaseTest {
     fun `given a replied event of type sticker message when process the formatted body then content is replaced by correct string`() {
         // Given
         givenTypeOfRepliedEvent(isStickerMessage = true)
-        givenNewContentForId(R.string.message_reply_to_sender_sent_sticker)
+        givenContentForId(R.string.message_reply_to_sender_sent_sticker, content = A_NEW_CONTENT)
 
         executeAndAssertResult()
     }
 
     @Test
-    fun `given a replied event of type poll message with null question when process the formatted body then content is replaced by correct string`() {
+    fun `given a replied event of type poll start message with null question when process the formatted body then content is replaced by correct string`() {
         // Given
-        givenTypeOfRepliedEvent(isPollMessage = true)
-        givenNewContentForId(R.string.message_reply_to_sender_created_poll)
-        every { fakeRepliedEvent.getClearType() } returns EventType.POLL_START.unstable
+        givenTypeOfRepliedEvent(isPollStartMessage = true)
+        givenContentForId(R.string.message_reply_to_sender_created_poll, content = A_NEW_CONTENT)
         every { fakeRepliedEvent.getPollQuestion() } returns null
 
         executeAndAssertResult()
     }
 
     @Test
-    fun `given a replied event of type poll message with existing question when process the formatted body then content is replaced by correct string`() {
+    fun `given a replied event of type poll start message with existing question when process the formatted body then content is replaced by correct string`() {
         // Given
-        givenTypeOfRepliedEvent(isPollMessage = true)
-        givenNewContentForId(R.string.message_reply_to_sender_created_poll)
-        every { fakeRepliedEvent.getClearType() } returns EventType.POLL_START.unstable
+        givenTypeOfRepliedEvent(isPollStartMessage = true)
+        givenContentForId(R.string.message_reply_to_sender_created_poll, content = "")
         every { fakeRepliedEvent.getPollQuestion() } returns A_NEW_CONTENT
 
         executeAndAssertResult()
     }
 
     @Test
-    fun `given a replied event of type poll end message when process the formatted body then content is replaced by correct string`() {
+    fun `given a replied event of type poll end message with null question when process the formatted body then content is replaced by correct string`() {
         // Given
-        givenTypeOfRepliedEvent(isPollMessage = true)
-        givenNewContentForId(R.string.message_reply_to_sender_ended_poll)
-        every { fakeRepliedEvent.getClearType() } returns EventType.POLL_END.unstable
+        givenTypeOfRepliedEvent(isPollEndMessage = true)
+        givenContentForId(R.string.message_reply_to_sender_ended_poll, content = A_NEW_CONTENT)
+        givenPollQuestionReturns(fakeRepliedEvent, null)
         every { fakeRepliedEvent.getPollQuestion() } returns null
 
         executeAndAssertResult()
     }
 
+    @Test
+    fun `given a replied event of type poll end message with existing question when process the formatted body then content is replaced by correct string`() {
+        // Given
+        givenTypeOfRepliedEvent(isPollEndMessage = true)
+        givenContentForId(R.string.message_reply_to_sender_ended_poll, content = "")
+        every { fakeRepliedEvent.getClearType() } returns EventType.POLL_END.unstable
+        givenPollQuestionReturns(fakeRepliedEvent, A_NEW_CONTENT)
+
+        executeAndAssertResult()
+    }
+
     @Test
     fun `given a replied event of type live location message when process the formatted body then content is replaced by correct string`() {
         // Given
         givenTypeOfRepliedEvent(isLiveLocationMessage = true)
-        givenNewContentForId(R.string.live_location_description)
+        givenContentForId(R.string.live_location_description, content = A_NEW_CONTENT)
 
         executeAndAssertResult()
     }
@@ -242,13 +259,16 @@ class ProcessBodyOfReplyToEventUseCaseTest {
 
     private fun givenARepliedEvent(timelineEvent: TimelineEvent? = mockk()): Event {
         val event = mockk<Event>()
+        val eventId = "event-id"
+        every { event.eventId } returns eventId
+        every { event.roomId } returns A_ROOM_ID
         timelineEvent?.let { every { it.root } returns event }
         fakeActiveSessionHolder
                 .fakeSession
                 .roomService()
                 .getRoom(A_ROOM_ID)
                 .timelineService()
-                .givenTimelineEvent(timelineEvent)
+                .givenTimelineEventReturns(eventId, timelineEvent)
         return event
     }
 
@@ -259,7 +279,8 @@ class ProcessBodyOfReplyToEventUseCaseTest {
             isImageMessage: Boolean = false,
             isVideoMessage: Boolean = false,
             isStickerMessage: Boolean = false,
-            isPollMessage: Boolean = false,
+            isPollEndMessage: Boolean = false,
+            isPollStartMessage: Boolean = false,
             isLiveLocationMessage: Boolean = false,
     ) {
         every { fakeRepliedEvent.isFileMessage() } returns isFileMessage
@@ -268,15 +289,36 @@ class ProcessBodyOfReplyToEventUseCaseTest {
         every { fakeRepliedEvent.isImageMessage() } returns isImageMessage
         every { fakeRepliedEvent.isVideoMessage() } returns isVideoMessage
         every { fakeRepliedEvent.isSticker() } returns isStickerMessage
-        every { fakeRepliedEvent.isPoll() } returns isPollMessage
+        every { fakeRepliedEvent.isPollEnd() } returns isPollEndMessage
+        every { fakeRepliedEvent.isPollStart() } returns isPollStartMessage
         every { fakeRepliedEvent.isLiveLocation() } returns isLiveLocationMessage
     }
 
     private fun givenNewPrefix() {
         fakeStringProvider.given(R.string.message_reply_to_prefix, A_NEW_PREFIX)
     }
 
-    private fun givenNewContentForId(@StringRes resId: Int) {
-        fakeStringProvider.given(resId, A_NEW_CONTENT)
+    private fun givenContentForId(@StringRes resId: Int, content: String) {
+        fakeStringProvider.given(resId, content)
+    }
+
+    private fun givenPollQuestionReturns(pollEndEvent: Event, question: String?) {
+        val eventId = "start-event-id"
+        val relationContent = mockk<RelationDefaultContent>()
+        every { relationContent.eventId } returns eventId
+        every { pollEndEvent.getRelationContent() } returns relationContent
+        val timelineEvent = mockk<TimelineEvent>()
+        val messagePollContent = MessagePollContent(
+                pollCreationInfo = PollCreationInfo(
+                        question = PollQuestion(unstableQuestion = question)
+                )
+        )
+        every { timelineEvent.getLastMessageContent() } returns messagePollContent
+        fakeActiveSessionHolder
+                .fakeSession
+                .roomService()
+                .getRoom(A_ROOM_ID)
+                .timelineService()
+                .givenTimelineEventReturns(eventId, timelineEvent)
     }
 }

vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt

@@ -68,7 +68,7 @@ class CreatePollViewModelTest {
                 .roomService()
                 .getRoom(A_FAKE_ROOM_ID)
                 .timelineService()
-                .givenTimelineEvent(A_POLL_START_TIMELINE_EVENT)
+                .givenTimelineEventReturns(A_POLL_START_TIMELINE_EVENT.eventId, A_POLL_START_TIMELINE_EVENT)
     }
 
     @After

vector/src/test/java/im/vector/app/test/fakes/FakeTimelineService.kt

@@ -23,7 +23,7 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 
 class FakeTimelineService : TimelineService by mockk() {
 
-    fun givenTimelineEvent(event: TimelineEvent?) {
-        every { getTimelineEvent(any()) } returns event
+    fun givenTimelineEventReturns(eventId: String, event: TimelineEvent?) {
+        every { getTimelineEvent(eventId) } returns event
     }
 }