commit c0f50f59b3ab81222c5488368d4ca04c5241593c
author YUKAI HUNG <ykhung@google.com> Fri Dec 11 02:42:42 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 11 02:42:42 2020 +0000
tree 1a2ba887e78c82410947677eea772c50edb3493c
parent cda9876fe8b5fddc254995608a768d60f5b1cf9f
parent 351ffbeac97fe9266ecdcc79e264cf79a3b13861

Merge "Fix failure BatteryInfoTest after string is update"

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

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 5e371e6..4c19477 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -44,7 +44,6 @@
 import com.android.settingslib.fuelgauge.Estimate;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -248,7 +247,6 @@
     }
 
     @Test
-    @Ignore
     public void testGetBatteryInfo_chargingWithOverheated_updateChargeLabel() {
         doReturn(TEST_CHARGE_TIME_REMAINING)
                 .when(mBatteryStats)
@@ -261,7 +259,7 @@
                 false /* shortString */);
 
         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.