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

Commit 205b8864 authored by Evan Laird's avatar Evan Laird
Browse files

[battery][old] make the old tests use the same logic as the view 

The bug here is that the old-new icons are no relying on _both_ the
StatusBarRootModernization and NewStatusBarIcons flags.

We could have alternatively deleted these tests, but that doesn't seem
necessary since the code is still there.

Test: BatteryMeterViewTest
Fixes: 406994386
Flag: EXEMPT bugfix relating to the flags in test
Change-Id: I9e1301b07a92ce0556c822a8f9f866ea26cfec67
parent 0f44b427

packages/SystemUI/multivalentTests/src/com/android/systemui/battery/BatteryMeterViewTest.kt

+15 −18
Original line number Diff line number Diff line
@@ -21,10 +21,11 @@ import android.testing.TestableLooper.RunWithLooper 
import android.widget.ImageView

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

import androidx.test.filters.SmallTest

import com.android.settingslib.flags.Flags.FLAG_NEW_STATUS_BAR_ICONS

import com.android.systemui.SysuiTestCase

import com.android.systemui.battery.BatteryMeterView.BatteryEstimateFetcher

import com.android.systemui.res.R

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

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

import com.android.systemui.statusbar.policy.BatteryController.EstimateFetchCompletion

import com.google.common.truth.Truth.assertThat

import org.junit.Before
@@ -139,7 +140,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @DisableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun changesFromEstimateToPercent_textAndContentDescriptionChanges_flagOff() {

        mBatteryMeterView.onBatteryLevelChanged(15, false)

        mBatteryMeterView.setPercentShowMode(BatteryMeterView.MODE_ESTIMATE)
@@ -161,7 +162,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @EnableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun changesFromEstimateToPercent_textAndContentDescriptionChanges_flagOn() {

        mBatteryMeterView.onBatteryLevelChanged(15, false)

        mBatteryMeterView.setPercentShowMode(BatteryMeterView.MODE_ESTIMATE)
@@ -184,7 +185,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @EnableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun modeEstimate_batteryPercentView_isNotNull_flagOn() {

        mBatteryMeterView.onBatteryLevelChanged(15, false)

        mBatteryMeterView.setPercentShowMode(BatteryMeterView.MODE_ESTIMATE)
@@ -199,7 +200,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @EnableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun modePercent_batteryPercentView_isNull_flagOn() {

        mBatteryMeterView.onBatteryLevelChanged(15, false)

        mBatteryMeterView.setPercentShowMode(BatteryMeterView.MODE_ON)
@@ -236,11 +237,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
        mBatteryMeterView.onIsBatteryDefenderChanged(false)

        assertThat(mBatteryMeterView.contentDescription)

            .isEqualTo(

                context.getString(

                    R.string.accessibility_battery_level_with_estimate,

                    90,

                    ESTIMATE,

                )

                context.getString(R.string.accessibility_battery_level_with_estimate, 90, ESTIMATE)

            )



        // Just percent
@@ -255,7 +252,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @DisableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun isBatteryDefenderChanged_true_drawableGetsTrue_flagOff() {

        val drawable = getBatteryDrawable()
@@ -265,7 +262,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @EnableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun isBatteryDefenderChanged_true_drawableGetsTrue_flagOn() {

        mBatteryMeterView.onIsBatteryDefenderChanged(true)
@@ -273,7 +270,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @DisableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun isBatteryDefenderChanged_false_drawableGetsFalse_flagOff() {

        val drawable = getBatteryDrawable()
@@ -287,7 +284,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @EnableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun isBatteryDefenderChanged_false_drawableGetsFalse_flagOn() {

        // Start as true

        mBatteryMeterView.onIsBatteryDefenderChanged(true)
@@ -299,7 +296,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @DisableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun isIncompatibleChargingChanged_true_drawableGetsChargingFalse_flagOff() {

        mBatteryMeterView.onBatteryLevelChanged(45, true)

        val drawable = getBatteryDrawable()
@@ -311,7 +308,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @EnableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun isIncompatibleChargingChanged_true_drawableGetsChargingFalse_flagOn() {

        mBatteryMeterView.onBatteryLevelChanged(45, true)
@@ -322,7 +319,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @DisableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun isIncompatibleChargingChanged_false_drawableGetsChargingTrue_flagOff() {

        mBatteryMeterView.onBatteryLevelChanged(45, true)

        val drawable = getBatteryDrawable()
@@ -333,7 +330,7 @@ class BatteryMeterViewTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(FLAG_NEW_STATUS_BAR_ICONS)

    @EnableFlags(NewStatusBarIcons.FLAG_NAME, StatusBarRootModernization.FLAG_NAME)

    fun isIncompatibleChargingChanged_false_drawableGetsChargingTrue_flagOn() {

        mBatteryMeterView.onBatteryLevelChanged(45, true)