Merge changes Ib80d68d6,I0d57d5b2 into qt-dev

* changes:
  Init PowerWhitelistbackend to stop crash
  Create gitignore for Settings
This commit is contained in:
Lei Yu
2019-04-05 17:11:34 +00:00
committed by Android (Google) Code Review
4 changed files with 29 additions and 4 deletions

View File

@@ -16,8 +16,11 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -27,6 +30,7 @@ import android.content.Context;
import android.content.DialogInterface;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
@@ -46,6 +50,7 @@ public class HighPowerDetailTest {
private FakeFeatureFactory mFeatureFactory;
private HighPowerDetail mFragment;
private Context mContext;
@Mock
private PowerWhitelistBackend mPowerWhitelistBackend;
@Mock
@@ -56,6 +61,7 @@ public class HighPowerDetailTest {
mFeatureFactory = FakeFeatureFactory.setupForTest();
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mFragment = spy(new HighPowerDetail());
mFragment.mBackend = mPowerWhitelistBackend;
mFragment.mBatteryUtils = mBatteryUtils;
@@ -84,4 +90,12 @@ public class HighPowerDetailTest {
verify(mBatteryUtils).setForceAppStandby(TEST_UID, TEST_PACKAGE,
AppOpsManager.MODE_ALLOWED);
}
@Test
public void getSummary_defaultActivePackage_returnUnavailable() {
doReturn(true).when(mPowerWhitelistBackend).isDefaultActiveApp(TEST_PACKAGE);
assertThat(HighPowerDetail.getSummary(mContext, mPowerWhitelistBackend, TEST_PACKAGE))
.isEqualTo(mContext.getString(R.string.high_power_system));
}
}