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

Commit 649ec4ba authored by Mill Chen's avatar Mill Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix BatteryInfo test case failures"

parents 77226593 0ac194de
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,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 fully charged";
    private static final String STATUS_CHARGING_TIME = "50% - 0 min until charged";
    private static final String STATUS_NOT_CHARGING = "Not charging";
    private static final long REMAINING_TIME_NULL = -1;
    private static final long REMAINING_TIME = 2;
@@ -71,7 +71,7 @@ public class BatteryInfoTest {
    private static final String EXTEND_PREFIX = "Extend battery life past";
    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 fully charged";
            "1 min left until charged";
    private static final String TEST_BATTERY_LEVEL_10 = "10%";
    private static final String FIFTEEN_MIN_FORMATTED = "15 min";
    private static final Estimate DUMMY_ESTIMATE = new Estimate(
@@ -134,7 +134,7 @@ public class BatteryInfoTest {
                mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);

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

    @Test