Skip to content

Display snackbar in geoshape/trace when automatic location recording is used #7037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seadowg merged 2 commits into from
Jan 21, 2026
Merged

Display snackbar in geoshape/trace when automatic location recording is used #7037

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34f1a6c
Add failing test
grzesiek2010 Jan 20, 2026
01c2cc8
Call #setChangeResult whenever points are updated
grzesiek2010 Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add failing test
  • Loading branch information
@grzesiek2010
grzesiek2010 committed Jan 20, 2026
commit 34f1a6cb53b07d41c34098bf1ab9122905c467f4
26 changes: 26 additions & 0 deletions geo/src/test/java/org/odk/collect/geo/geopoly/GeoPolyFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.espresso.matcher.ViewMatchers.withText
import androidx.test.ext.junit.runners.AndroidJUnit4
import kotlinx.coroutines.flow.MutableStateFlow
import org.hamcrest.Matchers.equalTo
import org.hamcrest.Matchers.not
import org.junit.Before
Expand All @@ -26,6 +27,7 @@ import org.mockito.kotlin.any
import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
import org.odk.collect.androidshared.ui.FragmentFactoryBuilder
import org.odk.collect.androidtest.FragmentScenarioExtensions.setFragmentResultListener
import org.odk.collect.async.Scheduler
Expand All @@ -36,6 +38,7 @@ import org.odk.collect.geo.R
import org.odk.collect.geo.geopoly.GeoPolyFragment.OutputMode
import org.odk.collect.geo.support.FakeMapFragment
import org.odk.collect.geo.support.RobolectricApplication
import org.odk.collect.location.Location
import org.odk.collect.location.tracker.LocationTracker
import org.odk.collect.maps.MapFragment
import org.odk.collect.maps.MapFragmentFactory
Expand Down Expand Up @@ -701,6 +704,29 @@ class GeoPolyFragmentTest {
)
}

@Test
fun recordingPoints_usingAutomaticMode_setsChangeResult() {
val locations = MutableStateFlow<Location?>(null)
whenever(locationTracker.getLocation()).thenReturn(locations)

val scenario = fragmentLauncherRule.launchInContainer {
GeoPolyFragment({ OnBackPressedDispatcher() })
}
val resultListener = FragmentResultRecorder()
scenario.setFragmentResultListener(GeoPolyFragment.REQUEST_GEOPOLY, resultListener)

startInput(R.id.automatic_mode)
locations.value = Location(1.0, 1.0, 1.0, 1f)
locations.value = Location(2.0, 2.0, 1.0, 1f)

val result = resultListener.getAll().last()
assertThat(result.first, equalTo(GeoPolyFragment.REQUEST_GEOPOLY))
assertThat(
result.second.getString(GeoPolyFragment.RESULT_GEOPOLY_CHANGE),
equalTo("1.0 1.0 1.0 1.0;2.0 2.0 1.0 1.0")
)
}

private fun startInput(mode: Int? = null) {
onView(withId(R.id.play)).perform(click())

Expand Down