diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt index e541f327b5..a396cc120f 100644 --- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt +++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationView.kt @@ -142,7 +142,7 @@ fun SendLocationView( lon = cameraPositionState.position.target!!.longitude, zoom = cameraPositionState.position.zoom, ), - cameraPositionState.location?.let { + location = cameraPositionState.location?.let { Location( lat = it.latitude, lon = it.longitude, diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFixtures.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFixtures.kt index 80c6a6a6c4..206ee93ce0 100644 --- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFixtures.kt +++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentStateFixtures.kt @@ -16,6 +16,7 @@ package io.element.android.features.poll.api.pollcontent +import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.poll.PollAnswer import io.element.android.libraries.matrix.api.poll.PollKind import kotlinx.collections.immutable.ImmutableList @@ -83,9 +84,11 @@ fun aPollAnswerItem( ) fun aPollContentState( + eventId: EventId? = null, isMine: Boolean = false, isEnded: Boolean = false, isDisclosed: Boolean = true, + isPollEditable: Boolean = true, hasVotes: Boolean = true, question: String = aPollQuestion(), pollKind: PollKind = PollKind.Disclosed, @@ -95,11 +98,11 @@ fun aPollContentState( hasVotes = hasVotes ), ) = PollContentState( - eventId = null, + eventId = eventId, question = question, answerItems = answerItems, pollKind = pollKind, - isPollEditable = isMine && !isEnded, + isPollEditable = isMine && !isEnded && isPollEditable, isPollEnded = isEnded, isMine = isMine, ) diff --git a/features/poll/impl/build.gradle.kts b/features/poll/impl/build.gradle.kts index bfa74d3684..16725e3579 100644 --- a/features/poll/impl/build.gradle.kts +++ b/features/poll/impl/build.gradle.kts @@ -23,6 +23,11 @@ plugins { android { namespace = "io.element.android.features.poll.impl" + testOptions { + unitTests { + isIncludeAndroidResources = true + } + } } anvil { @@ -48,12 +53,15 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) + testImplementation(libs.test.robolectric) testImplementation(projects.libraries.matrix.test) testImplementation(projects.services.analytics.test) testImplementation(projects.features.messages.test) testImplementation(projects.tests.testutils) testImplementation(projects.libraries.dateformatter.test) testImplementation(projects.features.poll.test) + testImplementation(libs.androidx.compose.ui.test.junit) + testReleaseImplementation(libs.androidx.compose.ui.test.manifest) ksp(libs.showkase.processor) } diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryStateProvider.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryStateProvider.kt index 9628a8e137..be06d744d1 100644 --- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryStateProvider.kt +++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryStateProvider.kt @@ -22,44 +22,48 @@ import io.element.android.features.poll.api.pollcontent.aPollContentState import io.element.android.features.poll.impl.history.model.PollHistoryFilter import io.element.android.features.poll.impl.history.model.PollHistoryItem import io.element.android.features.poll.impl.history.model.PollHistoryItems -import kotlinx.collections.immutable.ImmutableList -import kotlinx.collections.immutable.persistentListOf +import kotlinx.collections.immutable.toPersistentList class PollHistoryStateProvider : PreviewParameterProvider { override val values: Sequence get() = sequenceOf( + aPollHistoryState(), + aPollHistoryState( + isLoading = true, + hasMoreToLoad = true, + activeFilter = PollHistoryFilter.PAST, + ), aPollHistoryState( - isLoading = false, - hasMoreToLoad = false, activeFilter = PollHistoryFilter.ONGOING, + currentItems = emptyList(), ), aPollHistoryState( - isLoading = true, - hasMoreToLoad = true, activeFilter = PollHistoryFilter.PAST, + currentItems = emptyList(), ), ) } -private fun aPollHistoryState( +internal fun aPollHistoryState( isLoading: Boolean = false, hasMoreToLoad: Boolean = false, activeFilter: PollHistoryFilter = PollHistoryFilter.ONGOING, - currentItems: ImmutableList = persistentListOf( + currentItems: List = listOf( aPollHistoryItem(), ), + eventSink: (PollHistoryEvents) -> Unit = {}, ) = PollHistoryState( isLoading = isLoading, hasMoreToLoad = hasMoreToLoad, activeFilter = activeFilter, pollHistoryItems = PollHistoryItems( - ongoing = currentItems, - past = currentItems, + ongoing = currentItems.toPersistentList(), + past = currentItems.toPersistentList(), ), - eventSink = {}, + eventSink = eventSink, ) -private fun aPollHistoryItem( +internal fun aPollHistoryItem( formattedDate: String = "01/12/2023", state: PollContentState = aPollContentState(), ) = PollHistoryItem( diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryViewTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryViewTest.kt new file mode 100644 index 0000000000..0ef2e42b7d --- /dev/null +++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryViewTest.kt @@ -0,0 +1,192 @@ +/* + * 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.poll.impl.history + +import androidx.activity.ComponentActivity +import androidx.compose.ui.test.junit4.AndroidComposeTestRule +import androidx.compose.ui.test.junit4.createAndroidComposeRule +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import androidx.test.ext.junit.runners.AndroidJUnit4 +import io.element.android.features.poll.api.pollcontent.aPollContentState +import io.element.android.features.poll.impl.R +import io.element.android.features.poll.impl.history.model.PollHistoryFilter +import io.element.android.libraries.matrix.api.core.EventId +import io.element.android.libraries.ui.strings.CommonStrings +import io.element.android.tests.testutils.EnsureNeverCalled +import io.element.android.tests.testutils.EnsureNeverCalledWithParam +import io.element.android.tests.testutils.EventsRecorder +import io.element.android.tests.testutils.clickOn +import io.element.android.tests.testutils.ensureCalledOnce +import io.element.android.tests.testutils.ensureCalledOnceWithParam +import io.element.android.tests.testutils.pressBack +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 PollHistoryViewTest { + @get:Rule + val rule = createAndroidComposeRule() + + @Test + fun `clicking on back invokes the expected callback`() { + val eventsRecorder = EventsRecorder(expectEvents = false) + ensureCalledOnce { + rule.setPollHistoryViewView( + aPollHistoryState( + eventSink = eventsRecorder + ), + goBack = it + ) + rule.pressBack() + } + } + + @Config(qualifiers = "h1024dp") + @Test + fun `clicking on edit poll invokes the expected callback`() { + val eventsRecorder = EventsRecorder(expectEvents = false) + val eventId = EventId("\$anEventId") + val state = aPollHistoryState( + currentItems = listOf( + aPollHistoryItem( + state = aPollContentState( + eventId = eventId, + isMine = true, + isEnded = false, + ) + ) + ), + eventSink = eventsRecorder + ) + ensureCalledOnceWithParam(eventId) { + rule.setPollHistoryViewView( + state = state, + onEditPoll = it + ) + rule.clickOn(CommonStrings.action_edit_poll) + } + } + + @Config(qualifiers = "h1024dp") + @Test + fun `clicking on poll end emits the expected Event`() { + val eventsRecorder = EventsRecorder() + val eventId = EventId("\$anEventId") + val state = aPollHistoryState( + currentItems = listOf( + aPollHistoryItem( + state = aPollContentState( + eventId = eventId, + isMine = true, + isEnded = false, + isPollEditable = false, + ) + ) + ), + eventSink = eventsRecorder + ) + rule.setPollHistoryViewView( + state = state, + ) + rule.clickOn(CommonStrings.action_end_poll) + // Cancel the dialog + rule.clickOn(CommonStrings.action_cancel) + // Do it again, and confirm the dialog + rule.clickOn(CommonStrings.action_end_poll) + eventsRecorder.assertEmpty() + rule.clickOn(CommonStrings.action_ok) + eventsRecorder.assertSingle( + PollHistoryEvents.PollEndClicked(eventId) + ) + } + + @Config(qualifiers = "h1024dp") + @Test + fun `clicking on poll answer emits the expected Event`() { + val eventsRecorder = EventsRecorder() + val eventId = EventId("\$anEventId") + val state = aPollHistoryState( + currentItems = listOf( + aPollHistoryItem( + state = aPollContentState( + eventId = eventId, + isMine = true, + isEnded = false, + isPollEditable = false, + ) + ) + ), + eventSink = eventsRecorder + ) + val answer = state.pollHistoryItems.ongoing.first().state.answerItems.first().answer + rule.setPollHistoryViewView( + state = state, + ) + rule.onNodeWithText(answer.text).performClick() + eventsRecorder.assertSingle( + PollHistoryEvents.PollAnswerSelected(eventId, answer.id) + ) + } + + @Test + fun `clicking on past tab emits the expected Event`() { + val eventsRecorder = EventsRecorder() + rule.setPollHistoryViewView( + aPollHistoryState( + eventSink = eventsRecorder + ), + ) + rule.clickOn(R.string.screen_polls_history_filter_past) + eventsRecorder.assertSingle( + PollHistoryEvents.OnFilterSelected(filter = PollHistoryFilter.PAST) + ) + } + + @Config(qualifiers = "h1024dp") + @Test + fun `clicking on load more emits the expected Event`() { + val eventsRecorder = EventsRecorder() + rule.setPollHistoryViewView( + aPollHistoryState( + hasMoreToLoad = true, + eventSink = eventsRecorder, + ), + ) + rule.clickOn(CommonStrings.action_load_more) + eventsRecorder.assertSingle( + PollHistoryEvents.LoadMore + ) + } +} + +private fun AndroidComposeTestRule.setPollHistoryViewView( + state: PollHistoryState, + onEditPoll: (EventId) -> Unit = EnsureNeverCalledWithParam(), + goBack: () -> Unit = EnsureNeverCalled(), +) { + setContent { + PollHistoryView( + state = state, + onEditPoll = onEditPoll, + goBack = goBack, + ) + } +} diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_2,NEXUS_5,1.0,en].png new file mode 100644 index 0000000000..4e4f13e198 --- /dev/null +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_2,NEXUS_5,1.0,en].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:240ae2c6b7efac68c972049db5234f71813885ab7f3a93b22db8735e650b78cc +size 16621 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_3,NEXUS_5,1.0,en].png new file mode 100644 index 0000000000..7cfbf4e018 --- /dev/null +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Day-1_2_null_3,NEXUS_5,1.0,en].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ebe36dfe126b2d71254116b0ac4c3aec05dca5862f4f134d8f4a5fb179eba61 +size 16085 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_2,NEXUS_5,1.0,en].png new file mode 100644 index 0000000000..db6496d300 --- /dev/null +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_2,NEXUS_5,1.0,en].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a2a347e2b10c3e914c36e33e273e58c8263e6c48417b338390efe877494cb5e +size 15824 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_3,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_3,NEXUS_5,1.0,en].png new file mode 100644 index 0000000000..778cb42ff1 --- /dev/null +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.poll.impl.history_PollHistoryView_null_PollHistoryView-Night-1_3_null_3,NEXUS_5,1.0,en].png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:980630d02716dbc61840c14d839d6d3a2eac99c85adc78547a2c7f9cf920bf4a +size 15308