Merge "Fix battery robo test" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-04-19 23:13:51 +00:00
committed by Android (Google) Code Review
2 changed files with 1 additions and 4 deletions

View File

@@ -82,7 +82,7 @@ public class BatteryMeterView extends ImageView {
}
public int getBatteryLevel() {
return mDrawable.getLevel();
return mDrawable.getBatteryLevel();
}
public void setCharging(boolean charging) {

View File

@@ -50,7 +50,6 @@ import com.android.settingslib.widget.LayoutPreference;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -136,7 +135,6 @@ public class BatteryHeaderPreferenceControllerTest {
}
@Test
@Ignore("b/130896701")
public void displayPreference_displayBatteryLevel() {
mController.displayPreference(mPreferenceScreen);
@@ -190,7 +188,6 @@ public class BatteryHeaderPreferenceControllerTest {
}
@Test
@Ignore("b/130896701")
public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
mSummary.setText(BATTERY_STATUS);
mSummary2.setText(BATTERY_STATUS);