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

Commit 50fa515f authored by Evan Laird's avatar Evan Laird
Browse files

Use rule annotations to fix tests 

Bug: 316646466
Test: MobileIconViewModelTest
Test: all of the tests
Flag: ACONFIG com.android.systemui.status_bar_static_inout_indicators DEVELOPMENT
Change-Id: Ie79b100e95601e04da04090161d48e4e18b08115
parent 7493a09d

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt

+6 −15
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


package com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel



import android.platform.test.flag.junit.SetFlagsRule

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.settingslib.AccessibilityContentDescriptions.WIFI_OTHER_DEVICE_CONNECTION
@@ -60,8 +61,6 @@ class WifiViewModelTest : SysuiTestCase() { 


    private lateinit var underTest: WifiViewModel



    private val setFlagsRule = SetFlagsRule()



    @Mock private lateinit var tableLogBuffer: TableLogBuffer

    @Mock private lateinit var connectivityConstants: ConnectivityConstants

    @Mock private lateinit var wifiConstants: WifiConstants
@@ -187,11 +186,9 @@ class WifiViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)

    fun activity_nullSsid_outputsFalse_staticFlagOff() =

        testScope.runTest {

            // GIVEN flag is disabled

            setFlagsRule.disableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)



            whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

            createAndSetViewModel()
@@ -214,11 +211,9 @@ class WifiViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)

    fun activity_nullSsid_outputsFalse_staticFlagOn() =

        testScope.runTest {

            // GIVEN flag is enabled

            setFlagsRule.enableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)



            whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

            createAndSetViewModel()
@@ -371,11 +366,9 @@ class WifiViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)

    fun activityContainer_inAndOutFalse_outputsTrue_staticFlagOff() =

        testScope.runTest {

            // GIVEN the flag is off

            setFlagsRule.disableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)



            whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

            createAndSetViewModel()

            wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
@@ -389,11 +382,9 @@ class WifiViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)

    fun activityContainer_inAndOutFalse_outputsTrue_staticFlagOn() =

        testScope.runTest {

            // GIVEN the flag is on

            setFlagsRule.enableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)



            whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

            createAndSetViewModel()

            wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)

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

+4 −9
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


package com.android.systemui.statusbar.pipeline.mobile.ui.viewmodel



import android.platform.test.flag.junit.SetFlagsRule

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.settingslib.AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH
@@ -73,8 +74,6 @@ import org.mockito.MockitoAnnotations 
class MobileIconViewModelTest : SysuiTestCase() {

    private var connectivityRepository = FakeConnectivityRepository()



    private val setFlagsRule = SetFlagsRule()



    private lateinit var underTest: MobileIconViewModel

    private lateinit var interactor: MobileIconInteractorImpl

    private lateinit var iconsInteractor: MobileIconsInteractorImpl
@@ -561,11 +560,9 @@ class MobileIconViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)

    fun dataActivity_configOn_testIndicators_staticFlagOff() =

        testScope.runTest {

            // GIVEN STATUS_BAR_STATIC_NETWORK_INDICATORS flag is off

            setFlagsRule.disableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)



            // Create a new view model here so the constants are properly read

            whenever(constants.shouldShowActivityConfig).thenReturn(true)

            createAndSetViewModel()
@@ -618,11 +615,9 @@ class MobileIconViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)

    fun dataActivity_configOn_testIndicators_staticFlagOn() =

        testScope.runTest {

            // GIVEN STATUS_BAR_STATIC_NETWORK_INDICATORS flag is on

            setFlagsRule.enableFlags(FLAG_STATUS_BAR_STATIC_INOUT_INDICATORS)



            // Create a new view model here so the constants are properly read

            whenever(constants.shouldShowActivityConfig).thenReturn(true)

            createAndSetViewModel()