refactoring

Author: vadzim-vys

libnavigation-core/src/androidTest/java/com/mapbox/navigation/core/trip/service/ArtificialDriverTest.kt

@@ -4,8 +4,6 @@ import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.mapbox.api.directions.v5.models.DirectionsRoute
-import com.mapbox.common.LogConfiguration
-import com.mapbox.common.LoggingLevel
 import com.mapbox.navigation.base.options.NavigationOptions
 import com.mapbox.navigation.base.route.NavigationRoute
 import com.mapbox.navigation.base.route.RouterOrigin
@@ -29,13 +27,10 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.takeWhile
+import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -45,58 +40,72 @@ class ArtificialDriverTest {
 
     @Test
     fun testFollowingRoute() = runBlocking<Unit>(Dispatchers.Main) {
-        LogConfiguration.setLoggingLevel(LoggingLevel.DEBUG)
         getNativeNavigator { nativeNavigator ->
             val testRoute = getTestRoute()
             val replayRouteMapper = ReplayRouteMapper()
-            val events = replayRouteMapper.mapDirectionsRouteGeometry(testRoute.directionsRoute)
-            val result = nativeNavigator.setRoutes(testRoute, reason = SetRoutesReason.NEW_ROUTE)
-            assertTrue("result is $result", result.isValue)
-            val states = mutableListOf<NavigationStatus>()
-            val statusTracking = launch {
-                nativeNavigator.statusUpdates().collect {
-                    states.add(it.second)
-                }
+            val events = replayRouteMapper.mapDirectionsRouteGeometry(testRoute.directionsRoute).filterIsInstance<ReplayEventUpdateLocation>()
+            val setRoutesResult = nativeNavigator.setRoutes(testRoute, reason = SetRoutesReason.NEW_ROUTE)
+            assertTrue("result is $setRoutesResult", setRoutesResult.isValue)
+            val statusesTracking = async<List<NavigationStatus>> {
+                nativeNavigator.collectStatuses(untilRouteState = RouteState.COMPLETE)
             }
-            for (event in events.filterIsInstance<ReplayEventUpdateLocation>()) {
+
+            for (event in events) {
                 val location = event.location.mapToLocation(event.eventTimestamp)
                 assertTrue(nativeNavigator.updateLocation(location.toFixLocation()))
             }
-            statusTracking.cancel()
-            assertTrue(states.all { it.routeState == RouteState.TRACKING || it.routeState == RouteState.COMPLETE })
+
+            val states = statusesTracking.await()
+            assertTrue(states.all { it.routeState == RouteState.TRACKING })
         }
     }
+}
 
-    @OptIn(ExperimentalCoroutinesApi::class)
-    fun MapboxNativeNavigator.statusUpdates(): Flow<Pair<NavigationStatusOrigin, NavigationStatus>> {
-        return callbackFlow {
-            val observer = NavigatorObserver { origin, status ->
-                Log.d("vadzim-debug", "$origin, $status")
-                this.trySend(Pair(origin, status))
-            }
-            addNavigatorObserver(observer)
-            awaitClose {
-                removeNavigatorObserver(observer)
-            }
+private suspend fun MapboxNativeNavigator.collectStatuses(
+    untilRouteState: RouteState
+): MutableList<NavigationStatus> {
+    val statues = mutableListOf<NavigationStatus>()
+    statusUpdates()
+        .map { it.status }
+        .takeWhile { it.routeState != untilRouteState }
+        .toList(statues)
+    return statues
+}
+
+data class OnStatusUpdateParameters(
+    val origin: NavigationStatusOrigin,
+    val status: NavigationStatus
+)
+
+@OptIn(ExperimentalCoroutinesApi::class)
+fun MapboxNativeNavigator.statusUpdates(): Flow<OnStatusUpdateParameters> {
+    return callbackFlow {
+        val observer = NavigatorObserver { origin, status ->
+            Log.d("vadzim-debug", "$origin, $status")
+            this.trySend(OnStatusUpdateParameters(origin, status))
+        }
+        addNavigatorObserver(observer)
+        awaitClose {
+            removeNavigatorObserver(observer)
         }
     }
+}
 
-    private suspend fun getNativeNavigator(block: suspend (MapboxNativeNavigator) -> Unit) {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-        val mapboxNavigation = MapboxNavigationProvider.create(
-            NavigationOptions.Builder(context)
-                .accessToken(context.getString(R.string.mapbox_access_token))
-                .build()
-        )
-        block(MapboxNativeNavigatorImpl)
-        mapboxNavigation.onDestroy()
-    }
+private suspend fun getNativeNavigator(block: suspend (MapboxNativeNavigator) -> Unit) {
+    val context = InstrumentationRegistry.getInstrumentation().targetContext
+    val mapboxNavigation = MapboxNavigationProvider.create(
+        NavigationOptions.Builder(context)
+            .accessToken(context.getString(R.string.mapbox_access_token))
+            .build()
+    )
+    block(MapboxNativeNavigatorImpl)
+    mapboxNavigation.onDestroy()
+}
 
-    private fun getTestRoute(): NavigationRoute {
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-        return DirectionsRoute.fromJson(
-            context.resources.openRawResource(R.raw.multileg_route)
-                .readBytes().decodeToString()
-        ).toNavigationRoute(RouterOrigin.Custom())
-    }
-}
+private fun getTestRoute(): NavigationRoute {
+    val context = InstrumentationRegistry.getInstrumentation().targetContext
+    return DirectionsRoute.fromJson(
+        context.resources.openRawResource(R.raw.multileg_route)
+            .readBytes().decodeToString()
+    ).toNavigationRoute(RouterOrigin.Custom())
+}