Skip to content

Fix flaky telemetry tests #3707

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
Guardiola31337 merged 1 commit into from
Oct 29, 2020
Merged

Fix flaky telemetry tests #3707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions ...tion-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ internal object MapboxNavigationTelemetry :
logger: Logger?,
locationsCollector: LocationsCollector = LocationsCollectorImpl(logger)
) {
reset()
sessionState = IDLE
this.logger = logger
this.locationsCollector = locationsCollector
navigationOptions = options
Expand Down Expand Up @@ -278,9 +280,7 @@ internal object MapboxNavigationTelemetry :
if (dynamicValues.sessionStarted) {
log("sessionStop")
handleSessionCanceled()
dynamicValues.reset()
resetOriginalRoute()
resetRouteProgress()
reset()
}
}

Expand Down Expand Up @@ -427,6 +427,14 @@ internal object MapboxNavigationTelemetry :
}
}

private fun reset() {
dynamicValues.reset()
resetOriginalRoute()
resetRouteProgress()
needHandleReroute = false
needStartSession = false
}

private fun resetRouteProgress() {
log("resetRouteProgress")
routeProgress = null
Expand Down
5 changes: 1 addition & 4 deletions ...-core/src/test/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import com.mapbox.navigation.core.telemetry.events.NavigationRerouteEvent
import com.mapbox.navigation.metrics.MapboxMetricsReporter
import com.mapbox.navigation.metrics.internal.event.NavigationAppUserTurnstileEvent
import io.mockk.Runs
import io.mockk.coEvery
import io.mockk.every
import io.mockk.just
import io.mockk.mockk
Expand All @@ -47,10 +46,8 @@ import junit.framework.TestCase.assertEquals
import junit.framework.TestCase.assertNotSame
import junit.framework.TestCase.assertTrue
import org.junit.After
import org.junit.Ignore
import org.junit.Test

@Ignore
class MapboxNavigationTelemetryTest {

private companion object {
Expand Down Expand Up @@ -592,7 +589,7 @@ class MapboxNavigationTelemetryTest {
}

private fun mockLocationCollector() {
coEvery { locationsCollector.flushBuffers() } just Runs
every { locationsCollector.flushBuffers() } just Runs
every { locationsCollector.lastLocation } returns lastLocation
every { lastLocation.latitude } returns LAST_LOCATION_LAT
every { lastLocation.longitude } returns LAST_LOCATION_LON
Expand Down