NAVAND-713: update waypoints

Author: dzinad

CHANGELOG.md

@@ -4,6 +4,7 @@ Mapbox welcomes participation and contributions from everyone.
 
 ## Unreleased
 #### Features
+- Supported EV route refresh. TODO
 #### Bug fixes and improvements
 
 ## Mapbox Navigation SDK 2.9.0-beta.3 - 21 October, 2022

instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/EVRouteRefreshTest.kt

@@ -1,6 +1,6 @@
 package com.mapbox.navigation.instrumentation_tests.utils.http
 
-import com.mapbox.navigation.testing.ui.http.MockRequestHandler
+import com.mapbox.navigation.testing.ui.http.BaseMockRequestHandler
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
 
@@ -15,21 +15,18 @@ data class MockDirectionsRefreshHandler(
     val jsonResponse: String,
     val acceptedGeometryIndex: Int? = null,
     val routeIndex: Int? = null,
-) : MockRequestHandler {
+) : BaseMockRequestHandler() {
 
-    private val _handledRequests = mutableListOf<RecordedRequest>()
-    val handledRequests: List<RecordedRequest> = _handledRequests
     var jsonResponseModifier: ((String) -> String) = { it }
 
-    override fun handle(request: RecordedRequest): MockResponse? {
+    override fun handleInternal(request: RecordedRequest): MockResponse? {
         val prefix = """/directions-refresh/v1/mapbox/driving-traffic/$testUuid""" +
             if (routeIndex != null) { "/$routeIndex/" } else ""
         if (request.path!!.startsWith(prefix)) {
             val currentGeometryIndex = request.requestUrl
                 ?.queryParameter("current_route_geometry_index")
                 ?.toInt()
             if (acceptedGeometryIndex == null || acceptedGeometryIndex == currentGeometryIndex) {
-                _handledRequests.add(request)
                 return MockResponse().setBody(jsonResponseModifier(jsonResponse))
             }
         }

instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/utils/http/MockDirectionsRefreshHandler.kt

@@ -1,7 +1,7 @@
 package com.mapbox.navigation.instrumentation_tests.utils.http
 
 import com.mapbox.geojson.Point
-import com.mapbox.navigation.testing.ui.http.MockRequestHandler
+import com.mapbox.navigation.testing.ui.http.BaseMockRequestHandler
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest
 
@@ -18,8 +18,8 @@ data class MockDirectionsRequestHandler(
     val jsonResponse: String,
     val expectedCoordinates: List<Point>?,
     val relaxedExpectedCoordinates: Boolean = false,
-) : MockRequestHandler {
-    override fun handle(request: RecordedRequest): MockResponse? {
+) : BaseMockRequestHandler() {
+    override fun handleInternal(request: RecordedRequest): MockResponse? {
         val prefix = if (relaxedExpectedCoordinates) {
             """/directions/v5/mapbox/$profile"""
         } else {