Skip to content

Commit c42b5d7

Browse files
DzmitryFomchyngithub-actions[bot]
authored andcommitted
Address review comments (#10313) (#10322)
GitOrigin-RevId: 9aa77bfa8d091e1a42e90b1a44e087dd04a74600
1 parent 1308d51 commit c42b5d7

File tree

6 files changed

+19
-9
lines changed

6 files changed

+19
-9
lines changed

libtesting-utils/src/main/java/com/mapbox/navigation/testing/BlockingSAMCallback.kt renamed to libtesting-utils/src/main/java/com/mapbox/navigation/testing/BlockingSamCallback.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.mapbox.navigation.testing
22

33
import java.util.concurrent.CountDownLatch
44

5-
class BlockingSAMCallback<T : Any> : (T) -> Unit {
5+
class BlockingSamCallback<T : Any> : (T) -> Unit {
66

77
private var countDownLatch = CountDownLatch(1)
88
private lateinit var result: T

navigation/src/main/java/com/mapbox/navigation/core/navigator/offline/DownloadedTilesetsFetcher.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.mapbox.bindgen.Expected
44
import com.mapbox.bindgen.ExpectedFactory
55
import com.mapbox.common.TileStore
66
import com.mapbox.navigation.utils.internal.logD
7+
import com.mapbox.navigation.utils.internal.logE
78
import kotlinx.serialization.Serializable
89
import kotlinx.serialization.decodeFromString
910
import kotlinx.serialization.json.Json
@@ -159,12 +160,12 @@ internal class DownloadedTilesetsFetcher(
159160
val response = jsonParser.decodeFromString<TilesetDescriptorMetadataResponse>(json)
160161
response.resolved
161162
} catch (e: kotlinx.serialization.SerializationException) {
162-
logD(TilesetVersionManagerImpl.LOG_CATEGORY) {
163+
logE(TilesetVersionManagerImpl.LOG_CATEGORY) {
163164
"Downloaded tilesets metadata parsing error: $e"
164165
}
165166
emptyList()
166167
} catch (e: Exception) {
167-
logD(TilesetVersionManagerImpl.LOG_CATEGORY) {
168+
logE(TilesetVersionManagerImpl.LOG_CATEGORY) {
168169
"Downloaded tilesets metadata error: $e"
169170
}
170171
emptyList()

navigation/src/main/java/com/mapbox/navigation/core/navigator/offline/TilesetReleaseDateParser.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.mapbox.navigation.core.navigator.offline
22

3+
import com.mapbox.navigation.utils.internal.logE
34
import java.text.SimpleDateFormat
45
import java.util.Date
56
import java.util.Locale
@@ -11,6 +12,9 @@ internal object TilesetReleaseDateParser {
1112
return try {
1213
VERSION_NAME_DATE_FORMATTER.parse(versionName)
1314
} catch (e: Exception) {
15+
logE(TilesetVersionManagerImpl.LOG_CATEGORY) {
16+
"Unable to parse date from version name $versionName: $e"
17+
}
1418
null
1519
}
1620
}

navigation/src/test/java/com/mapbox/navigation/core/navigator/offline/TilesetReleaseDateParserTest.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
package com.mapbox.navigation.core.navigator.offline
22

3+
import com.mapbox.navigation.testing.LoggingFrontendTestRule
34
import org.junit.Assert.assertEquals
45
import org.junit.Assert.assertNotNull
56
import org.junit.Assert.assertNull
7+
import org.junit.Rule
68
import org.junit.Test
79
import java.text.SimpleDateFormat
810
import java.util.Locale
911
import java.util.TimeZone
1012

1113
class TilesetReleaseDateParserTest {
1214

15+
@get:Rule
16+
val loggerRule = LoggingFrontendTestRule()
17+
1318
@Test
1419
fun `parseReleaseDate should parse valid version names correctly`() {
1520
val formatter = SimpleDateFormat("yyyy_MM_dd-HH_mm_ss", Locale.US).apply {

navigation/src/test/java/com/mapbox/navigation/core/navigator/offline/TilesetVersionManagerTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.mapbox.bindgen.ExpectedFactory
55
import com.mapbox.common.Cancelable
66
import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
77
import com.mapbox.navigation.core.navigator.offline.TilesetVersionManager.AllTilesetsUpdatesCallback
8-
import com.mapbox.navigation.testing.BlockingSAMCallback
8+
import com.mapbox.navigation.testing.BlockingSamCallback
99
import com.mapbox.navigation.testing.LoggingFrontendTestRule
1010
import io.mockk.CapturingSlot
1111
import io.mockk.every
@@ -687,7 +687,7 @@ class TilesetVersionManagerTest {
687687

688688
fun TilesetVersionManager.getAvailableVersionsBlocking():
689689
Expected<Throwable, List<TilesetVersion>> {
690-
val callback = BlockingSAMCallback<Expected<Throwable, List<TilesetVersion>>>()
690+
val callback = BlockingSamCallback<Expected<Throwable, List<TilesetVersion>>>()
691691
getAvailableVersions(callback)
692692
return callback.getResultBlocking()
693693
}
@@ -758,7 +758,7 @@ class TilesetVersionManagerTest {
758758
regionId: String,
759759
maxAllowedAgeDifferenceMinutes: Long,
760760
): Expected<Throwable, TilesetUpdateAvailabilityResult> {
761-
val callback = BlockingSAMCallback<
761+
val callback = BlockingSamCallback<
762762
Expected<Throwable, TilesetUpdateAvailabilityResult>,
763763
>()
764764
getAvailableUpdate(regionId, maxAllowedAgeDifferenceMinutes, callback)
@@ -768,7 +768,7 @@ class TilesetVersionManagerTest {
768768
fun TilesetVersionManager.getAvailableUpdatesBlocking(
769769
maxAllowedAgeDifferenceMinutes: Long,
770770
): Expected<Throwable, List<TilesetUpdateAvailabilityResult.Available>> {
771-
val callback = BlockingSAMCallback<
771+
val callback = BlockingSamCallback<
772772
Expected<Throwable, List<TilesetUpdateAvailabilityResult.Available>>,
773773
>()
774774
getAvailableUpdates(maxAllowedAgeDifferenceMinutes, callback)

navigation/src/test/java/com/mapbox/navigation/core/navigator/offline/TilesetVersionsApiTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
1616
import com.mapbox.navigation.base.HttpException
1717
import com.mapbox.navigation.core.internal.SdkInfoProvider
1818
import com.mapbox.navigation.core.navigator.offline.TilesetVersionsApi.RouteTileVersionsResponse
19-
import com.mapbox.navigation.testing.BlockingSAMCallback
19+
import com.mapbox.navigation.testing.BlockingSamCallback
2020
import com.mapbox.navigation.testing.LoggingFrontendTestRule
2121
import io.mockk.CapturingSlot
2222
import io.mockk.every
@@ -253,7 +253,7 @@ class TilesetVersionsApiTest {
253253
dataset: String = "test-dataset",
254254
profile: String = "driving",
255255
): Expected<Throwable, RouteTileVersionsResponse> {
256-
val callback = BlockingSAMCallback<Expected<Throwable, RouteTileVersionsResponse>>()
256+
val callback = BlockingSamCallback<Expected<Throwable, RouteTileVersionsResponse>>()
257257
getRouteTileVersions(
258258
baseUri = baseUri,
259259
dataset = dataset,

0 commit comments

Comments
 (0)