Migrate more settings to SubSettingsLauncher
Bug: 73250851 Test: robotests Change-Id: I4100bef20e2ed477e4e31c9b7816f1b03f3f2809
This commit is contained in:
@@ -22,13 +22,12 @@ import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.core.InstrumentedPreferenceFragment;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.widget.MasterSwitchPreference;
|
||||
@@ -57,9 +56,7 @@ public class BluetoothMasterSwitchPreferenceControllerTest {
|
||||
@Mock
|
||||
private RestrictionUtils mRestrictionUtils;
|
||||
@Mock
|
||||
private Fragment mFragment;
|
||||
@Mock
|
||||
private SettingsActivity mActivity;
|
||||
private InstrumentedPreferenceFragment mFragment;
|
||||
|
||||
private Context mContext;
|
||||
private BluetoothMasterSwitchPreferenceController mController;
|
||||
@@ -72,7 +69,7 @@ public class BluetoothMasterSwitchPreferenceControllerTest {
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
|
||||
mController = new BluetoothMasterSwitchPreferenceController(
|
||||
mContext, mBluetoothManager, mRestrictionUtils, mFragment, mActivity);
|
||||
mContext, mBluetoothManager, mRestrictionUtils, mFragment);
|
||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||
when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
|
||||
}
|
||||
|
@@ -17,27 +17,20 @@
|
||||
package com.android.settings.bluetooth;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.FragmentManager;
|
||||
import android.app.FragmentTransaction;
|
||||
import android.content.Context;
|
||||
import android.support.v14.preference.PreferenceFragment;
|
||||
import android.content.Intent;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -52,21 +45,11 @@ import org.robolectric.annotation.Config;
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class BluetoothPairingPreferenceControllerTest {
|
||||
private static final int ORDER = 1;
|
||||
private Context mContext;
|
||||
|
||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||
private PreferenceFragment mFragment;
|
||||
@Mock
|
||||
private Lifecycle mLifecycle;
|
||||
@Mock
|
||||
private LocalBluetoothAdapter mLocalAdapter;
|
||||
@Mock
|
||||
private FragmentManager mFragmentManager;
|
||||
@Mock
|
||||
private FragmentTransaction mFragmentTransaction;
|
||||
@Mock
|
||||
private PreferenceScreen mPreferenceScreen;
|
||||
@Mock
|
||||
private SettingsActivity mSettingsActivity;
|
||||
private DashboardFragment mFragment;
|
||||
|
||||
private Context mContext;
|
||||
private Preference mPreference;
|
||||
|
||||
private BluetoothPairingPreferenceController mController;
|
||||
@@ -75,14 +58,13 @@ public class BluetoothPairingPreferenceControllerTest {
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
when(mFragment.getPreferenceScreen().getContext()).thenReturn(mContext);
|
||||
|
||||
mPreference = new Preference(mContext);
|
||||
mPreference.setKey(BluetoothPairingPreferenceController.KEY_PAIRING);
|
||||
|
||||
mController = new BluetoothPairingPreferenceController(mContext, mFragment,
|
||||
mSettingsActivity);
|
||||
mController = new BluetoothPairingPreferenceController(mContext, mFragment);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -98,9 +80,10 @@ public class BluetoothPairingPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void testHandlePreferenceTreeClick_startFragment() {
|
||||
doNothing().when(mContext).startActivity(any(Intent.class));
|
||||
|
||||
mController.handlePreferenceTreeClick(mPreference);
|
||||
|
||||
verify(mSettingsActivity).startPreferencePanelAsUser(eq(mFragment), anyString(), any(),
|
||||
anyInt(), any());
|
||||
verify(mContext).startActivity(any(Intent.class));
|
||||
}
|
||||
}
|
||||
|
@@ -16,6 +16,7 @@
|
||||
|
||||
package com.android.settings.fuelgauge;
|
||||
|
||||
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.nullable;
|
||||
import static org.mockito.Matchers.any;
|
||||
@@ -30,9 +31,9 @@ import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AppOpsManager;
|
||||
import android.app.Fragment;
|
||||
import android.app.LoaderManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.drawable.Drawable;
|
||||
@@ -196,21 +197,22 @@ public class AdvancedPowerUsageDetailTest {
|
||||
|
||||
mTestActivity = spy(new SettingsActivity());
|
||||
doReturn(mPackageManager).when(mTestActivity).getPackageManager();
|
||||
doReturn(mPackageManager).when(mActivity).getPackageManager();
|
||||
doReturn(mAppOpsManager).when(mTestActivity).getSystemService(Context.APP_OPS_SERVICE);
|
||||
|
||||
mBatteryUtils = spy(new BatteryUtils(mContext));
|
||||
doReturn(FOREGROUND_SERVICE_TIME_US).when(mBatteryUtils).getForegroundServiceTotalTimeUs(
|
||||
any(BatteryStats.Uid.class), anyLong());
|
||||
|
||||
final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
|
||||
final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
|
||||
|
||||
Answer<Void> callable = invocation -> {
|
||||
mBundle = captor.getValue();
|
||||
mBundle = captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
|
||||
return null;
|
||||
};
|
||||
doAnswer(callable).when(mTestActivity).startPreferencePanelAsUser(
|
||||
nullable(Fragment.class), nullable(String.class), captor.capture(), anyInt(),
|
||||
doAnswer(callable).when(mActivity).startActivityAsUser(captor.capture(),
|
||||
nullable(UserHandle.class));
|
||||
doAnswer(callable).when(mActivity).startActivity(captor.capture());
|
||||
|
||||
mForegroundPreference = new Preference(mContext);
|
||||
mBackgroundPreference = new Preference(mContext);
|
||||
@@ -276,7 +278,7 @@ public class AdvancedPowerUsageDetailTest {
|
||||
|
||||
@Test
|
||||
public void testStartBatteryDetailPage_hasBasicData() {
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
|
||||
mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, mAnomalies);
|
||||
|
||||
assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
|
||||
@@ -295,7 +297,7 @@ public class AdvancedPowerUsageDetailTest {
|
||||
mBatterySipper.drainType = BatterySipper.DrainType.PHONE;
|
||||
mBatterySipper.usageTimeMs = PHONE_FOREGROUND_TIME_MS;
|
||||
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
|
||||
mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
|
||||
|
||||
assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
|
||||
@@ -313,7 +315,7 @@ public class AdvancedPowerUsageDetailTest {
|
||||
public void testStartBatteryDetailPage_NormalApp() {
|
||||
mBatterySipper.mPackages = PACKAGE_NAME;
|
||||
mBatteryEntry.defaultPackageName = PACKAGE_NAME[0];
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
|
||||
mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, mAnomalies);
|
||||
|
||||
assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
|
||||
@@ -325,7 +327,7 @@ public class AdvancedPowerUsageDetailTest {
|
||||
@Test
|
||||
public void testStartBatteryDetailPage_SystemApp() {
|
||||
mBatterySipper.mPackages = null;
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
|
||||
mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
|
||||
|
||||
assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_LABEL)).isEqualTo(APP_LABEL);
|
||||
@@ -340,12 +342,11 @@ public class AdvancedPowerUsageDetailTest {
|
||||
final int appUid = 1010019;
|
||||
mBatterySipper.mPackages = PACKAGE_NAME;
|
||||
doReturn(appUid).when(mBatterySipper).getUid();
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
|
||||
mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
|
||||
|
||||
verify(mTestActivity).startPreferencePanelAsUser(
|
||||
nullable(Fragment.class), nullable(String.class), nullable(Bundle.class), anyInt(),
|
||||
eq(new UserHandle(10)));
|
||||
|
||||
verify(mActivity).startActivityAsUser(any(Intent.class), eq(new UserHandle(10)));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -355,32 +356,27 @@ public class AdvancedPowerUsageDetailTest {
|
||||
|
||||
final int currentUser = 20;
|
||||
ShadowActivityManager.setCurrentUser(currentUser);
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
|
||||
mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
|
||||
|
||||
|
||||
verify(mTestActivity).startPreferencePanelAsUser(
|
||||
nullable(Fragment.class), nullable(String.class), nullable(Bundle.class), anyInt(),
|
||||
eq(new UserHandle(currentUser)));
|
||||
verify(mActivity).startActivityAsUser(any(Intent.class), eq(new UserHandle(currentUser)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testStartBatteryDetailPage_noBatteryUsage_hasBasicData() {
|
||||
final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
|
||||
Answer<Void> callable = invocation -> {
|
||||
mBundle = captor.getValue();
|
||||
return null;
|
||||
};
|
||||
doAnswer(callable).when(mTestActivity).startPreferencePanelAsUser(nullable(Fragment.class),
|
||||
nullable(String.class), captor.capture(), anyInt(),
|
||||
nullable(UserHandle.class));
|
||||
final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
|
||||
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, PACKAGE_NAME[0]);
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, PACKAGE_NAME[0]);
|
||||
|
||||
assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
|
||||
PACKAGE_NAME[0]);
|
||||
assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
|
||||
"0%");
|
||||
verify(mActivity).startActivity(captor.capture());
|
||||
|
||||
assertThat(captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS)
|
||||
.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME))
|
||||
.isEqualTo(PACKAGE_NAME[0]);
|
||||
|
||||
assertThat(captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS)
|
||||
.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT))
|
||||
.isEqualTo("0%");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -388,7 +384,7 @@ public class AdvancedPowerUsageDetailTest {
|
||||
PackageManager.NameNotFoundException {
|
||||
doReturn(UID).when(mPackageManager).getPackageUid(PACKAGE_NAME[0], 0 /* no flag */);
|
||||
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, PACKAGE_NAME[0]);
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment, PACKAGE_NAME[0]);
|
||||
|
||||
assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
|
||||
}
|
||||
@@ -398,7 +394,7 @@ public class AdvancedPowerUsageDetailTest {
|
||||
mBatteryEntry.defaultPackageName = null;
|
||||
mBatteryEntry.sipper.mPackages = PACKAGE_NAME;
|
||||
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
|
||||
AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
|
||||
mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
|
||||
|
||||
assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
|
||||
|
@@ -17,13 +17,11 @@
|
||||
package com.android.settings.fuelgauge;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v14.preference.PreferenceFragment;
|
||||
import android.support.v7.preference.PreferenceGroup;
|
||||
import android.text.TextUtils;
|
||||
import android.text.format.DateUtils;
|
||||
@@ -36,6 +34,7 @@ import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.core.FeatureFlags;
|
||||
import com.android.settings.core.InstrumentedPreferenceFragment;
|
||||
import com.android.settings.fuelgauge.anomaly.Anomaly;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
|
||||
@@ -66,7 +65,7 @@ public class BatteryAppListPreferenceControllerTest {
|
||||
@Mock
|
||||
private PreferenceGroup mAppListGroup;
|
||||
@Mock
|
||||
private PreferenceFragment mFragment;
|
||||
private InstrumentedPreferenceFragment mFragment;
|
||||
@Mock
|
||||
private BatteryUtils mBatteryUtils;
|
||||
|
||||
|
@@ -16,20 +16,19 @@
|
||||
|
||||
package com.android.settings.fuelgauge;
|
||||
|
||||
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.doAnswer;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceCategory;
|
||||
import android.support.v7.preference.PreferenceGroup;
|
||||
@@ -79,12 +78,9 @@ public class PowerUsageAnomalyDetailsTest {
|
||||
private PackageManager mPackageManager;
|
||||
@Mock
|
||||
private IconDrawableFactory mIconDrawableFactory;
|
||||
@Mock
|
||||
private ApplicationInfo mApplicationInfo;
|
||||
private Context mContext;
|
||||
private PowerUsageAnomalyDetails mFragment;
|
||||
private PreferenceGroup mAbnormalListGroup;
|
||||
private Bundle mBundle;
|
||||
private List<Anomaly> mAnomalyList;
|
||||
|
||||
@Before
|
||||
@@ -176,21 +172,14 @@ public class PowerUsageAnomalyDetailsTest {
|
||||
|
||||
@Test
|
||||
public void testStartBatteryAbnormalPage_dataCorrect() {
|
||||
final ArgumentCaptor<Bundle> bundleCaptor = ArgumentCaptor.forClass(Bundle.class);
|
||||
Answer<Void> bundleCallable = new Answer<Void>() {
|
||||
@Override
|
||||
public Void answer(InvocationOnMock invocation) throws Exception {
|
||||
mBundle = bundleCaptor.getValue();
|
||||
return null;
|
||||
}
|
||||
};
|
||||
doAnswer(bundleCallable).when(mSettingsActivity).startPreferencePanelAsUser(any(),
|
||||
anyString(), bundleCaptor.capture(), anyInt(), any());
|
||||
final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
|
||||
|
||||
PowerUsageAnomalyDetails.startBatteryAbnormalPage(mSettingsActivity, mFragment,
|
||||
mAnomalyList);
|
||||
|
||||
assertThat(mBundle.getParcelableArrayList(
|
||||
PowerUsageAnomalyDetails.EXTRA_ANOMALY_LIST)).isEqualTo(mAnomalyList);
|
||||
verify(mSettingsActivity).startActivity(intent.capture());
|
||||
assertThat(intent.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS)
|
||||
.getParcelableArrayList(PowerUsageAnomalyDetails.EXTRA_ANOMALY_LIST))
|
||||
.isEqualTo(mAnomalyList);
|
||||
}
|
||||
}
|
||||
|
@@ -16,25 +16,28 @@
|
||||
|
||||
package com.android.settings.fuelgauge;
|
||||
|
||||
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
|
||||
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.AppOpsManager;
|
||||
import android.content.Context;
|
||||
import android.support.v14.preference.PreferenceFragment;
|
||||
import android.content.Intent;
|
||||
import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.core.InstrumentedPreferenceFragment;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
@@ -55,7 +58,7 @@ public class RestrictAppPreferenceControllerTest {
|
||||
@Mock
|
||||
private SettingsActivity mSettingsActivity;
|
||||
@Mock
|
||||
private PreferenceFragment mFragment;
|
||||
private InstrumentedPreferenceFragment mFragment;
|
||||
private List<AppOpsManager.PackageOps> mPackageOpsList;
|
||||
private RestrictAppPreferenceController mRestrictAppPreferenceController;
|
||||
private Preference mPreference;
|
||||
@@ -107,11 +110,15 @@ public class RestrictAppPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void testHandlePreferenceTreeClick_startFragment() {
|
||||
final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
|
||||
|
||||
mRestrictAppPreferenceController.handlePreferenceTreeClick(mPreference);
|
||||
|
||||
verify(mSettingsActivity).startPreferencePanelAsUser(eq(mFragment),
|
||||
eq(RestrictedAppDetails.class.getName()), any(), eq(R.string.restricted_app_title),
|
||||
any());
|
||||
verify(mSettingsActivity).startActivity(intent.capture());
|
||||
assertThat(intent.getValue().getStringExtra(EXTRA_SHOW_FRAGMENT))
|
||||
.isEqualTo(RestrictedAppDetails.class.getName());
|
||||
assertThat(intent.getValue().getIntExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1))
|
||||
.isEqualTo(R.string.restricted_app_title);
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -17,24 +17,21 @@
|
||||
package com.android.settings.fuelgauge.anomaly;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.robolectric.Shadows.shadowOf;
|
||||
|
||||
import android.app.FragmentManager;
|
||||
import android.app.FragmentTransaction;
|
||||
import android.content.Context;
|
||||
import android.support.v14.preference.PreferenceFragment;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.core.InstrumentedPreferenceFragment;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -57,7 +54,7 @@ public class AnomalySummaryPreferenceControllerTest {
|
||||
private static final int UID = 111;
|
||||
|
||||
@Mock
|
||||
private PreferenceFragment mFragment;
|
||||
private InstrumentedPreferenceFragment mFragment;
|
||||
@Mock
|
||||
private FragmentManager mFragmentManager;
|
||||
@Mock
|
||||
@@ -89,7 +86,7 @@ public class AnomalySummaryPreferenceControllerTest {
|
||||
mAnomalyList = new ArrayList<>();
|
||||
|
||||
mAnomalySummaryPreferenceController = new AnomalySummaryPreferenceController(
|
||||
mSettingsActivity, mFragment, 0 /* metricskey */);
|
||||
mSettingsActivity, mFragment);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -15,8 +15,9 @@
|
||||
*/
|
||||
package com.android.settings.location;
|
||||
|
||||
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.argThat;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
@@ -27,7 +28,7 @@ import static org.mockito.Mockito.when;
|
||||
|
||||
import android.arch.lifecycle.LifecycleOwner;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.content.Intent;
|
||||
import android.provider.Settings;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceCategory;
|
||||
@@ -35,7 +36,6 @@ import android.support.v7.preference.PreferenceScreen;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
@@ -47,6 +47,7 @@ import com.android.settingslib.location.RecentLocationApps.Request;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.ArgumentMatcher;
|
||||
import org.mockito.InOrder;
|
||||
import org.mockito.Mock;
|
||||
@@ -163,8 +164,9 @@ public class RecentLocationRequestPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void onPreferenceClick_shouldLaunchAppDetails() {
|
||||
final SettingsActivity activity = mock(SettingsActivity.class);
|
||||
when(mFragment.getActivity()).thenReturn(activity);
|
||||
final Context context= mock(Context.class);
|
||||
when(mFragment.getContext()).thenReturn(context);
|
||||
|
||||
final List<RecentLocationApps.Request> requests = new ArrayList<>();
|
||||
final Request request = mock(Request.class);
|
||||
requests.add(request);
|
||||
@@ -174,11 +176,14 @@ public class RecentLocationRequestPreferenceControllerTest {
|
||||
mController.displayPreference(mScreen);
|
||||
mController.updateState(mCategory);
|
||||
|
||||
final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
|
||||
|
||||
preference.performClick();
|
||||
|
||||
verify(activity).startPreferencePanelAsUser(any(),
|
||||
eq(AppInfoDashboardFragment.class.getName()),
|
||||
any(Bundle.class), anyInt(), any());
|
||||
verify(context).startActivity(intent.capture());
|
||||
|
||||
assertThat(intent.getValue().getStringExtra(EXTRA_SHOW_FRAGMENT))
|
||||
.isEqualTo(AppInfoDashboardFragment.class.getName());
|
||||
}
|
||||
|
||||
private static ArgumentMatcher<Preference> titleMatches(String expected) {
|
||||
|
Reference in New Issue
Block a user