removed route from the TripSession interface to clearly make Directio…

…nsSession the source of truth
mapbox · Sep 16, 2021 · 4155ade · 4155ade
1 parent b2a7f74
commit 4155ade
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 19 deletions.
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt
@@ -1068,7 +1068,7 @@ class MapboxNavigation(
                 logger
             )
             historyRecorder.historyRecorderHandle = navigator.getHistoryRecorderHandle()
-            tripSession.route?.let {
+            directionsSession.routes.firstOrNull()?.let {
                 navigator.setRoute(
                     it,
                     tripSession.getRouteProgress()?.currentLegProgress?.legIndex ?: 0

diff --git a/...tion-core/src/main/java/com/mapbox/navigation/core/routerefresh/RouteRefreshController.kt b/...tion-core/src/main/java/com/mapbox/navigation/core/routerefresh/RouteRefreshController.kt
@@ -16,7 +16,7 @@ import com.mapbox.navigation.utils.internal.MapboxTimer
  * This class is responsible for refreshing the current direction route's traffic.
  * This does not support alternative routes.
  *
- * If the route is successfully refreshed, this class will update the [TripSession.route]
+ * If the route is successfully refreshed, this class will update the [DirectionsSession].
  */
 internal class RouteRefreshController(
     private val routeRefreshOptions: RouteRefreshOptions,

diff --git a/...avigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt b/...avigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt
@@ -3,6 +3,7 @@ package com.mapbox.navigation.core.trip.session
 import android.hardware.SensorEvent
 import android.location.Location
 import android.os.Looper
+import androidx.annotation.VisibleForTesting
 import com.mapbox.android.core.location.LocationEngineCallback
 import com.mapbox.android.core.location.LocationEngineResult
 import com.mapbox.api.directions.v5.models.BannerInstructions
@@ -53,8 +54,6 @@ import java.util.concurrent.CopyOnWriteArraySet
  * @param navigator Native navigator
  * @param threadController controller for main/io jobs
  * @param logger interface for logging any events
- *
- * @property route should be set to start routing
  */
 internal class MapboxTripSession(
     override val tripService: TripService,
@@ -67,8 +66,8 @@ internal class MapboxTripSession(
 
     private var updateRouteJob: Job? = null
 
-    override var route: DirectionsRoute? = null
-        private set
+    @VisibleForTesting
+    internal var route: DirectionsRoute? = null
 
     override fun setRoute(route: DirectionsRoute?, legIndex: Int) {
         val isSameUuid = route?.isSameUuid(this.route) ?: false

diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/TripSession.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/TripSession.kt
@@ -11,7 +11,6 @@ import com.mapbox.navigator.FallbackVersionsObserver
 internal interface TripSession {
 
     val tripService: TripService
-    val route: DirectionsRoute?
     fun setRoute(route: DirectionsRoute?, legIndex: Int)
 
     fun getRawLocation(): Location?

diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxNavigationTest.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxNavigationTest.kt
@@ -893,7 +893,7 @@ class MapboxNavigationTest {
         every {
             tripSession.registerFallbackVersionsObserver(capture(fallbackObserverSlot))
         } just Runs
-        every { tripSession.route } returns null
+        every { directionsSession.routes } returns emptyList()
         every { tripSession.getRouteProgress() } returns mockk()
 
         mapboxNavigation = MapboxNavigation(navigationOptions)
@@ -927,7 +927,7 @@ class MapboxNavigationTest {
         every {
             tripSession.registerFallbackVersionsObserver(capture(fallbackObserverSlot))
         } just Runs
-        every { tripSession.route } returns null
+        every { directionsSession.routes } returns emptyList()
         every { tripSession.getRouteProgress() } returns mockk()
 
         mapboxNavigation = MapboxNavigation(navigationOptions)
@@ -961,7 +961,7 @@ class MapboxNavigationTest {
         val routeProgress: RouteProgress = mockk()
         val legProgress: RouteLegProgress = mockk()
         val index = 137
-        every { tripSession.route } returns route
+        every { directionsSession.routes } returns listOf(route)
         every { tripSession.getRouteProgress() } returns routeProgress
         every { routeProgress.currentLegProgress } returns legProgress
         every { legProgress.legIndex } returns index

diff --git a/...-core/src/test/java/com/mapbox/navigation/core/routerefresh/RouteRefreshControllerTest.kt b/...-core/src/test/java/com/mapbox/navigation/core/routerefresh/RouteRefreshControllerTest.kt
@@ -79,7 +79,6 @@ class RouteRefreshControllerTest {
                 every { legIndex } returns 0
             }
         }
-        every { tripSession.route } returns validRoute
         every {
             directionsSession.requestRouteRefresh(any(), any(), capture(routeRefreshCallbackSlot))
         } returns requestId

diff --git a/...ation-core/src/test/java/com/mapbox/navigation/core/trip/session/MapboxTripSessionTest.kt b/...ation-core/src/test/java/com/mapbox/navigation/core/trip/session/MapboxTripSessionTest.kt
@@ -87,7 +87,7 @@ class MapboxTripSessionTest {
     @get:Rule
     var coroutineRule = MainCoroutineRule()
 
-    private lateinit var tripSession: TripSession
+    private lateinit var tripSession: MapboxTripSession
 
     private val tripService: TripService = mockk(relaxUnitFun = true) {
         every { hasServiceStarted() } returns false
@@ -179,7 +179,7 @@ class MapboxTripSessionTest {
         } answers {}
     }
 
-    private fun buildTripSession(): TripSession {
+    private fun buildTripSession(): MapboxTripSession {
         return MapboxTripSession(
             tripService,
             navigationOptions,
@@ -640,12 +640,6 @@ class MapboxTripSessionTest {
         assertEquals(tripService, tripSession.tripService)
     }
 
-    @Test
-    fun getRoute() {
-        tripSession.setRoute(route, legIndex)
-        assertEquals(route, tripSession.route)
-    }
-
     @Test
     fun setRoute() {
         tripSession.setRoute(route, legIndex)