Merge "Fix failure BatteryInfoTest after string is update"
This commit is contained in:
@@ -44,7 +44,6 @@ import com.android.settingslib.R;
|
|||||||
import com.android.settingslib.fuelgauge.Estimate;
|
import com.android.settingslib.fuelgauge.Estimate;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.Answers;
|
import org.mockito.Answers;
|
||||||
@@ -248,7 +247,6 @@ public class BatteryInfoTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void testGetBatteryInfo_chargingWithOverheated_updateChargeLabel() {
|
public void testGetBatteryInfo_chargingWithOverheated_updateChargeLabel() {
|
||||||
doReturn(TEST_CHARGE_TIME_REMAINING)
|
doReturn(TEST_CHARGE_TIME_REMAINING)
|
||||||
.when(mBatteryStats)
|
.when(mBatteryStats)
|
||||||
@@ -261,7 +259,7 @@ public class BatteryInfoTest {
|
|||||||
false /* shortString */);
|
false /* shortString */);
|
||||||
|
|
||||||
assertThat(info.isOverheated).isTrue();
|
assertThat(info.isOverheated).isTrue();
|
||||||
assertThat(info.chargeLabel).isEqualTo("50% - Battery limited temporarily");
|
assertThat(info.chargeLabel).isEqualTo("50% - Optimizing for battery health");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make our battery stats return a sequence of battery events.
|
// Make our battery stats return a sequence of battery events.
|
||||||
|
Reference in New Issue
Block a user