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

Commit e949d0f8 authored by Wesley Wang's avatar Wesley Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev

parents 84905596 d7e0fa95

tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java

+5 −6
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ import java.util.concurrent.TimeUnit; 
public class BatteryInfoTest {



    private static final String STATUS_CHARGING_NO_TIME = "50% - charging";

    private static final String STATUS_CHARGING_TIME = "50% - 0 min until charged";

    private static final String STATUS_CHARGING_TIME = "50% - 0 min left until full";

    private static final String STATUS_NOT_CHARGING = "Not charging";

    private static final long REMAINING_TIME_NULL = -1;

    private static final long REMAINING_TIME = 2;
@@ -72,7 +72,7 @@ public class BatteryInfoTest { 
    private static final String BATTERY_RUN_OUT_PREFIX = "Battery may run out by";

    private static final long TEST_CHARGE_TIME_REMAINING = TimeUnit.MINUTES.toMicros(1);

    private static final String TEST_CHARGE_TIME_REMAINING_STRINGIFIED =

            "1 min left until charged";

            "1 min left until full";

    private static final String TEST_BATTERY_LEVEL_10 = "10%";

    private static final String FIFTEEN_MIN_FORMATTED = "15 min";

    private static final Estimate MOCK_ESTIMATE = new Estimate(
@@ -135,7 +135,7 @@ public class BatteryInfoTest { 
                mBatteryUsageStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);



        assertThat(info.discharging).isEqualTo(false);

        assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1 min until charged");

        assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1 min left until full");

    }



    @Test
@@ -150,10 +150,9 @@ public class BatteryInfoTest { 
                mBatteryUsageStats, estimate, SystemClock.elapsedRealtime() * 1000,

                true /* shortString */);



        // We only add special mention for the long string

        assertThat(info.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);

        // Both long and short strings should not have extra text

        assertThat(info.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);

        assertThat(info.suggestionLabel).contains(BATTERY_RUN_OUT_PREFIX);

        // shortened string should not have extra text

        assertThat(info2.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);

        assertThat(info2.suggestionLabel).contains(BATTERY_RUN_OUT_PREFIX);

    }

tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class HighUsageTipTest { 


        final HighUsageTip parcelTip = new HighUsageTip(parcel);



        assertThat(parcelTip.getTitle(mContext)).isEqualTo("Phone used more than usual");

        assertThat(parcelTip.getTitle(mContext)).isEqualTo("Higher battery usage");

        assertThat(parcelTip.getType()).isEqualTo(BatteryTip.TipType.HIGH_DEVICE_USAGE);

        assertThat(parcelTip.getState()).isEqualTo(BatteryTip.StateType.NEW);

        assertThat(parcelTip.getLastFullChargeTimeMs()).isEqualTo(LAST_FULL_CHARGE_TIME);