Skip to content

Commit c785788

Browse files
committed
fix test
1 parent d0b2790 commit c785788

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

libnavui-androidauto/src/main/java/com/mapbox/androidauto/MapboxCarApp.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import com.mapbox.androidauto.navigation.location.CarAppLocation
44
import com.mapbox.androidauto.navigation.location.impl.CarAppLocationImpl
55
import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
66
import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
7-
import com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance
87
import kotlinx.coroutines.flow.MutableStateFlow
98
import kotlinx.coroutines.flow.StateFlow
109

libnavui-app/src/main/java/com/mapbox/navigation/ui/app/internal/controller/AudioGuidanceStateController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class AudioGuidanceStateController(
4747
override fun onAttached(mapboxNavigation: MapboxNavigation) {
4848
super.onAttached(mapboxNavigation)
4949

50-
val audioGuidance = MapboxNavigationApp.getObserver(MapboxAudioGuidance::class)
50+
val audioGuidance = MapboxAudioGuidance.getInstance()
5151
audioGuidance.stateFlow().observe {
5252
if (it.isMuted != store.state.value.audio.isMuted) {
5353
val newState = AudioGuidanceState(it.isMuted)

libnavui-app/src/test/java/com/mapbox/navigation/ui/app/internal/controller/AudioGuidanceStateControllerTest.kt

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.mapbox.navigation.ui.app.internal.controller
22

33
import com.mapbox.navigation.core.MapboxNavigation
4-
import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
54
import com.mapbox.navigation.testing.MainCoroutineRule
65
import com.mapbox.navigation.ui.app.internal.State
76
import com.mapbox.navigation.ui.app.internal.audioguidance.AudioAction
@@ -37,17 +36,15 @@ class AudioGuidanceStateControllerTest {
3736

3837
@Before
3938
fun setup() {
40-
mockkObject(MapboxNavigationApp)
39+
mockkObject(MapboxAudioGuidance)
4140

4241
audioGuidanceState = MutableStateFlow(
4342
mockk { every { isMuted } returns false }
4443
)
4544
mockAudioGuidance = mockk(relaxed = true) {
4645
every { stateFlow() } returns audioGuidanceState
4746
}
48-
every {
49-
MapboxNavigationApp.getObserver(MapboxAudioGuidance::class)
50-
} returns mockAudioGuidance
47+
every { MapboxAudioGuidance.getInstance() } returns mockAudioGuidance
5148

5249
testStore = spyk(TestStore())
5350
}
@@ -68,7 +65,7 @@ class AudioGuidanceStateControllerTest {
6865
)
6966
audioGuidanceState.value = mockk { every { isMuted } returns true }
7067

71-
sut.onAttached(mockMapboxNavigation())
68+
sut.onAttached(mockk())
7269
assertTrue(testStore.state.value.audio.isMuted)
7370
}
7471

@@ -83,7 +80,7 @@ class AudioGuidanceStateControllerTest {
8380
)
8481
audioGuidanceState.value = mockk { every { isMuted } returns false }
8582

86-
sut.onAttached(mockMapboxNavigation())
83+
sut.onAttached(mockk())
8784
testStore.setState(
8885
State(
8986
audio = AudioGuidanceState(isMuted = true)
@@ -103,17 +100,11 @@ class AudioGuidanceStateControllerTest {
103100
)
104101
val sut = AudioGuidanceStateController(testStore)
105102

106-
val mapboxNavigation = mockMapboxNavigation()
103+
val mapboxNavigation: MapboxNavigation = mockk()
107104
sut.onAttached(mapboxNavigation)
108105
testStore.dispatch(AudioAction.Toggle)
109106
sut.onDetached(mapboxNavigation)
110107

111108
assertTrue(testStore.state.value.audio.isMuted)
112109
}
113-
114-
private fun mockMapboxNavigation(): MapboxNavigation {
115-
val mapboxNavigation = mockk<MapboxNavigation>(relaxed = true)
116-
every { MapboxNavigationApp.current() } returns mapboxNavigation
117-
return mapboxNavigation
118-
}
119110
}

0 commit comments

Comments
 (0)