Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68fe604a authored by Evan Laird's avatar Evan Laird
Browse files

[mobile] fix test if new icons is enabled 

The test doesn't care to set one or the other, it's just testing that a
background exists basically. So we can parameterize it based on the
existing on-device flag setting.

Test: MobileIconViewModelTest
Flag: com.android.settingslib.flags.new_status_bar_icons
Bug: 391606042
Change-Id: I281df0c39affc33db48269dc6ca32df16b24e28e
parent bd2dfd41

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/mobile/ui/viewmodel/MobileIconViewModelTest.kt

+19 −1
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ import com.android.systemui.flags.Flags.NEW_NETWORK_SLICE_UI 
import com.android.systemui.log.table.logcatTableLogBuffer

import com.android.systemui.res.R

import com.android.systemui.statusbar.connectivity.MobileIconCarrierIdOverridesFake

import com.android.systemui.statusbar.core.NewStatusBarIcons

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.pipeline.airplane.data.repository.FakeAirplaneModeRepository

import com.android.systemui.statusbar.pipeline.airplane.domain.interactor.AirplaneModeInteractor

import com.android.systemui.statusbar.pipeline.mobile.data.model.DataConnectionState
@@ -843,7 +845,23 @@ class MobileIconViewModelTest : SysuiTestCase() { 
        }



    @Test

    fun netTypeBackground_flagOn_notNullWhenPrioritizedCapabilities() =

    @EnableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun netTypeBackground_sliceUiEnabled_notNullWhenPrioritizedCapabilities_newIcons() =

        testScope.runTest {

            flags.set(NEW_NETWORK_SLICE_UI, true)

            createAndSetViewModel()



            val latest by collectLastValue(underTest.networkTypeBackground)



            repository.hasPrioritizedNetworkCapabilities.value = true



            assertThat(latest)

                .isEqualTo(Icon.Resource(R.drawable.mobile_network_type_background_updated, null))

        }



    @Test

    @DisableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun netTypeBackground_sliceUiDisabled_notNullWhenPrioritizedCapabilities_oldIcons() =

        testScope.runTest {

            flags.set(NEW_NETWORK_SLICE_UI, true)

            createAndSetViewModel()