Merge "resolve merge conflicts of 758b2d4ae6 to master"

This commit is contained in:
TreeHugger Robot
2017-06-27 18:39:31 +00:00
committed by Android (Google) Code Review
2 changed files with 32 additions and 25 deletions

View File

@@ -32,6 +32,8 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.List;
import android.app.LoaderManager;
import android.content.ContentResolver;
import android.content.Context;
@@ -514,6 +516,27 @@ public class PowerUsageSummaryTest {
assertThat(preference.showAnomalyIcon()).isTrue();
}
@Test
public void testShouldHideSipper_typeOvercounted_returnTrue() {
mNormalBatterySipper.drainType = BatterySipper.DrainType.OVERCOUNTED;
assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
}
@Test
public void testShouldHideSipper_typeUnaccounted_returnTrue() {
mNormalBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED;
assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
}
@Test
public void testShouldHideSipper_typeNormal_returnFalse() {
mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isFalse();
}
public static class TestFragment extends PowerUsageSummary {
private Context mContext;