wip

Author: RingerJK

libnavigation-base/src/main/java/com/mapbox/navigation/base/route/NavigationRoute.kt

@@ -275,7 +275,7 @@ class NavigationRoute internal constructor(
         .routeOptions(routeOptions)
         .build()
 
-    internal val waypoints: List<Waypoint> = nativeRoute.waypoints.mapToSkd()
+    internal val waypoints: List<Waypoint> by lazy { nativeRoute.waypoints.mapToSkd() }
 
     /**
      * Indicates whether some other object is "equal to" this one.

libnavigation-core/src/test/java/com/mapbox/navigation/core/routeoptions/RouteOptionsUpdaterTest.kt

@@ -15,7 +15,9 @@ import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
 import io.mockk.verify
+import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
@@ -363,7 +365,7 @@ class RouteOptionsUpdaterTest {
     @RunWith(Parameterized::class)
     class BearingOptionsParameterized(
         val routeOptions: RouteOptions,
-        val remainingWaypointsParameter: Int,
+        val indexNextCoordinate: Int,
         val expectedBearings: List<Bearing?>
     ) {
 
@@ -376,7 +378,7 @@ class RouteOptionsUpdaterTest {
             fun params() = listOf(
                 arrayOf(
                     provideRouteOptionsWithCoordinatesAndBearings(),
-                    3,
+                    1,
                     listOf(
                         Bearing.builder()
                             .angle(DEFAULT_REROUTE_BEARING_ANGLE.toDouble())
@@ -398,7 +400,7 @@ class RouteOptionsUpdaterTest {
                 ),
                 arrayOf(
                     provideRouteOptionsWithCoordinates(),
-                    1,
+                    3,
                     listOf(
                         Bearing.builder()
                             .angle(DEFAULT_REROUTE_BEARING_ANGLE.toDouble())
@@ -445,7 +447,7 @@ class RouteOptionsUpdaterTest {
                             )
                         )
                         .build(),
-                    3,
+                    1,
                     listOf(
                         Bearing.builder()
                             .angle(DEFAULT_REROUTE_BEARING_ANGLE.toDouble())
@@ -463,14 +465,20 @@ class RouteOptionsUpdaterTest {
         fun setup() {
             MockKAnnotations.init(this, relaxUnitFun = true, relaxed = true)
             mockLocation()
+            mockkStatic("com.mapbox.navigation.base.internal.extensions.WaypointEx")
 
             routeRefreshAdapter = RouteOptionsUpdater()
         }
 
+        @After
+        fun cleanup() {
+            unmockkStatic("com.mapbox.navigation.base.internal.extensions.WaypointEx")
+        }
+
         @Test
         fun bearingOptions() {
             val routeProgress: RouteProgress = mockk(relaxed = true) {
-                every { remainingWaypoints } returns remainingWaypointsParameter
+                every { indexOfNextCoordinate(any(), any()) } returns indexNextCoordinate
             }
 
             val newRouteOptions =