Skip to content

Commit 4965cbb

Browse files
committed
NAVAND-777: meet Vadzim's code review
1 parent 87965a6 commit 4965cbb

File tree

16 files changed

+2473
-854
lines changed

16 files changed

+2473
-854
lines changed

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

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -159,77 +159,6 @@ class RouteRefreshOnDemandTest : BaseTest<EmptyTestActivity>(EmptyTestActivity::
159159
.toList()
160160
}
161161

162-
@Test
163-
fun failed_route_refresh_on_demand_does_not_notify_refresh_observer_before_timeout() = sdkTest {
164-
val refreshes = mutableListOf<RoutesUpdatedResult>()
165-
val routeRefreshOptions = RouteRefreshOptions.Builder()
166-
.intervalMillis(TimeUnit.MINUTES.toMillis(1))
167-
.build()
168-
failedRefreshHandlerWrapper.failResponse = true
169-
createMapboxNavigation(routeRefreshOptions)
170-
val routeOptions = generateRouteOptions(twoCoordinates)
171-
val requestedRoutes = mapboxNavigation.requestRoutes(routeOptions)
172-
.getSuccessfulResultOrThrowException()
173-
.routes
174-
mapboxNavigation.startTripSession()
175-
mapboxNavigation.registerRoutesObserver {
176-
if (it.reason == RoutesExtra.ROUTES_UPDATE_REASON_REFRESH) {
177-
refreshes.add(it)
178-
}
179-
}
180-
stayOnInitialPosition()
181-
mapboxNavigation.setNavigationRoutesAndWaitForUpdate(requestedRoutes)
182-
183-
mapboxNavigation.routeRefreshController.requestImmediateRouteRefresh()
184-
delay(2000)
185-
assertEquals(0, refreshes.size)
186-
}
187-
188-
@Test
189-
fun failed_route_refresh_on_demand_notifies_refresh_observer_after_timeout() = sdkTest {
190-
val routeRefreshOptions = createRouteRefreshOptionsWithInvalidInterval(3000)
191-
failedRefreshHandlerWrapper.failResponse = true
192-
createMapboxNavigation(routeRefreshOptions)
193-
val routeOptions = generateRouteOptions(twoCoordinates)
194-
val requestedRoutes = mapboxNavigation.requestRoutes(routeOptions)
195-
.getSuccessfulResultOrThrowException()
196-
.routes
197-
mapboxNavigation.startTripSession()
198-
stayOnInitialPosition()
199-
mapboxNavigation.setNavigationRoutesAndWaitForUpdate(requestedRoutes)
200-
201-
delay(7000) // 2 failed planned attempts + accuracy
202-
// fail and postpone next planned attempt
203-
mapboxNavigation.routeRefreshController.requestImmediateRouteRefresh()
204-
delay(2000)
205-
// dispatch new routes with REFRESH reason
206-
mapboxNavigation.routeRefreshController.requestImmediateRouteRefresh()
207-
208-
mapboxNavigation.routesUpdates()
209-
.filter { it.reason == RoutesExtra.ROUTES_UPDATE_REASON_REFRESH }
210-
.first()
211-
}
212-
213-
@Test
214-
fun route_refresh_on_demand_during_planned_request() = sdkTest {
215-
val routeRefreshOptions = createRouteRefreshOptionsWithInvalidInterval(5000)
216-
refreshHandler.jsonResponseModifier = DelayedResponseModifier(3000)
217-
createMapboxNavigation(routeRefreshOptions)
218-
val routeOptions = generateRouteOptions(twoCoordinates)
219-
val requestedRoutes = mapboxNavigation.requestRoutes(routeOptions)
220-
.getSuccessfulResultOrThrowException()
221-
.routes
222-
mapboxNavigation.startTripSession()
223-
stayOnInitialPosition()
224-
mapboxNavigation.setNavigationRoutesAndWaitForUpdate(requestedRoutes)
225-
226-
delay(6000) // refresh interval + accuracy
227-
mapboxNavigation.routeRefreshController.requestImmediateRouteRefresh()
228-
mapboxNavigation.routesUpdates()
229-
.filter { it.reason == RoutesExtra.ROUTES_UPDATE_REASON_REFRESH }
230-
.first()
231-
}
232-
233162
private fun createMapboxNavigation(routeRefreshOptions: RouteRefreshOptions) {
234163
mapboxNavigation = MapboxNavigationProvider.create(
235164
NavigationOptions.Builder(activity)

0 commit comments

Comments
 (0)