Fix unit tests

Author: 0nko

app/src/main/java/com/duckduckgo/app/appearance/AppearanceViewModel.kt

@@ -30,18 +30,17 @@ import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.tabs.store.TabSwitcherDataStore
 import com.duckduckgo.browser.ui.omnibar.OmnibarType
 import com.duckduckgo.common.ui.DuckDuckGoTheme
-import com.duckduckgo.common.ui.DuckDuckGoTheme.DARK
-import com.duckduckgo.common.ui.DuckDuckGoTheme.LIGHT
-import com.duckduckgo.common.ui.DuckDuckGoTheme.SYSTEM_DEFAULT
 import com.duckduckgo.common.ui.store.ThemingDataStore
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.ActivityScope
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -101,7 +100,7 @@ class AppearanceViewModel @Inject constructor(
         currentViewState.copy(
             isTrackersCountInTabSwitcherEnabled = !isTrackersAnimationTileHidden,
         )
-    }
+    }.stateIn(viewModelScope, SharingStarted.Lazily, viewState.value)
 
     private val command = Channel<Command>(1, BufferOverflow.DROP_OLDEST)
     fun commands(): Flow<Command> = command.receiveAsFlow()
@@ -139,9 +138,9 @@ class AppearanceViewModel @Inject constructor(
 
         val pixelName =
             when (selectedTheme) {
-                LIGHT -> SETTINGS_THEME_TOGGLED_LIGHT
-                DARK -> SETTINGS_THEME_TOGGLED_DARK
-                SYSTEM_DEFAULT -> SETTINGS_THEME_TOGGLED_SYSTEM_DEFAULT
+                DuckDuckGoTheme.LIGHT -> SETTINGS_THEME_TOGGLED_LIGHT
+                DuckDuckGoTheme.DARK -> SETTINGS_THEME_TOGGLED_DARK
+                DuckDuckGoTheme.SYSTEM_DEFAULT -> SETTINGS_THEME_TOGGLED_SYSTEM_DEFAULT
             }
         pixel.fire(pixelName)
     }

app/src/test/java/com/duckduckgo/app/appearance/AppearanceViewModelTest.kt

@@ -82,6 +82,10 @@ internal class AppearanceViewModelTest {
         whenever(mockAppSettingsDataStore.omnibarType).thenReturn(OmnibarType.SINGLE_TOP)
         whenever(mockTabSwitcherDataStore.isTrackersAnimationInfoTileHidden()).thenReturn(flowOf(false))
 
+        initializeViewModel()
+    }
+
+    private fun initializeViewModel() {
         testee =
             AppearanceViewModel(
                 mockThemeSettingsDataStore,
@@ -117,7 +121,7 @@ internal class AppearanceViewModelTest {
             testee.commands().test {
                 testee.userRequestedToChangeTheme()
 
-                assertEquals(Command.LaunchThemeSettings(DuckDuckGoTheme.LIGHT), awaitItem())
+                assertEquals(Command.LaunchThemeSettings(DuckDuckGoTheme.SYSTEM_DEFAULT), awaitItem())
 
                 cancelAndIgnoreRemainingEvents()
             }
@@ -139,8 +143,8 @@ internal class AppearanceViewModelTest {
     @Test
     fun whenThemeChangedThenDataStoreIsUpdatedAndUpdateThemeCommandIsSent() =
         runTest {
+            givenThemeSelected(DuckDuckGoTheme.LIGHT)
             testee.commands().test {
-                givenThemeSelected(DuckDuckGoTheme.LIGHT)
                 testee.onThemeSelected(DuckDuckGoTheme.DARK)
 
                 verify(mockThemeSettingsDataStore).theme = DuckDuckGoTheme.DARK
@@ -296,6 +300,8 @@ internal class AppearanceViewModelTest {
             whenever(mockThemeSettingsDataStore.theme).thenReturn(DuckDuckGoTheme.LIGHT)
             whenever(mockAppTheme.isLightModeEnabled()).thenReturn(true)
 
+            initializeViewModel()
+
             testee.viewState().test {
                 val value = expectMostRecentItem()
 
@@ -310,5 +316,6 @@ internal class AppearanceViewModelTest {
     private fun givenThemeSelected(theme: DuckDuckGoTheme) {
         whenever(mockThemeSettingsDataStore.theme).thenReturn(theme)
         whenever(mockThemeSettingsDataStore.isCurrentlySelected(theme)).thenReturn(true)
+        initializeViewModel()
     }
 }