use com.mapbox.common.Log instead of com.mapbox.common.Logger

Author: Łukasz Paczos

libnavigation-base/build.gradle

@@ -40,6 +40,7 @@ dependencies {
 
     testImplementation project(':libtesting-utils')
     testImplementation project(':libtesting-navigation-base')
+    testImplementation project(':libtesting-navigation-util')
     apply from: "${rootDir}/gradle/unit-testing-dependencies.gradle"
 }
 

libnavigation-base/src/test/java/com/mapbox/navigation/base/internal/route/AnnotationsRefresherTest.kt

@@ -2,7 +2,9 @@ package com.mapbox.navigation.base.internal.route
 
 import com.mapbox.api.directions.v5.models.LegAnnotation
 import com.mapbox.api.directions.v5.models.MaxSpeed
+import com.mapbox.navigation.testing.LoggingFrontendTestRule
 import org.junit.Assert.assertEquals
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -16,6 +18,9 @@ class AnnotationsRefresherTest(
     private val description: String,
 ) {
 
+    @get:Rule
+    val loggerRule = LoggingFrontendTestRule()
+
     companion object {
 
         @JvmStatic

libnavigation-base/src/test/java/com/mapbox/navigation/base/utils/route/NavigationRouteExTest.kt

@@ -5,10 +5,12 @@ import com.mapbox.api.directions.v5.models.DirectionsRoute
 import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
 import com.mapbox.navigation.base.route.NavigationRoute
 import com.mapbox.navigation.testing.FileUtils
+import com.mapbox.navigation.testing.LoggingFrontendTestRule
 import io.mockk.every
 import io.mockk.mockk
 import junit.framework.Assert
 import kotlinx.coroutines.runBlocking
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -27,6 +29,9 @@ class NavigationRouteExTest {
         private val expectedHasUnexpectedClosures: Boolean,
     ) {
 
+        @get:Rule
+        val loggerRule = LoggingFrontendTestRule()
+
         companion object {
             @JvmStatic
             @Parameterized.Parameters(name = "{0}")

libnavigation-core/build.gradle

@@ -61,6 +61,7 @@ dependencies {
 
     testImplementation project(':libtesting-utils')
     testImplementation project(':libtesting-navigation-base')
+    testImplementation project(':libtesting-navigation-util')
     apply from: "${rootDir}/gradle/unit-testing-dependencies.gradle"
     testImplementation dependenciesList.commonsIO
 

libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt

@@ -119,7 +119,6 @@ import com.mapbox.navigation.navigator.internal.MapboxNativeNavigator
 import com.mapbox.navigation.navigator.internal.NavigatorLoader
 import com.mapbox.navigation.navigator.internal.router.RouterInterfaceAdapter
 import com.mapbox.navigation.utils.internal.ConnectivityHandler
-import com.mapbox.navigation.utils.internal.LoggerProvider
 import com.mapbox.navigation.utils.internal.ThreadController
 import com.mapbox.navigation.utils.internal.ifNonNull
 import com.mapbox.navigation.utils.internal.logD
@@ -415,8 +414,6 @@ class MapboxNavigation @VisibleForTesting internal constructor(
         private set
 
     init {
-        // Instantiate LoggerProvider explicitly so that NavigationLogBackend is set
-        LoggerProvider.initialize()
         if (hasInstance) {
             throw IllegalStateException(
                 """

libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/utils/ModulesUtils.kt

@@ -39,7 +39,6 @@ internal fun paramsProvider(moduleParams: ModuleParams): Array<ModuleProviderArg
                 MapboxDistanceFormatter(moduleParams.distanceFormatterOptions),
             ),
         )
-        is ModuleParams.CommonLogger -> arrayOf()
     }
 
 internal sealed class ModuleParams {
@@ -54,6 +53,4 @@ internal sealed class ModuleParams {
         val tripNotificationInterceptorOwner: TripNotificationInterceptorOwner,
         val distanceFormatterOptions: DistanceFormatterOptions,
     ) : ModuleParams()
-
-    object CommonLogger : ModuleParams()
 }

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

@@ -40,12 +40,12 @@ import com.mapbox.navigation.core.trip.session.TripSessionLocationEngine
 import com.mapbox.navigation.core.trip.session.createSetRouteResult
 import com.mapbox.navigation.navigator.internal.MapboxNativeNavigator
 import com.mapbox.navigation.navigator.internal.NavigatorLoader
+import com.mapbox.navigation.testing.LoggingFrontendTestRule
 import com.mapbox.navigation.testing.MainCoroutineRule
 import com.mapbox.navigation.utils.internal.LoggerProvider
 import com.mapbox.navigation.utils.internal.ThreadController
 import com.mapbox.navigator.CacheHandle
 import com.mapbox.navigator.RouteInterface
-import io.mockk.Runs
 import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.just
@@ -66,6 +66,9 @@ import java.util.UUID
 
 internal open class MapboxNavigationBaseTest {
 
+    @get:Rule
+    val loggerRule = LoggingFrontendTestRule()
+
     @get:Rule
     val coroutineRule = MainCoroutineRule()
 
@@ -127,7 +130,6 @@ internal open class MapboxNavigationBaseTest {
     @Before
     open fun setUp() {
         mockkObject(LoggerProvider)
-        every { LoggerProvider.initialize() } just Runs
         mockkObject(NavigatorLoader)
         every {
             NavigatorLoader.createNativeRouterInterface(any(), any(), any(), any())

libnavigation-core/src/test/java/com/mapbox/navigation/core/accounts/BillingControllerTest.kt

@@ -17,6 +17,7 @@ import com.mapbox.navigation.core.trip.session.NavigationSession
 import com.mapbox.navigation.core.trip.session.NavigationSessionState
 import com.mapbox.navigation.core.trip.session.NavigationSessionStateObserver
 import com.mapbox.navigation.core.trip.session.TripSession
+import com.mapbox.navigation.testing.LoggingFrontendTestRule
 import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just
@@ -31,11 +32,15 @@ import io.mockk.verifyOrder
 import org.junit.After
 import org.junit.Assert.assertNotNull
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import java.util.concurrent.TimeUnit
 
 class BillingControllerTest {
 
+    @get:Rule
+    val loggerRule = LoggingFrontendTestRule()
+
     private val accessToken = "pk.123"
     private lateinit var navigationSession: NavigationSession
     private lateinit var tripSession: TripSession

libnavigation-core/src/test/java/com/mapbox/navigation/core/history/MapboxHistoryRecorderTest.kt

@@ -4,23 +4,27 @@ import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import com.mapbox.navigation.base.options.HistoryRecorderOptions
 import com.mapbox.navigation.base.options.NavigationOptions
+import com.mapbox.navigation.testing.LoggingFrontendTestRule
 import com.mapbox.navigation.utils.internal.LoggerFrontend
-import com.mapbox.navigation.utils.internal.LoggerProvider
 import io.mockk.mockk
 import io.mockk.verify
 import org.junit.Assert.assertTrue
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import java.io.File
 
 @RunWith(RobolectricTestRunner::class)
 class MapboxHistoryRecorderTest {
+
+    private val logger = mockk<LoggerFrontend>(relaxed = true)
+
+    @get:Rule
+    val loggerRule = LoggingFrontendTestRule(logger)
+
     private val context: Context = ApplicationProvider.getApplicationContext()
     private val navigationOptionsBuilder = NavigationOptions.Builder(context)
-    private val logger = mockk<LoggerFrontend>(relaxed = true).apply {
-        LoggerProvider.setLoggerFrontend(this)
-    }
 
     @Test
     fun `historyRecorder fileDirectory is default when no options provided`() {

libnavigation-core/src/test/java/com/mapbox/navigation/core/lifecycle/CarAppLifecycleOwnerTest.kt

@@ -11,11 +11,13 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
+import com.mapbox.navigation.testing.LoggingFrontendTestRule
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import io.mockk.verifyOrder
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -26,6 +28,9 @@ class CarAppLifecycleOwnerTest {
     private val testLifecycleObserver: DefaultLifecycleObserver = mockk(relaxUnitFun = true)
     private val carAppLifecycleOwner = CarAppLifecycleOwner()
 
+    @get:Rule
+    val loggerRule = LoggingFrontendTestRule()
+
     @Before
     fun setup() {
         carAppLifecycleOwner.lifecycle.addObserver(testLifecycleObserver)