Use external/robolectric-shadows/run_robotests.mk
This allows Settings to test against the latest framework changes.
Also replaced TestConfig with traditional robolectric.properties.
Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2c91942..4e81b7a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4747,6 +4747,10 @@
<string name="power_usage_list_summary">App usage since full charge (<xliff:g id="relative_time">^1</xliff:g>)</string>
<!-- Label for device components using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
<string name="power_usage_list_summary_device">Device usage since full charge (<xliff:g id="relative_time">^1</xliff:g>)</string>
+ <!-- Temp string used to debug new battery estimates [DO NOT TRANSLATE] -->
+ <string name="power_usage_enhanced_debug" translatable="false"><xliff:g id="time">%1$s</xliff:g> left (New ML est)</string>
+ <!-- Temp string used to debug old battery estimates [DO NOT TRANSLATE] -->
+ <string name="power_usage_old_debug" translatable="false"><xliff:g id="time">%1$s</xliff:g> left (Old est)</string>
<!-- Description for the screen usage item [CHAR_LIMIT=120] -->
<string name="screen_usage_summary">Amount of time screen has been on since full charge</string>
<!-- Label for list of different types using battery in power use UI [CHAR_LIMIT=60] -->
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 8d6700c..edded11 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -45,6 +45,7 @@
import com.android.settings.wrapper.RecoverySystemWrapper;
import com.android.settings.core.InstrumentedFragment;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.utils.ThreadUtils;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -158,7 +159,7 @@
void esimFactoryReset(Context context, String packageName) {
if (mEraseEsim) {
mEraseEsimTask = new EraseEsimAsyncTask(context, packageName);
- mEraseEsimTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ mEraseEsimTask.execute();
} else {
Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
.show();
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 268cb44..d9562c0 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -269,7 +269,7 @@
for (int i = 0, size = mProfiles.size(); i < size; i++) {
mProfiles.valueAt(i).pendingRemoval = true;
}
- if (mUm.isLinkedUser()) {
+ if (mUm.isRestrictedProfile()) {
// Restricted user or similar
UserInfo userInfo = mUm.getUserInfo(UserHandle.myUserId());
updateProfileUi(userInfo);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index d3a48a2..bf0b627 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -25,7 +25,6 @@
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.support.annotation.VisibleForTesting;
-import android.support.v7.preference.PreferenceGroup;
import android.text.format.Formatter;
import android.util.SparseArray;
import android.view.Menu;
@@ -56,7 +55,7 @@
import com.android.settingslib.utils.StringUtil;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
@@ -101,8 +100,6 @@
@VisibleForTesting
SparseArray<List<Anomaly>> mAnomalySparseArray;
@VisibleForTesting
- PreferenceGroup mAppListGroup;
- @VisibleForTesting
BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
private BatteryAppListPreferenceController mBatteryAppListPreferenceController;
private BatteryTipPreferenceController mBatteryTipPreferenceController;
@@ -138,30 +135,7 @@
@Override
public void onLoadFinished(Loader<List<BatteryInfo>> loader,
List<BatteryInfo> batteryInfos) {
- final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref
- .findViewById(R.id.battery_header_icon);
- final TextView percentRemaining =
- mBatteryLayoutPref.findViewById(R.id.battery_percent);
- final TextView summary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
- final TextView summary2 = mBatteryLayoutPref.findViewById(R.id.summary2);
- BatteryInfo oldInfo = batteryInfos.get(0);
- BatteryInfo newInfo = batteryInfos.get(1);
- percentRemaining.setText(Utils.formatPercentage(oldInfo.batteryLevel));
-
- // set the text to the old estimate (copied from battery info). Note that this
- // can sometimes say 0 time remaining because battery stats requires the phone
- // be unplugged for a period of time before being willing ot make an estimate.
- summary1.setText(mPowerFeatureProvider.getOldEstimateDebugString(
- Formatter.formatShortElapsedTime(getContext(),
- PowerUtil.convertUsToMs(oldInfo.remainingTimeUs))));
-
- // for this one we can just set the string directly
- summary2.setText(mPowerFeatureProvider.getEnhancedEstimateDebugString(
- Formatter.formatShortElapsedTime(getContext(),
- PowerUtil.convertUsToMs(newInfo.remainingTimeUs))));
-
- batteryView.setBatteryLevel(oldInfo.batteryLevel);
- batteryView.setCharging(!oldInfo.discharging);
+ updateViews(batteryInfos);
}
@Override
@@ -169,6 +143,33 @@
}
};
+ protected void updateViews(List<BatteryInfo> batteryInfos) {
+ final BatteryMeterView batteryView = mBatteryLayoutPref
+ .findViewById(R.id.battery_header_icon);
+ final TextView percentRemaining =
+ mBatteryLayoutPref.findViewById(R.id.battery_percent);
+ final TextView summary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
+ final TextView summary2 = mBatteryLayoutPref.findViewById(R.id.summary2);
+ BatteryInfo oldInfo = batteryInfos.get(0);
+ BatteryInfo newInfo = batteryInfos.get(1);
+ percentRemaining.setText(Utils.formatPercentage(oldInfo.batteryLevel));
+
+ // set the text to the old estimate (copied from battery info). Note that this
+ // can sometimes say 0 time remaining because battery stats requires the phone
+ // be unplugged for a period of time before being willing ot make an estimate.
+ summary1.setText(mPowerFeatureProvider.getOldEstimateDebugString(
+ Formatter.formatShortElapsedTime(getContext(),
+ PowerUtil.convertUsToMs(oldInfo.remainingTimeUs))));
+
+ // for this one we can just set the string directly
+ summary2.setText(mPowerFeatureProvider.getEnhancedEstimateDebugString(
+ Formatter.formatShortElapsedTime(getContext(),
+ PowerUtil.convertUsToMs(newInfo.remainingTimeUs))));
+
+ batteryView.setBatteryLevel(oldInfo.batteryLevel);
+ batteryView.setCharging(!oldInfo.discharging);
+ }
+
private LoaderManager.LoaderCallbacks<List<BatteryTip>> mBatteryTipsCallbacks =
new LoaderManager.LoaderCallbacks<List<BatteryTip>>() {
@@ -343,8 +344,7 @@
@VisibleForTesting
void updateAnomalySparseArray(List<Anomaly> anomalies) {
mAnomalySparseArray.clear();
- for (int i = 0, size = anomalies.size(); i < size; i++) {
- final Anomaly anomaly = anomalies.get(i);
+ for (final Anomaly anomaly : anomalies) {
if (mAnomalySparseArray.get(anomaly.uid) == null) {
mAnomalySparseArray.append(anomaly.uid, new ArrayList<>());
}
@@ -423,7 +423,7 @@
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.power_usage_summary;
- return Arrays.asList(sir);
+ return Collections.singletonList(sir);
}
@Override
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java b/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java
index ab7863c..79425cb 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge;
import android.app.Activity;
+import android.app.LoaderManager;
import android.app.LoaderManager.LoaderCallbacks;
import android.content.Context;
import android.content.Loader;
@@ -188,46 +189,50 @@
}
};
- LoaderCallbacks<List<BatteryInfo>> mBatteryInfoDebugLoaderCallbacks =
- new LoaderCallbacks<List<BatteryInfo>>() {
- @Override
- public Loader<List<BatteryInfo>> onCreateLoader(int i, Bundle bundle) {
- return new DebugEstimatesLoader(getContext(), mStatsHelper);
- }
+ LoaderManager.LoaderCallbacks<List<BatteryInfo>> mBatteryInfoDebugLoaderCallbacks =
+ new LoaderCallbacks<List<BatteryInfo>>() {
+ @Override
+ public Loader<List<BatteryInfo>> onCreateLoader(int i, Bundle bundle) {
+ return new DebugEstimatesLoader(getContext(), mStatsHelper);
+ }
- @Override
- public void onLoadFinished(Loader<List<BatteryInfo>> loader,
- List<BatteryInfo> batteryInfos) {
- final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref
- .findViewById(R.id.battery_header_icon);
- final TextView percentRemaining =
- mBatteryLayoutPref.findViewById(R.id.battery_percent);
- final TextView summary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
- final TextView summary2 = mBatteryLayoutPref.findViewById(R.id.summary2);
- BatteryInfo oldInfo = batteryInfos.get(0);
- BatteryInfo newInfo = batteryInfos.get(1);
- percentRemaining.setText(Utils.formatPercentage(oldInfo.batteryLevel));
+ @Override
+ public void onLoadFinished(Loader<List<BatteryInfo>> loader,
+ List<BatteryInfo> batteryInfos) {
+ updateViews(batteryInfos);
+ }
- // set the text to the old estimate (copied from battery info). Note that this
- // can sometimes say 0 time remaining because battery stats requires the phone
- // be unplugged for a period of time before being willing ot make an estimate.
- summary1.setText(mPowerFeatureProvider.getOldEstimateDebugString(
- Formatter.formatShortElapsedTime(getContext(),
- PowerUtil.convertUsToMs(oldInfo.remainingTimeUs))));
+ @Override
+ public void onLoaderReset(Loader<List<BatteryInfo>> loader) {
+ }
+ };
- // for this one we can just set the string directly
- summary2.setText(mPowerFeatureProvider.getEnhancedEstimateDebugString(
- Formatter.formatShortElapsedTime(getContext(),
- PowerUtil.convertUsToMs(newInfo.remainingTimeUs))));
+ protected void updateViews(List<BatteryInfo> batteryInfos) {
+ final BatteryMeterView batteryView = mBatteryLayoutPref
+ .findViewById(R.id.battery_header_icon);
+ final TextView percentRemaining =
+ mBatteryLayoutPref.findViewById(R.id.battery_percent);
+ final TextView summary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
+ final TextView summary2 = mBatteryLayoutPref.findViewById(R.id.summary2);
+ BatteryInfo oldInfo = batteryInfos.get(0);
+ BatteryInfo newInfo = batteryInfos.get(1);
+ percentRemaining.setText(Utils.formatPercentage(oldInfo.batteryLevel));
- batteryView.setBatteryLevel(oldInfo.batteryLevel);
- batteryView.setCharging(!oldInfo.discharging);
- }
+ // set the text to the old estimate (copied from battery info). Note that this
+ // can sometimes say 0 time remaining because battery stats requires the phone
+ // be unplugged for a period of time before being willing ot make an estimate.
+ summary1.setText(mPowerFeatureProvider.getOldEstimateDebugString(
+ Formatter.formatShortElapsedTime(getContext(),
+ PowerUtil.convertUsToMs(oldInfo.remainingTimeUs))));
- @Override
- public void onLoaderReset(Loader<List<BatteryInfo>> loader) {
- }
- };
+ // for this one we can just set the string directly
+ summary2.setText(mPowerFeatureProvider.getEnhancedEstimateDebugString(
+ Formatter.formatShortElapsedTime(getContext(),
+ PowerUtil.convertUsToMs(newInfo.remainingTimeUs))));
+
+ batteryView.setBatteryLevel(oldInfo.batteryLevel);
+ batteryView.setCharging(!oldInfo.discharging);
+ }
@Override
public void onCreate(Bundle icicle) {
diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java
index 5d9ec43..920e350 100644
--- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java
+++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java
@@ -82,7 +82,7 @@
@Override
public boolean isAvailable() {
return !mUserManager.isManagedProfile()
- && (mUserManager.isLinkedUser()
+ && (mUserManager.isRestrictedProfile()
|| mUserManager.getProfiles(UserHandle.myUserId()).size() == 1);
}
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index e73c323..102e8da 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -1,40 +1,40 @@
#############################################
-# Settings Robolectric test target. #
+# Settings Robolectric test target. #
#############################################
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_MODULE := SettingsRoboTests
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-# Include the testing libraries (JUnit4 + Robolectric libs).
-LOCAL_STATIC_JAVA_LIBRARIES := \
- mockito-robolectric-prebuilt \
- platform-robolectric-android-all-stubs \
- truth-prebuilt
+LOCAL_JAVA_RESOURCE_DIRS := config
LOCAL_JAVA_LIBRARIES := \
- junit \
- platform-robolectric-3.6.1-prebuilt \
- telephony-common
+ robolectric_android-all-stub \
+ Robolectric_all-target \
+ mockito-robolectric-prebuilt \
+ truth-prebuilt
LOCAL_INSTRUMENTATION_FOR := Settings
-LOCAL_MODULE := SettingsRoboTests
LOCAL_MODULE_TAGS := optional
include $(BUILD_STATIC_JAVA_LIBRARY)
#############################################################
-# Settings runner target to run the previous target. #
+# Settings runner target to run the previous target. #
#############################################################
include $(CLEAR_VARS)
LOCAL_MODULE := RunSettingsRoboTests
-LOCAL_SDK_VERSION := current
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- SettingsRoboTests
+LOCAL_JAVA_LIBRARIES := \
+ SettingsRoboTests \
+ robolectric_android-all-stub \
+ Robolectric_all-target \
+ mockito-robolectric-prebuilt \
+ truth-prebuilt
LOCAL_TEST_PACKAGE := Settings
@@ -42,4 +42,4 @@
LOCAL_ROBOTEST_TIMEOUT := 36000
-include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
+include external/robolectric-shadows/run_robotests.mk
\ No newline at end of file
diff --git a/tests/robotests/config/robolectric.properties b/tests/robotests/config/robolectric.properties
new file mode 100644
index 0000000..d213eec
--- /dev/null
+++ b/tests/robotests/config/robolectric.properties
@@ -0,0 +1,3 @@
+manifest=packages/apps/Settings/AndroidManifest.xml
+sdk=NEWEST_SDK
+shadows=com.android.settings.testutils.shadow.ShadowThreadUtils
\ No newline at end of file
diff --git a/tests/robotests/src/android/content/om/OverlayInfo.java b/tests/robotests/src/android/content/om/OverlayInfo.java
deleted file mode 100644
index d018763..0000000
--- a/tests/robotests/src/android/content/om/OverlayInfo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package android.content.om;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-
-public class OverlayInfo {
-
- public final String packageName;
-
- public final String category;
-
- public OverlayInfo(@NonNull String packageName, @NonNull String targetPackageName,
- @Nullable String category, @NonNull String baseCodePath, int state, int userId) {
- this.packageName = packageName;
- this.category = category;
- }
-
- public boolean isEnabled() {
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
deleted file mode 100644
index e080aa3..0000000
--- a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.internal.hardware;
-
-import android.content.Context;
-
-/**
- * Fake controller to make robolectric test compile. Should be removed when Robolectric supports
- * API 25.
- */
-public class AmbientDisplayConfiguration {
-
- private final Context mContext;
-
- public AmbientDisplayConfiguration(Context context) {
- mContext = context;
- }
-
- public boolean pulseOnPickupAvailable() {
- return false;
- }
-
- public boolean pulseOnPickupEnabled(int user) {
- return true;
- }
-
- public boolean pulseOnPickupCanBeModified(int user) {
- return true;
- }
-
- public boolean pulseOnDoubleTapAvailable() {
- return true;
- }
-
- public boolean pulseOnDoubleTapEnabled(int user) {
- return true;
- }
-
- public boolean pulseOnNotificationEnabled(int user) {
- return true;
- }
-
- public boolean pulseOnNotificationAvailable() {
- return true;
- }
-
- public boolean alwaysOnEnabled(int user) {
- return true;
- }
-
- public boolean alwaysOnAvailable() {
- return true;
- }
-
- public boolean alwaysOnAvailableForUser(int user) {
- return true;
- }
-
- public boolean available() {
- return true;
- }
-
- public boolean enabled(int user) {
- return true;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
index 30d8151..1a4ce89 100644
--- a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
@@ -31,10 +31,8 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DeviceAdminAddTest {
private FakeFeatureFactory mFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
index 6274373..ba9a33e 100644
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
@@ -2,8 +2,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -20,7 +18,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DisplaySettingsTest {
@Test
diff --git a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
index a6bcf03..23639ff 100644
--- a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
+++ b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
@@ -16,6 +16,8 @@
package com.android.settings;
+import static com.google.common.truth.Truth.assertThat;
+import static org.robolectric.Shadows.shadowOf;
import android.content.Intent;
@@ -30,14 +32,8 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowActivity;
-import static com.google.common.truth.Truth.assertThat;
-import static org.robolectric.Shadows.shadowOf;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowHelpUtils.class
- })
+@Config(shadows = ShadowHelpUtils.class)
public class HelpTrampolineTest {
@After
diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
index db9afc4..72c6fa1 100644
--- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
@@ -16,7 +16,6 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import android.content.Context;
@@ -34,7 +33,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LegalSettingsTest {
private Context mContext;
@@ -61,11 +59,10 @@
@Test
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = RuntimeEnvironment.application;
- final List<String> niks = LegalSettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(context);
+ final List<String> niks =
+ LegalSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(context);
- final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context,
- R.xml.about_legal);
+ final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.about_legal);
assertThat(keys).containsAllIn(niks);
}
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
index 7d76444..dc956aa 100644
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ b/tests/robotests/src/com/android/settings/MasterClearTest.java
@@ -17,12 +17,11 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -49,7 +48,6 @@
import android.widget.LinearLayout;
import android.widget.ScrollView;
-import com.android.settings.SettingsActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -64,12 +62,9 @@
import org.robolectric.shadows.ShadowActivity;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowUtils.class}
-)
+@Config(shadows = ShadowUtils.class)
public class MasterClearTest {
+
private static final String TEST_ACCOUNT_TYPE = "android.test.account.type";
private static final String TEST_CONFIRMATION_PACKAGE = "android.test.conf.pkg";
private static final String TEST_CONFIRMATION_CLASS = "android.test.conf.pkg.ConfActivity";
@@ -147,33 +142,27 @@
@Test
public void testShowWipeEuicc_euiccDisabled() {
- prepareEuiccState(
- false /* isEuiccEnabled */, true /* isEuiccProvisioned */);
+ prepareEuiccState(false /* isEuiccEnabled */, true /* isEuiccProvisioned */);
assertThat(mMasterClear.showWipeEuicc()).isFalse();
}
@Test
public void testShowWipeEuicc_euiccEnabled_unprovisioned() {
- prepareEuiccState(
- true /* isEuiccEnabled */, false /* isEuiccProvisioned */);
+ prepareEuiccState(true /* isEuiccEnabled */, false /* isEuiccProvisioned */);
assertThat(mMasterClear.showWipeEuicc()).isFalse();
}
@Test
public void testShowWipeEuicc_euiccEnabled_provisioned() {
- prepareEuiccState(
- true /* isEuiccEnabled */, true /* isEuiccProvisioned */);
+ prepareEuiccState(true /* isEuiccEnabled */, true /* isEuiccProvisioned */);
assertThat(mMasterClear.showWipeEuicc()).isTrue();
}
- private void prepareEuiccState(
- boolean isEuiccEnabled,
- boolean isEuiccProvisioned) {
+ private void prepareEuiccState(boolean isEuiccEnabled, boolean isEuiccProvisioned) {
doReturn(mActivity).when(mMasterClear).getContext();
doReturn(isEuiccEnabled).when(mMasterClear).isEuiccEnabled(any());
ContentResolver cr = mActivity.getContentResolver();
- Settings.Global.putInt(
- cr, android.provider.Settings.Global.EUICC_PROVISIONED, isEuiccProvisioned ? 1 : 0);
+ Settings.Global.putInt(cr, Settings.Global.EUICC_PROVISIONED, isEuiccProvisioned ? 1 : 0);
}
@Test
@@ -201,14 +190,15 @@
public void testInitiateMasterClear_inDemoMode_sendsIntent() {
ShadowUtils.setIsDemoUser(true);
- final ComponentName componentName = ComponentName.unflattenFromString(
- "com.android.retaildemo/.DeviceAdminReceiver");
+ final ComponentName componentName =
+ ComponentName.unflattenFromString("com.android.retaildemo/.DeviceAdminReceiver");
ShadowUtils.setDeviceOwnerComponent(componentName);
- mMasterClear.mInitiateListener.onClick(
- mContentView.findViewById(R.id.initiate_master_clear));
+ mMasterClear.mInitiateListener
+ .onClick(mContentView.findViewById(R.id.initiate_master_clear));
final Intent intent = mShadowActivity.getNextStartedActivity();
assertThat(Intent.ACTION_FACTORY_RESET).isEqualTo(intent.getAction());
+ assertThat(componentName).isNotNull();
assertThat(componentName.getPackageName()).isEqualTo(intent.getPackage());
}
@@ -230,8 +220,8 @@
doReturn(true).when(mMasterClear).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
doNothing().when(mMasterClear).establishInitialState();
- mMasterClear.onActivityResultInternal(
- MasterClear.KEYGUARD_REQUEST, Activity.RESULT_CANCELED, null);
+ mMasterClear
+ .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_CANCELED, null);
verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
verify(mMasterClear, times(1)).establishInitialState();
@@ -245,8 +235,8 @@
doReturn(mMockIntent).when(mMasterClear).getAccountConfirmationIntent();
doNothing().when(mMasterClear).showAccountCredentialConfirmation(eq(mMockIntent));
- mMasterClear.onActivityResultInternal(
- MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
+ mMasterClear
+ .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
verify(mMasterClear, times(0)).establishInitialState();
@@ -260,8 +250,8 @@
doReturn(null).when(mMasterClear).getAccountConfirmationIntent();
doNothing().when(mMasterClear).showFinalConfirmation();
- mMasterClear.onActivityResultInternal(
- MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
+ mMasterClear
+ .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
verify(mMasterClear, times(0)).establishInitialState();
@@ -365,7 +355,8 @@
@Test
public void testIsValidRequestCode() {
assertThat(mMasterClear.isValidRequestCode(MasterClear.KEYGUARD_REQUEST)).isTrue();
- assertThat(mMasterClear.isValidRequestCode(MasterClear.CREDENTIAL_CONFIRM_REQUEST)).isTrue();
+ assertThat(mMasterClear.isValidRequestCode(MasterClear.CREDENTIAL_CONFIRM_REQUEST))
+ .isTrue();
assertThat(mMasterClear.isValidRequestCode(0)).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
index c52204d..24defa1 100644
--- a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java
@@ -16,24 +16,22 @@
package com.android.settings;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PrivacySettingsTest {
@Mock
@@ -58,5 +56,4 @@
public void testSetPreference_noCrash() {
mSettings.setPreferenceReferences(mScreen);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java
index f4b5f4c..988f1cb 100644
--- a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java
+++ b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java
@@ -16,9 +16,7 @@
package com.android.settings;
-
import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
@@ -38,13 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION
-)
public class ResetNetworkConfirmTest {
private Activity mActivity;
@@ -65,16 +58,10 @@
@Test
public void testResetNetworkData_resetEsim() {
mResetNetworkConfirm.mEraseEsim = true;
- doReturn(true)
- .when(mRecoverySystem).wipeEuiccData(any(Context.class), anyString());
+ doReturn(true).when(mRecoverySystem).wipeEuiccData(any(Context.class), anyString());
mResetNetworkConfirm.esimFactoryReset(mActivity, "" /* packageName */);
- try {
- // Waiting the Async task finished
- Thread.sleep(10000); // 10 sec
- } catch (InterruptedException ignore) {
-
- }
+ Robolectric.getBackgroundThreadScheduler().advanceToLastPostedRunnable();
Assert.assertNotNull(mResetNetworkConfirm.mEraseEsimTask);
verify(mRecoverySystem).wipeEuiccData(any(Context.class), anyString());
@@ -87,7 +74,6 @@
mResetNetworkConfirm.esimFactoryReset(mActivity, "" /* packageName */);
Assert.assertNull(mResetNetworkConfirm.mEraseEsimTask);
- verify(mRecoverySystem, never())
- .wipeEuiccData(any(Context.class), anyString());
+ verify(mRecoverySystem, never()).wipeEuiccData(any(Context.class), anyString());
}
}
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index 25abd4d..2096629 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -38,10 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsActivityTest {
@Mock
@@ -61,8 +59,7 @@
}
@Test
- public void launchSettingFragment_nullExtraShowFragment_shouldNotCrash()
- throws ClassNotFoundException {
+ public void launchSettingFragment_nullExtraShowFragment_shouldNotCrash() {
when(mActivity.getFragmentManager()).thenReturn(mFragmentManager);
when(mFragmentManager.beginTransaction()).thenReturn(mock(FragmentTransaction.class));
diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
index 3a7d094..c9fd59a 100644
--- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
@@ -15,33 +15,29 @@
*/
package com.android.settings;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.app.Dialog;
import android.app.Fragment;
-import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsDialogFragmentTest {
private static final int DIALOG_ID = 15;
@Mock
- private Context mContext;
- @Mock
private DialogCreatableFragment mDialogCreatable;
private SettingsPreferenceFragment.SettingsDialogFragment mDialogFragment;
@@ -56,7 +52,7 @@
mDialogFragment =
new SettingsPreferenceFragment.SettingsDialogFragment(mDialogCreatable, DIALOG_ID);
- mDialogFragment.onAttach(mContext);
+ mDialogFragment.onAttach(RuntimeEnvironment.application);
mDialogFragment.getMetricsCategory();
// getDialogMetricsCategory called in onAttach, and explicitly in test.
@@ -68,15 +64,15 @@
when(mDialogCreatable.getDialogMetricsCategory(DIALOG_ID)).thenReturn(-1);
try {
- mDialogFragment = new SettingsPreferenceFragment.SettingsDialogFragment(
- mDialogCreatable, DIALOG_ID);
- mDialogFragment.onAttach(mContext);
+ mDialogFragment =
+ new SettingsPreferenceFragment.SettingsDialogFragment(mDialogCreatable, DIALOG_ID);
+ mDialogFragment.onAttach(RuntimeEnvironment.application);
+ fail("Should fail with IllegalStateException");
} catch (IllegalStateException e) {
// getDialogMetricsCategory called in constructor
verify(mDialogCreatable).getDialogMetricsCategory(DIALOG_ID);
return;
}
- fail("Should fail with IllegalStateException");
}
public static class DialogCreatableFragment extends Fragment implements DialogCreatable {
diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
index 0d0f22c..615d1e7 100644
--- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
@@ -15,10 +15,16 @@
*/
package com.android.settings;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.support.annotation.NonNull;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.Before;
@@ -26,21 +32,16 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.io.OutputStream;
import java.io.PrintWriter;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsDumpServiceTest {
+
private static final String PACKAGE_BROWSER = "com.android.test.browser";
private static final String PACKAGE_NULL = "android";
+
@Mock
private PackageManager mPackageManager;
@Mock
@@ -107,7 +108,7 @@
private class TestPrintWriter extends PrintWriter {
private Object mPrintObject;
- public TestPrintWriter(@NonNull OutputStream out) {
+ private TestPrintWriter(@NonNull OutputStream out) {
super(out);
}
@@ -116,7 +117,7 @@
mPrintObject = object;
}
- public Object getPrintObject() {
+ private Object getPrintObject() {
return mPrintObject;
}
}
diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
index aceb671..0e1384d 100644
--- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
@@ -17,7 +17,6 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -38,13 +37,12 @@
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.android.controller.ActivityController;
-import org.robolectric.annotation.Config;
import java.io.File;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsLicenseActivityTest {
+
private ActivityController<SettingsLicenseActivity> mActivityController;
private SettingsLicenseActivity mActivity;
private Application mApplication;
@@ -58,7 +56,7 @@
mActivity = spy(mActivityController.get());
}
- void assertEqualIntents(Intent actual, Intent expected) {
+ private void assertEqualIntents(Intent actual, Intent expected) {
assertThat(actual.getAction()).isEqualTo(expected.getAction());
assertThat(actual.getDataString()).isEqualTo(expected.getDataString());
assertThat(actual.getType()).isEqualTo(expected.getType());
diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
index 5fc9767..2e768a6 100644
--- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
@@ -16,6 +16,13 @@
package com.android.settings;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
@@ -25,6 +32,10 @@
import android.support.v7.preference.PreferenceScreen;
import android.view.View;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,20 +45,7 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsPreferenceFragmentTest {
private static final int ITEM_COUNT = 5;
@@ -152,7 +150,7 @@
doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
final Bundle bundle = new Bundle();
bundle.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, "test_key");
- doReturn(bundle).when(mFragment).getArguments();
+ when(mFragment.getArguments()).thenReturn(bundle);
mFragment.onCreate(null /* icicle */);
@@ -167,10 +165,9 @@
doReturn(null).when(mFragment).getPreferenceScreen();
final Bundle bundle = new Bundle();
bundle.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, "test_key");
- doReturn(bundle).when(mFragment).getArguments();
+ when(mFragment.getArguments()).thenReturn(bundle);
mFragment.onCreate(null /* icicle */);
-
// no crash
}
@@ -181,5 +178,4 @@
return 0;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
index 1b3e9ca..f2bd79c 100644
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
@@ -17,34 +17,20 @@
package com.android.settings;
import static com.android.settings.testutils.ResIdSubject.assertResId;
-
import static com.google.common.truth.Truth.assertThat;
import android.content.Intent;
+import android.os.SystemProperties;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.setupwizardlib.util.WizardManagerHelper;
-import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowSystemProperties.class
- })
public class SetupWizardUtilsTest {
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void testCopySetupExtras() throws Throwable {
Intent fromIntent = new Intent();
@@ -61,7 +47,7 @@
@Test
public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() {
- SettingsShadowSystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
+ SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
WizardManagerHelper.THEME_GLIF);
Intent intent = new Intent();
intent.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2);
@@ -71,7 +57,7 @@
@Test
public void testGetTheme_withEmptyIntent_shouldReturnSystemProperty() {
- SettingsShadowSystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
+ SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
WizardManagerHelper.THEME_GLIF_V2_LIGHT);
Intent intent = new Intent();
@@ -80,7 +66,7 @@
@Test
public void testGetTheme_glifV3Light_shouldReturnThemeResource() {
- SettingsShadowSystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
+ SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
WizardManagerHelper.THEME_GLIF_V3_LIGHT);
Intent intent = new Intent();
diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
index 59a5867..9ca93f5 100644
--- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
@@ -15,45 +15,36 @@
*/
package com.android.settings;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import android.support.v7.preference.PreferenceViewHolder;
-import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class
-})
public class SummaryPreferenceTest {
- private Context mContext;
private PreferenceViewHolder mHolder;
private SummaryPreference mPreference;
@Before
public void setUp() {
- mContext = RuntimeEnvironment.application;
- mPreference = new SummaryPreference(mContext, null);
+ final Context context = RuntimeEnvironment.application;
+ mPreference = new SummaryPreference(context, null);
- LayoutInflater inflater = LayoutInflater.from(mContext);
- final View view = inflater.inflate(mPreference.getLayoutResource(),
- new LinearLayout(mContext), false);
+ LayoutInflater inflater = LayoutInflater.from(context);
+ final View view =
+ inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(context), false);
mHolder = PreferenceViewHolder.createInstanceForTests(view);
}
@@ -63,10 +54,11 @@
mPreference.setChartEnabled(false);
mPreference.onBindViewHolder(mHolder);
- assertTrue(
- TextUtils.isEmpty(((TextView) mHolder.findViewById(android.R.id.text1)).getText()));
- assertTrue(
- TextUtils.isEmpty(((TextView) mHolder.findViewById(android.R.id.text2)).getText()));
+ final TextView textView1 = (TextView) mHolder.findViewById(android.R.id.text1);
+ assertThat(textView1.getText()).isEqualTo("");
+
+ final TextView textView2 = (TextView) mHolder.findViewById(android.R.id.text2);
+ assertThat(textView2.getText()).isEqualTo("");
}
@Test
@@ -77,10 +69,10 @@
mPreference.setLabels(testLabel1, testLabel2);
mPreference.onBindViewHolder(mHolder);
- assertEquals(testLabel1,
- ((TextView) mHolder.findViewById(android.R.id.text1)).getText());
- assertEquals(testLabel2,
- ((TextView) mHolder.findViewById(android.R.id.text2)).getText());
- }
+ final TextView textView1 = (TextView) mHolder.findViewById(android.R.id.text1);
+ assertThat(textView1.getText()).isEqualTo(testLabel1);
+ final TextView textView2 = (TextView) mHolder.findViewById(android.R.id.text2);
+ assertThat(textView2.getText()).isEqualTo(testLabel2);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/TestConfig.java b/tests/robotests/src/com/android/settings/TestConfig.java
deleted file mode 100644
index 4a319bb..0000000
--- a/tests/robotests/src/com/android/settings/TestConfig.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings;
-
-import android.os.Build;
-
-/**
- * Constants for Robolectric config
- */
-public class TestConfig {
-
- public static final int SDK_VERSION = Build.VERSION_CODES.O;
- public static final String MANIFEST_PATH = "packages/apps/Settings/AndroidManifest.xml";
-}
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index d1c4a55..a2b1892 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -17,7 +17,6 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.doReturn;
@@ -41,7 +40,6 @@
import android.os.storage.DiskInfo;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
-import android.text.format.DateUtils;
import android.util.IconDrawableFactory;
import android.widget.EditText;
import android.widget.TextView;
@@ -49,22 +47,20 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
-import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UtilsTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final int USER_ID = 1;
@@ -161,8 +157,8 @@
public void testIsProfileOrDeviceOwner_deviceOwnerApp_returnTrue() {
when(mDevicePolicyManager.isDeviceOwnerAppOnAnyUser(PACKAGE_NAME)).thenReturn(true);
- assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager,
- PACKAGE_NAME)).isTrue();
+ assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager, PACKAGE_NAME))
+ .isTrue();
}
@Test
@@ -171,11 +167,11 @@
userInfos.add(new UserInfo());
when(mUserManager.getUsers()).thenReturn(userInfos);
- when(mDevicePolicyManager.getProfileOwnerAsUser(userInfos.get(0).id)).thenReturn(
- new ComponentName(PACKAGE_NAME, ""));
+ when(mDevicePolicyManager.getProfileOwnerAsUser(userInfos.get(0).id))
+ .thenReturn(new ComponentName(PACKAGE_NAME, ""));
- assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager,
- PACKAGE_NAME)).isTrue();
+ assertThat(Utils.isProfileOrDeviceOwner(mUserManager, mDevicePolicyManager, PACKAGE_NAME))
+ .isTrue();
}
@Test
@@ -190,8 +186,8 @@
}
@Test
- public void testGetBadgedIcon_usePackageNameAndUserId() throws
- PackageManager.NameNotFoundException {
+ public void testGetBadgedIcon_usePackageNameAndUserId()
+ throws PackageManager.NameNotFoundException {
doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME,
PackageManager.GET_META_DATA);
@@ -200,5 +196,4 @@
// Verify that it uses the correct user id
verify(mIconDrawableFactory).getBadgedIcon(mApplicationInfo, USER_ID);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/ZonePickerTest.java b/tests/robotests/src/com/android/settings/ZonePickerTest.java
index 5b1b007..7816a58 100644
--- a/tests/robotests/src/com/android/settings/ZonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/ZonePickerTest.java
@@ -37,15 +37,12 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowLibcoreTimeZoneNames.class,
- ShadowLibcoreTimeZoneNames.ShadowZoneStringsCache.class,
- ShadowTimeZoneNames.class,
- ShadowZoneGetterData.class,
- }
+@Config(shadows = {
+ ShadowLibcoreTimeZoneNames.class,
+ ShadowLibcoreTimeZoneNames.ShadowZoneStringsCache.class,
+ ShadowTimeZoneNames.class,
+ ShadowZoneGetterData.class,
+}
)
public class ZonePickerTest {
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index fb32da1..f257f54 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -16,35 +16,33 @@
package com.android.settings.accessibility;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.XmlTestUtils;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AccessibilitySettingsTest {
@Test
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = RuntimeEnvironment.application;
final List<String> niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(context);
+ .getNonIndexableKeys(context);
final List<String> keys = new ArrayList<>();
keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.accessibility_settings));
assertThat(keys).containsAllIn(niks);
}
-}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java
index b0246b9..0d67ff2 100644
--- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java
@@ -21,7 +21,6 @@
import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -31,10 +30,8 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HapticFeedbackIntensityPreferenceControllerTest {
private LifecycleOwner mLifecycleOwner;
diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java
index 32e17b9..067f015 100644
--- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -39,10 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotificationVibrationIntensityPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
index cfc62cb..1fe64c7 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
@@ -25,7 +25,6 @@
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,17 +35,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ShortcutServicePickerFragmentTest {
private static final String TEST_SERVICE_KEY_1 = "abc/123";
- private static final String TEST_SERVICE_KEY_2 = "abcd/1234";
-
- private static final String SUMMARY_1 = "summary1";
- private static final String SUMMARY_2 = "summary2";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Activity mActivity;
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index 5ef5a12..a3fb689 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -27,7 +27,6 @@
import android.view.ViewGroup;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.widget.SwitchBar;
@@ -38,11 +37,7 @@
import org.robolectric.util.FragmentTestUtil;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- })
+@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public class ToggleFeaturePreferenceFragmentTest {
private ToggleFeaturePreferenceFragmentTestable mFragment;
@@ -50,14 +45,12 @@
@Test
public void createFragment_shouldOnlyAddPreferencesOnce() {
mFragment = spy(new ToggleFeaturePreferenceFragmentTestable());
-
FragmentTestUtil.startFragment(mFragment);
// execute exactly once
verify(mFragment).addPreferencesFromResource(R.xml.placeholder_prefs);
}
-
public static class ToggleFeaturePreferenceFragmentTestable
extends ToggleFeaturePreferenceFragment {
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java
index 9729d66..8550cf9 100644
--- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java
@@ -16,14 +16,13 @@
package com.android.settings.accessibility;
-import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_OFF;
+import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_HIGH;
import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_LOW;
import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_MEDIUM;
-import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_HIGH;
+import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_OFF;
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.app.Activity;
import android.content.Context;
@@ -31,7 +30,6 @@
import android.os.Vibrator;
import android.provider.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.accessibility.VibrationPreferenceFragment.VibrationIntensityCandidateInfo;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -44,16 +42,21 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VibrationPreferenceFragmentTest {
- public static final Map<Integer, String> INTENSITY_TO_KEY = new HashMap<>();
+
+ private static final Map<Integer, String> INTENSITY_TO_KEY = new HashMap<>(4);
+ static {
+ INTENSITY_TO_KEY.put(Vibrator.VIBRATION_INTENSITY_OFF, KEY_INTENSITY_OFF);
+ INTENSITY_TO_KEY.put(Vibrator.VIBRATION_INTENSITY_LOW, KEY_INTENSITY_LOW);
+ INTENSITY_TO_KEY.put(Vibrator.VIBRATION_INTENSITY_MEDIUM, KEY_INTENSITY_MEDIUM);
+ INTENSITY_TO_KEY.put(Vibrator.VIBRATION_INTENSITY_HIGH, KEY_INTENSITY_HIGH);
+ }
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Activity mActivity;
@@ -63,13 +66,6 @@
private Context mContext;
private TestVibrationPreferenceFragment mFragment;
- static {
- INTENSITY_TO_KEY.put(Vibrator.VIBRATION_INTENSITY_OFF, KEY_INTENSITY_OFF);
- INTENSITY_TO_KEY.put(Vibrator.VIBRATION_INTENSITY_LOW, KEY_INTENSITY_LOW);
- INTENSITY_TO_KEY.put(Vibrator.VIBRATION_INTENSITY_MEDIUM, KEY_INTENSITY_MEDIUM);
- INTENSITY_TO_KEY.put(Vibrator.VIBRATION_INTENSITY_HIGH, KEY_INTENSITY_HIGH);
- }
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -135,4 +131,3 @@
}
}
}
-
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
index 3ed9717..ade7dc9 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
@@ -15,11 +15,8 @@
*/
package com.android.settings.accounts;
-import static com.android.settings.accounts.AccountDashboardFragmentTest
- .ShadowAuthenticationHelper.LABELS;
-import static com.android.settings.accounts.AccountDashboardFragmentTest
- .ShadowAuthenticationHelper.TYPES;
-
+import static com.android.settings.accounts.AccountDashboardFragmentTest.ShadowAuthenticationHelper.LABELS;
+import static com.android.settings.accounts.AccountDashboardFragmentTest.ShadowAuthenticationHelper.TYPES;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -31,7 +28,6 @@
import android.text.TextUtils;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.settingslib.drawer.CategoryKey;
@@ -40,137 +36,129 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.Resetter;
-import org.robolectric.shadows.ShadowApplication;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AccountDashboardFragmentTest {
- private AccountDashboardFragment mFragment;
+ private AccountDashboardFragment mFragment;
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mFragment = new AccountDashboardFragment();
+ @Before
+ public void setUp() {
+ mFragment = new AccountDashboardFragment();
+ }
+
+ @After
+ public void tearDown() {
+ ShadowAuthenticationHelper.reset();
+ }
+
+ @Test
+ public void testCategory_isAccount() {
+ assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_ACCOUNT);
+ }
+
+ @Test
+ @Config(shadows = {
+ ShadowAuthenticationHelper.class
+ })
+ public void updateSummary_hasAccount_shouldDisplayUpTo3AccountTypes() {
+ final SummaryLoader loader = mock(SummaryLoader.class);
+ final Activity activity = Robolectric.buildActivity(Activity.class).setup().get();
+
+ final SummaryLoader.SummaryProvider provider =
+ AccountDashboardFragment.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(activity, loader);
+ provider.setListening(true);
+
+ verify(loader).setSummary(provider, LABELS[0] + ", " + LABELS[1] + ", " + LABELS[2]);
+ }
+
+ @Test
+ @Config(shadows = ShadowAuthenticationHelper.class)
+ public void updateSummary_noAccount_shouldDisplayDefaultSummary() {
+ ShadowAuthenticationHelper.setEnabledAccount(null);
+ final SummaryLoader loader = mock(SummaryLoader.class);
+ final Activity activity = Robolectric.buildActivity(Activity.class).setup().get();
+
+ final SummaryLoader.SummaryProvider provider =
+ AccountDashboardFragment.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(activity, loader);
+ provider.setListening(true);
+
+ verify(loader).setSummary(provider,
+ activity.getString(R.string.account_dashboard_default_summary));
+ }
+
+ @Test
+ @Config(shadows = ShadowAuthenticationHelper.class)
+ public void updateSummary_noAccountTypeLabel_shouldNotDisplayNullEntry() {
+ final SummaryLoader loader = mock(SummaryLoader.class);
+ final Activity activity = Robolectric.buildActivity(Activity.class).setup().get();
+ final String[] enabledAccounts = {TYPES[0], "unlabeled_account_type", TYPES[1]};
+ ShadowAuthenticationHelper.setEnabledAccount(enabledAccounts);
+
+ final SummaryLoader.SummaryProvider provider =
+ AccountDashboardFragment.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(activity, loader);
+ provider.setListening(true);
+
+ // should only show the 2 accounts with labels
+ verify(loader).setSummary(provider, LABELS[0] + ", " + LABELS[1]);
+ }
+
+ @Test
+ public void testSearchIndexProvider_shouldIndexResource() {
+ final List<SearchIndexableResource> indexRes =
+ AccountDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+ .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */);
+
+ assertThat(indexRes).isNotNull();
+ assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
+ }
+
+ @Implements(AuthenticatorHelper.class)
+ public static class ShadowAuthenticationHelper {
+
+ static final String[] TYPES = {"type1", "type2", "type3", "type4"};
+ static final String[] LABELS = {"LABEL1", "LABEL2", "LABEL3", "LABEL4"};
+ private static String[] sEnabledAccount = TYPES;
+
+ public void __constructor__(Context context, UserHandle userHandle,
+ AuthenticatorHelper.OnAccountsUpdateListener listener) {
}
- @After
- public void tearDown() {
- ShadowAuthenticationHelper.reset();
+ private static void setEnabledAccount(String[] enabledAccount) {
+ sEnabledAccount = enabledAccount;
}
- @Test
- public void testCategory_isAccount() {
- assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_ACCOUNT);
+ @Resetter
+ public static void reset() {
+ sEnabledAccount = TYPES;
}
- @Test
- @Config(shadows = {
- ShadowAuthenticationHelper.class
- })
- public void updateSummary_hasAccount_shouldDisplayUpTo3AccountTypes() {
- final SummaryLoader loader = mock(SummaryLoader.class);
- final Activity activity = Robolectric.buildActivity(Activity.class).setup().get();
-
- final SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
- .createSummaryProvider(activity, loader);
- provider.setListening(true);
-
- verify(loader).setSummary(provider, LABELS[0] + ", " + LABELS[1] + ", " + LABELS[2]);
+ @Implementation
+ public String[] getEnabledAccountTypes() {
+ return sEnabledAccount;
}
- @Test
- @Config(shadows = {
- ShadowAuthenticationHelper.class
- })
- public void updateSummary_noAccount_shouldDisplayDefaultSummary() {
- ShadowAuthenticationHelper.setEnabledAccount(null);
- final SummaryLoader loader = mock(SummaryLoader.class);
- final Activity activity = Robolectric.buildActivity(Activity.class).setup().get();
-
- final SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
- .createSummaryProvider(activity, loader);
- provider.setListening(true);
-
- verify(loader).setSummary(provider,
- activity.getString(R.string.account_dashboard_default_summary));
+ @Implementation
+ public CharSequence getLabelForType(Context context, final String accountType) {
+ if (TextUtils.equals(accountType, TYPES[0])) {
+ return LABELS[0];
+ } else if (TextUtils.equals(accountType, TYPES[1])) {
+ return LABELS[1];
+ } else if (TextUtils.equals(accountType, TYPES[2])) {
+ return LABELS[2];
+ } else if (TextUtils.equals(accountType, TYPES[3])) {
+ return LABELS[3];
+ }
+ return null;
}
-
- @Test
- @Config(shadows = {
- ShadowAuthenticationHelper.class
- })
- public void updateSummary_noAccountTypeLabel_shouldNotDisplayNullEntry() {
- final SummaryLoader loader = mock(SummaryLoader.class);
- final Activity activity = Robolectric.buildActivity(Activity.class).setup().get();
- final String[] enabledAccounts = {TYPES[0], "unlabled_account_type", TYPES[1]};
- ShadowAuthenticationHelper.setEnabledAccount(enabledAccounts);
-
- final SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
- .createSummaryProvider(activity, loader);
- provider.setListening(true);
-
- // should only show the 2 accounts with labels
- verify(loader).setSummary(provider, LABELS[0] + ", " + LABELS[1]);
- }
-
- @Test
- public void testSearchIndexProvider_shouldIndexResource() {
- final List<SearchIndexableResource> indexRes =
- AccountDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- ShadowApplication.getInstance().getApplicationContext(),
- true /* enabled */);
-
- assertThat(indexRes).isNotNull();
- assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
- }
-
- @Implements(AuthenticatorHelper.class)
- public static class ShadowAuthenticationHelper {
-
- static final String[] TYPES = new String[] {"type1", "type2", "type3", "type4"};
- static final String[] LABELS = new String[] {"LABEL1", "LABEL2", "LABEL3", "LABEL4"};
- private static String[] sEnabledAccount = TYPES;
-
- public void __constructor__(Context context, UserHandle userHandle,
- AuthenticatorHelper.OnAccountsUpdateListener listener) {
- }
-
- public static void setEnabledAccount(String[] enabledAccount) {
- sEnabledAccount = enabledAccount;
- }
-
- @Resetter
- public static void reset() {
- sEnabledAccount = TYPES;
- }
-
- @Implementation
- public String[] getEnabledAccountTypes() {
- return sEnabledAccount;
- }
-
- @Implementation
- public CharSequence getLabelForType(Context context, final String accountType) {
- if (TextUtils.equals(accountType, TYPES[0])) {
- return LABELS[0];
- } else if (TextUtils.equals(accountType, TYPES[1])) {
- return LABELS[1];
- } else if (TextUtils.equals(accountType, TYPES[2])) {
- return LABELS[2];
- } else if (TextUtils.equals(accountType, TYPES[3])) {
- return LABELS[3];
- }
- return null;
- }
- }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
index afa2229..1424a30 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
@@ -16,16 +16,13 @@
package com.android.settings.accounts;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
import android.accounts.Account;
-import android.accounts.AccountManager;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -34,10 +31,8 @@
import android.os.Bundle;
import android.os.UserHandle;
import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.DashboardFeatureProviderImpl;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.drawer.CategoryKey;
@@ -46,41 +41,28 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AccountDetailDashboardFragmentTest {
private static final String METADATA_CATEGORY = "com.android.settings.category";
private static final String METADATA_ACCOUNT_TYPE = "com.android.settings.ia.account";
private static final String METADATA_USER_HANDLE = "user_handle";
- @Mock(answer = RETURNS_DEEP_STUBS)
- private AccountManager mAccountManager;
- @Mock
- private Preference mPreference;
- @Mock
- private PreferenceScreen mScreen;
-
private AccountDetailDashboardFragment mFragment;
private Context mContext;
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
- ShadowApplication shadowContext = ShadowApplication.getInstance();
- shadowContext.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
- mContext = spy(shadowContext.getApplicationContext());
+ mContext = RuntimeEnvironment.application;
- mFragment = spy(new AccountDetailDashboardFragment());
final Bundle args = new Bundle();
args.putParcelable(METADATA_USER_HANDLE, UserHandle.CURRENT);
+
+ mFragment = new AccountDetailDashboardFragment();
mFragment.setArguments(args);
mFragment.mAccountType = "com.abc";
mFragment.mAccount = new Account("name1@abc.com", "com.abc");
@@ -89,7 +71,7 @@
@Test
public void testCategory_isAccountDetail() {
assertThat(new AccountDetailDashboardFragment().getCategoryKey())
- .isEqualTo(CategoryKey.CATEGORY_ACCOUNT_DETAIL);
+ .isEqualTo(CategoryKey.CATEGORY_ACCOUNT_DETAIL);
}
@Test
@@ -143,7 +125,7 @@
tile.userHandle = null;
mFragment.displayTile(tile);
- final Activity activity = Robolectric.buildActivity(Activity.class).get();
+ final Activity activity = Robolectric.setupActivity(Activity.class);
final Preference preference = new Preference(mContext);
dashboardFeatureProvider.bindPreferenceToTile(activity,
MetricsProto.MetricsEvent.DASHBOARD_SUMMARY, preference, tile, "key",
@@ -153,7 +135,6 @@
final Intent intent = shadowOf(activity).getNextStartedActivityForResult().intent;
- assertThat(intent.getStringExtra("extra.accountName"))
- .isEqualTo("name1@abc.com");
+ assertThat(intent.getStringExtra("extra.accountName")).isEqualTo("name1@abc.com");
}
}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
index 73a58bf..d392c72 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
@@ -25,7 +25,6 @@
import android.accounts.Account;
import android.app.Activity;
import android.arch.lifecycle.LifecycleOwner;
-import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
import android.support.v14.preference.PreferenceFragment;
@@ -33,7 +32,6 @@
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -43,7 +41,6 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
@@ -51,17 +48,10 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class
-)
+@Config(shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class)
public class AccountHeaderPreferenceControllerTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
@Mock
private Activity mActivity;
@Mock
@@ -82,7 +72,7 @@
FakeFeatureFactory.setupForTest();
mHeaderPreference = new LayoutPreference(
RuntimeEnvironment.application, R.layout.settings_entity_header);
- doReturn(mContext).when(mActivity).getApplicationContext();
+ doReturn(RuntimeEnvironment.application).when(mActivity).getApplicationContext();
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
}
@@ -115,7 +105,6 @@
((TextView) mHeaderPreference.findViewById(R.id.entity_header_title)).getText();
assertThat(label).isEqualTo(account.name);
-
}
@Implements(AuthenticatorHelper.class)
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
index 139bee7..3137570 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -15,6 +15,19 @@
*/
package com.android.settings.accounts;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
@@ -33,9 +46,8 @@
import com.android.settings.AccessiblePreferenceCategory;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
import com.android.settingslib.accounts.AuthenticatorHelper;
@@ -46,6 +58,7 @@
import org.mockito.ArgumentMatcher;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@@ -54,22 +67,8 @@
import java.util.ArrayList;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
+@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
public class AccountPreferenceControllerTest {
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -89,15 +88,15 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- ShadowApplication shadowContext = ShadowApplication.getInstance();
- shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
- shadowContext.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
- mContext = shadowContext.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
+ final ShadowApplication shadowApp = ShadowApplication.getInstance();
+ shadowApp.setSystemService(Context.USER_SERVICE, mUserManager);
+ shadowApp.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
- when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
- new AuthenticatorDescription[0]);
+ when(mAccountManager.getAuthenticatorTypesAsUser(anyInt()))
+ .thenReturn(new AuthenticatorDescription[0]);
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
mController = new AccountPreferenceController(mContext, mFragment, null, mAccountHelper);
}
@@ -114,7 +113,7 @@
public void onResume_linkedUser_shouldAddOneAccountCategory() {
final UserInfo info = new UserInfo(1, "user 1", 0);
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(true);
+ when(mUserManager.isRestrictedProfile()).thenReturn(true);
when(mUserManager.getUserInfo(anyInt())).thenReturn(info);
mController.onResume();
@@ -127,7 +126,7 @@
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
mController.onResume();
@@ -141,7 +140,7 @@
infos.add(new UserInfo(1, "user 1", 0));
infos.add(new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
mController.onResume();
@@ -155,7 +154,7 @@
infos.add(new UserInfo(1, "user 1", 0));
infos.add(new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
// First time resume will build the UI
mController.onResume();
@@ -171,7 +170,7 @@
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
// First time resume will build the UI
mController.onResume();
@@ -189,7 +188,7 @@
infos.add(new UserInfo(1, "user 1", 0));
infos.add(new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
// First time resume will build the UI
mController.onResume();
@@ -205,7 +204,7 @@
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
@@ -223,7 +222,7 @@
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
@@ -241,7 +240,7 @@
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
mController.onResume();
@@ -332,7 +331,7 @@
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
Account[] accounts = {new Account("Account1", "com.acct1")};
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts);
@@ -367,7 +366,7 @@
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
final Account[] accountType1 = new Account[2];
@@ -411,7 +410,7 @@
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
Account[] accounts = {new Account("Acct1", "com.acct1")};
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts);
@@ -446,7 +445,7 @@
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
Account[] accounts = {new Account("Acct1", "com.acct1")};
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts);
@@ -492,7 +491,7 @@
infos.add(new UserInfo(1, "user 1", 0));
infos.add(new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
@@ -526,7 +525,7 @@
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
Account[] accounts = {new Account("Acct1", "com.acct1")};
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(accounts);
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
index 0778043..c699ef8 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceTest.java
@@ -16,42 +16,38 @@
package com.android.settings.accounts;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
import android.accounts.Account;
-import android.content.Context;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.ArrayList;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AccountPreferenceTest {
- private Context mContext;
- private Account mAccount;
- private ArrayList<String> mAuthorities;
private AccountPreference mPreference;
@Before
public void setUp() {
- mContext = ShadowApplication.getInstance().getApplicationContext();
- mAccount = new Account("name", "type");
- mAuthorities = new ArrayList<>();
- mAuthorities.add("authority");
+ final ArrayList<String> authorities = new ArrayList<>();
+ authorities.add("authority");
mPreference = spy(new AccountPreference(
- mContext, mAccount, null /* icon */, mAuthorities, false /* showTypeIcon */));
+ RuntimeEnvironment.application,
+ new Account("name", "type"),
+ null /* icon */,
+ authorities,
+ false /* showTypeIcon */)
+ );
}
@Test
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
index 5fbd3a7..aed469b 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.accounts;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
@@ -33,7 +32,6 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
@@ -43,12 +41,13 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
+@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
public class AccountSyncPreferenceControllerTest {
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -61,9 +60,8 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- ShadowApplication application = ShadowApplication.getInstance();
- application.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
- mContext = application.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
+ ShadowApplication.getInstance().setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
new AuthenticatorDescription[0]);
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
index fff73b7..98948a4 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
@@ -16,6 +16,13 @@
package com.android.settings.accounts;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
@@ -29,7 +36,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
import com.android.settingslib.accounts.AuthenticatorHelper;
@@ -39,18 +45,11 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AccountTypePreferenceLoaderTest {
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -73,7 +72,7 @@
new AuthenticatorDescription[0]);
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
when(mPreferenceFragment.getActivity().getPackageManager()).thenReturn(mPackageManager);
- mContext = shadowContext.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mAccount = new Account("name", "type");
final AuthenticatorHelper helper = new AuthenticatorHelper(mContext, UserHandle.CURRENT,
null /* OnAccountsUpdateListener */);
diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
index ff8ca01..c4b540b 100644
--- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
@@ -33,7 +33,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAccountManager;
@@ -52,7 +51,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EmergencyInfoPreferenceControllerTest {
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -142,7 +140,7 @@
@Test
public void handlePreferenceTreeClick_shouldStartActivity() {
final ShadowApplication application = ShadowApplication.getInstance();
- final Context context = application.getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
final Preference preference = new Preference(context);
preference.setKey("emergency_info");
mController = new EmergencyInfoPreferenceController(context);
diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
index 4e4bb4f..e084ada 100644
--- a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
@@ -16,23 +16,19 @@
package com.android.settings.accounts;
-
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ProviderPreferenceTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
index a1f40fc..6020277 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
@@ -22,7 +22,6 @@
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -45,7 +44,6 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAccountManager;
@@ -57,11 +55,11 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RemoveAccountPreferenceControllerTest {
private static final String KEY_REMOVE_ACCOUNT = "remove_account";
@@ -84,26 +82,23 @@
@Mock
private LayoutPreference mPreference;
- private Context mContext;
private RemoveAccountPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- ShadowApplication shadowContext = ShadowApplication.getInstance();
- shadowContext.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
- mContext = spy(shadowContext.getApplicationContext());
+ ShadowApplication.getInstance().setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
- when(mPreferenceManager.getContext()).thenReturn(mContext);
+ when(mPreferenceManager.getContext()).thenReturn(RuntimeEnvironment.application);
when(mFragment.getFragmentManager()).thenReturn(mFragmentManager);
when(mFragmentManager.beginTransaction()).thenReturn(mFragmentTransaction);
- when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
- new AuthenticatorDescription[0]);
+ when(mAccountManager.getAuthenticatorTypesAsUser(anyInt()))
+ .thenReturn(new AuthenticatorDescription[0]);
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
- mController = new RemoveAccountPreferenceController(mContext, mFragment,
- mDevicePolicyManager);
+ mController = new RemoveAccountPreferenceController(RuntimeEnvironment.application,
+ mFragment, mDevicePolicyManager);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
index cd73068..86cedb9 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
@@ -16,19 +16,16 @@
package com.android.settings.accounts;
+import static com.google.common.truth.Truth.assertThat;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
import java.lang.reflect.Modifier;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RemoveUserFragmentTest {
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
index 3b61280..97210b3 100644
--- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -25,7 +24,6 @@
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.notification.EmergencyBroadcastPreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
@@ -40,7 +38,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppAndNotificationDashboardFragmentTest {
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
index 99e662b..b97b60d 100644
--- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
@@ -30,13 +30,11 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
-import android.os.Bundle;
import android.os.UserHandle;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
@@ -54,13 +52,12 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = ShadowEntityHeaderController.class)
+@Config(shadows = ShadowEntityHeaderController.class)
public class AppInfoWithHeaderTest {
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private EntityHeaderController mHeaderController;
@@ -119,12 +116,11 @@
}
@Test
- public void noExtraUserHandleInIntent_retrieveAppEntryWithMyUsedId()
+ public void noExtraUserHandleInIntent_retrieveAppEntryWithMyUserId()
throws PackageManager.NameNotFoundException {
final String packageName = "com.android.settings";
- mAppInfoWithHeader.mIntent.setData(Uri.fromParts("package",
- packageName, null));
+ mAppInfoWithHeader.mIntent.setData(Uri.fromParts("package", packageName, null));
final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);
entry.info = new ApplicationInfo();
entry.info.packageName = packageName;
@@ -145,7 +141,7 @@
}
@Test
- public void extraUserHandleInIntent_retrieveAppEntryWithMyUsedId()
+ public void extraUserHandleInIntent_retrieveAppEntryWithMyUserId()
throws PackageManager.NameNotFoundException {
final int USER_ID = 1002;
final String packageName = "com.android.settings";
@@ -187,7 +183,7 @@
mPackageInfo.applicationInfo = new ApplicationInfo();
mState = mock(ApplicationsState.class);
mIntent = new Intent();
- mShadowContext = ShadowApplication.getInstance().getApplicationContext();
+ mShadowContext = RuntimeEnvironment.application;
ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
(InstantAppDataProvider) (info -> false));
when(mManager.getContext()).thenReturn(mShadowContext);
diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
index 2e52214..28ff140 100644
--- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
@@ -34,19 +34,18 @@
import android.support.v7.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import java.util.ArrayList;
-import java.util.List;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppPermissionsPreferenceControllerTest {
private static final String PERM_LOCATION = "android.permission-group.LOCATION";
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
index d63697e..2df0117 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
@@ -25,19 +25,18 @@
import android.content.Context;
import android.os.RemoteException;
import android.os.UserManager;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class AppStateAppOpsBridgeTest {
@Mock private Context mContext;
@@ -56,9 +55,8 @@
public void getPermissionInfo_nullPackageInfo_shouldNotCrash() throws RemoteException {
when(mPackageManagerService.getPackageInfo(anyString(), anyInt(), anyInt()))
.thenReturn(null);
- TestAppStateAppOpsBridge appStateAppOpsBridge = new TestAppStateAppOpsBridge();
- appStateAppOpsBridge.getPermissionInfo("pkg1", 1);
+ new TestAppStateAppOpsBridge().getPermissionInfo("pkg1", 1);
// should not crash
}
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
index 62623e5..fee7a8b 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
@@ -21,20 +21,17 @@
import android.app.AppOpsManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppStateInstallAppsBridgeTest {
@Test
public void testInstallAppsStateCanInstallApps() {
- AppStateInstallAppsBridge.InstallAppsState appState = new AppStateInstallAppsBridge
- .InstallAppsState();
+ AppStateInstallAppsBridge.InstallAppsState appState =
+ new AppStateInstallAppsBridge.InstallAppsState();
assertThat(appState.canInstallApps()).isFalse();
appState.permissionGranted = true;
@@ -47,8 +44,8 @@
@Test
public void testInstallAppsStateIsPotentialAppSource() {
- AppStateInstallAppsBridge.InstallAppsState appState = new AppStateInstallAppsBridge
- .InstallAppsState();
+ AppStateInstallAppsBridge.InstallAppsState appState =
+ new AppStateInstallAppsBridge.InstallAppsState();
assertThat(appState.isPotentialAppSource()).isFalse();
appState.appOpMode = AppOpsManager.MODE_ERRORED;
diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java
index 1f6aea4..87eb6a6 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStorageSettingsTest.java
@@ -16,7 +16,6 @@
package com.android.settings.applications;
-
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doNothing;
@@ -30,7 +29,6 @@
import android.view.View;
import android.widget.Button;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.ActionButtonPreference;
import com.android.settings.widget.ActionButtonPreferenceTest;
@@ -42,10 +40,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppStorageSettingsTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
index e55c8f1..5a17b1f 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
@@ -1,7 +1,6 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -9,7 +8,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@@ -18,11 +16,10 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppStorageSizesControllerTest {
+
private static final String COMPUTING = "Computing…";
private static final String INVALID_SIZE = "Couldn’t compute package size.";
private AppStorageSizesController mController;
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
index 33d261f..a784329 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
@@ -16,6 +16,16 @@
package com.android.settings.applications;
+import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -27,7 +37,6 @@
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -37,26 +46,11 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import java.util.Arrays;
-import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link InstalledAppCounter}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class AppWithAdminGrantedPermissionsCounterTest {
private final String APP_1 = "app1";
@@ -81,11 +75,16 @@
private final String PERMISSION_2 = "some.permission.2";
private final String[] PERMISSIONS = {PERMISSION_1, PERMISSION_2};
- @Mock private UserManager mUserManager;
- @Mock private Context mContext;
- @Mock private PackageManagerWrapper mPackageManager;
- @Mock private IPackageManagerWrapper mPackageManagerService;
- @Mock private DevicePolicyManagerWrapper mDevicePolicyManager;
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private Context mContext;
+ @Mock
+ private PackageManagerWrapper mPackageManager;
+ @Mock
+ private IPackageManagerWrapper mPackageManagerService;
+ @Mock
+ private DevicePolicyManagerWrapper mDevicePolicyManager;
private int mAppCount = -1;
private ApplicationInfo mApp1;
@@ -250,9 +249,9 @@
new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
}
- private class AppWithAdminGrantedPermissionsCounterTestable extends
- AppWithAdminGrantedPermissionsCounter {
- public AppWithAdminGrantedPermissionsCounterTestable(String[] permissions) {
+ private class AppWithAdminGrantedPermissionsCounterTestable
+ extends AppWithAdminGrantedPermissionsCounter {
+ private AppWithAdminGrantedPermissionsCounterTestable(String[] permissions) {
super(mContext, permissions, mPackageManager, mPackageManagerService,
mDevicePolicyManager);
}
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
index 2e9328a..ffa262b 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
@@ -16,31 +16,6 @@
package com.android.settings.applications;
-import android.app.admin.DevicePolicyManager;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.os.Build;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.wrapper.DevicePolicyManagerWrapper;
-import com.android.settings.wrapper.IPackageManagerWrapper;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
@@ -51,11 +26,30 @@
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
-/**
- * Tests for {@link AppWithAdminGrantedPermissionsLister}.
- */
+import android.app.admin.DevicePolicyManager;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.Build;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.DevicePolicyManagerWrapper;
+import com.android.settings.wrapper.IPackageManagerWrapper;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class AppWithAdminGrantedPermissionsListerTest {
private final String APP_1 = "app1";
@@ -80,10 +74,14 @@
private final String PERMISSION_2 = "some.permission.2";
private final String[] PERMISSIONS = {PERMISSION_1, PERMISSION_2};
- @Mock private UserManager mUserManager;
- @Mock private PackageManagerWrapper mPackageManager;
- @Mock private IPackageManagerWrapper mPackageManagerService;
- @Mock private DevicePolicyManagerWrapper mDevicePolicyManager;
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private PackageManagerWrapper mPackageManager;
+ @Mock
+ private IPackageManagerWrapper mPackageManagerService;
+ @Mock
+ private DevicePolicyManagerWrapper mDevicePolicyManager;
private List<UserAppInfo> mAppList = Collections.emptyList();
@@ -212,7 +210,7 @@
private class AppWithAdminGrantedPermissionsListerTestable extends
AppWithAdminGrantedPermissionsLister {
- public AppWithAdminGrantedPermissionsListerTestable(String[] permissions) {
+ private AppWithAdminGrantedPermissionsListerTestable(String[] permissions) {
super(permissions, mPackageManager, mPackageManagerService,
mDevicePolicyManager, mUserManager);
}
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index e5b7a66..57b0058 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -16,6 +16,9 @@
package com.android.settings.applications;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
@@ -28,10 +31,8 @@
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.ApplicationTestUtils;
-import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -41,22 +42,16 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
/**
* Tests for {@link ApplicationFeatureProviderImpl}.
*/
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowUserManager.class})
public final class ApplicationFeatureProviderImplTest {
private final int MAIN_USER_ID = 0;
@@ -71,11 +66,16 @@
private final String PERMISSION = "some.permission";
- private @Mock UserManager mUserManager;
- private @Mock Context mContext;
- private @Mock PackageManagerWrapper mPackageManager;
- @Mock private IPackageManagerWrapper mPackageManagerService;
- @Mock private DevicePolicyManagerWrapper mDevicePolicyManager;
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private Context mContext;
+ @Mock
+ private PackageManagerWrapper mPackageManager;
+ @Mock
+ private IPackageManagerWrapper mPackageManagerService;
+ @Mock
+ private DevicePolicyManagerWrapper mDevicePolicyManager;
private ApplicationFeatureProvider mProvider;
@@ -249,8 +249,7 @@
@Test
public void getKeepEnabledPackages_shouldContainNothing() {
- assertThat(mProvider.getKeepEnabledPackages())
- .isEmpty();
+ assertThat(mProvider.getKeepEnabledPackages()).isEmpty();
}
private void setUpUsersAndInstalledApps() {
diff --git a/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java b/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java
index 237aa71..22140bb 100644
--- a/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java
@@ -17,24 +17,20 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DataSaverControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
index f1c9496..d17fc87 100644
--- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
@@ -33,7 +33,6 @@
import android.telephony.TelephonyManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
@@ -46,13 +45,11 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultAppSettingsTest {
private Context mContext;
@@ -69,8 +66,7 @@
@Test
public void getPreferenceScreenResId_shouldUseAppDefaultSettingPrefLayout() {
- assertThat(mFragment.getPreferenceScreenResId()).isEqualTo(
- R.xml.app_default_settings);
+ assertThat(mFragment.getPreferenceScreenResId()).isEqualTo(R.xml.app_default_settings);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java b/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java
index 5482cd1..ad7e615 100644
--- a/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java
@@ -17,24 +17,20 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DeviceAdministratorsControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java
index 5be2296..b364720 100644
--- a/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java
@@ -17,24 +17,20 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EnabledVrListenersControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
index 10caf13..9ab1b5e 100644
--- a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
@@ -16,18 +16,15 @@
package com.android.settings.applications;
+import static junit.framework.Assert.assertTrue;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertTrue;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EnterpriseDefaultAppsTest {
@Test
public void testNumberOfIntentsCorrelateWithUI() throws Exception {
diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
index 3269acb..4fa30eb 100644
--- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
@@ -29,7 +28,6 @@
import android.os.UserHandle;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@@ -39,20 +37,19 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.io.IOException;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FetchPackageStorageAsyncLoaderTest {
+
private static final String PACKAGE_NAME = "com.test.package";
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
private StorageStatsSource mSource;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
diff --git a/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java b/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java
index d84d9bf..6dfaa7c 100644
--- a/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java
@@ -17,24 +17,20 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HighPowerAppsControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
index 58c4386..d971948 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
@@ -17,9 +17,7 @@
package com.android.settings.applications;
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.argThat;
@@ -39,8 +37,6 @@
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -49,7 +45,6 @@
import org.mockito.ArgumentMatcher;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
@@ -57,12 +52,7 @@
import java.util.Collections;
import java.util.Set;
-/**
- * Tests for {@link InstalledAppCounter}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowUserManager.class})
public final class InstalledAppCounterTest {
private final String APP_1 = "app1";
@@ -137,10 +127,9 @@
// Verify that installed packages were retrieved the current user and the user's managed
// profile only.
verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
- verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
- eq(MANAGED_PROFILE_ID));
- verify(mPackageManager, atLeast(0)).queryIntentActivitiesAsUser(any(Intent.class), anyInt(),
- anyInt());
+ verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID));
+ verify(mPackageManager, atLeast(0))
+ .queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt());
verifyNoMoreInteractions(mPackageManager);
// Count once more, considering apps installed by enterprise policy only.
@@ -244,7 +233,7 @@
private class InstalledAppCounterTestable extends InstalledAppCounter {
- public InstalledAppCounterTestable(int installReason) {
+ private InstalledAppCounterTestable(int installReason) {
super(mContext, installReason, mPackageManager);
}
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
index c74deae..119d3eb 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
@@ -16,33 +16,6 @@
package com.android.settings.applications;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
@@ -53,11 +26,32 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-/**
- * Tests for {@link InstalledAppLister}.
- */
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wrapper.PackageManagerWrapper;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class InstalledAppListerTest {
private final String APP_1 = "app1";
@@ -74,8 +68,10 @@
private final int MAIN_USER_APP_UID = MAIN_USER_ID * PER_USER_UID_RANGE;
private final int MANAGED_PROFILE_APP_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE;
- @Mock private UserManager mUserManager;
- @Mock private PackageManagerWrapper mPackageManager;
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private PackageManagerWrapper mPackageManager;
private List<UserAppInfo> mInstalledAppList = Collections.emptyList();
@@ -172,10 +168,9 @@
// Verify that installed packages were retrieved for the current user and the user's
// managed profile.
verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
- verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
- eq(MANAGED_PROFILE_ID));
- verify(mPackageManager, atLeast(0)).queryIntentActivitiesAsUser(anyObject(), anyInt(),
- anyInt());
+ verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MANAGED_PROFILE_ID));
+ verify(mPackageManager, atLeast(0))
+ .queryIntentActivitiesAsUser(anyObject(), anyInt(), anyInt());
}
public static boolean checkAppFound(List<UserAppInfo> mInstalledAppList, String appId,
diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
index ffb1d40..8e4b34f 100644
--- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
@@ -26,17 +26,14 @@
import android.view.LayoutInflater;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LayoutPreferenceTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/applications/ManageDomainUrlsTest.java b/tests/robotests/src/com/android/settings/applications/ManageDomainUrlsTest.java
index c480a49..a6041fe 100644
--- a/tests/robotests/src/com/android/settings/applications/ManageDomainUrlsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ManageDomainUrlsTest.java
@@ -16,14 +16,12 @@
package com.android.settings.applications;
-
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
@@ -33,10 +31,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ManageDomainUrlsTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
index 1aea60b..e9cb6de 100644
--- a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
@@ -24,21 +24,16 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.telephony.SmsUsageMonitor;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PremiumSmsAccessTest {
private FakeFeatureFactory mFeatureFactory;
@@ -49,7 +44,7 @@
MockitoAnnotations.initMocks(this);
mFeatureFactory = FakeFeatureFactory.setupForTest();
mFragment = new PremiumSmsAccess();
- mFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
+ mFragment.onAttach(RuntimeEnvironment.application);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java
index 0f454fc..cad4100 100644
--- a/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java
@@ -17,24 +17,20 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PremiumSmsControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
index ed97fe7..51a16f2 100644
--- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications;
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.anyLong;
@@ -48,7 +47,6 @@
import android.text.TextUtils;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
@@ -57,7 +55,6 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher;
import org.mockito.Mock;
@@ -70,7 +67,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RecentAppsPreferenceControllerTest {
@Mock
@@ -132,8 +128,7 @@
@Test
public void onDisplayAndUpdateState_shouldRefreshUi() {
- mController = spy(
- new RecentAppsPreferenceController(mContext, (Application) null, null));
+ mController = spy(new RecentAppsPreferenceController(mContext, (Application) null, null));
doNothing().when(mController).refreshUi(mContext);
@@ -175,15 +170,15 @@
// stat1, stat2 are valid apps. stat3 is invalid.
when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
- .thenReturn(mAppEntry);
+ .thenReturn(mAppEntry);
when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId()))
- .thenReturn(mAppEntry);
+ .thenReturn(mAppEntry);
when(mAppState.getEntry(stat3.mPackageName, UserHandle.myUserId()))
- .thenReturn(null);
- when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(
- new ResolveInfo());
+ .thenReturn(null);
+ when(mPackageManager.resolveActivity(any(Intent.class), anyInt()))
+ .thenReturn(new ResolveInfo());
when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
- .thenReturn(stats);
+ .thenReturn(stats);
mAppEntry.info = mApplicationInfo;
mController.displayPreference(mScreen);
@@ -222,21 +217,15 @@
when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId())).thenReturn(stat2Entry);
// Only the regular app stat1 should have its intent resolve.
- when(mPackageManager.resolveActivity(argThat(intentMatcher(stat1.mPackageName)),
- anyInt())).thenReturn(new ResolveInfo());
+ when(mPackageManager.resolveActivity(argThat(intentMatcher(stat1.mPackageName)), anyInt()))
+ .thenReturn(new ResolveInfo());
when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
.thenReturn(stats);
// Make sure stat2 is considered an instant app.
ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
- (InstantAppDataProvider) (ApplicationInfo info) -> {
- if (info == stat2Entry.info) {
- return true;
- } else {
- return false;
- }
- });
+ (InstantAppDataProvider) (ApplicationInfo info) -> info == stat2Entry.info);
mController.displayPreference(mScreen);
@@ -289,13 +278,13 @@
// stat1, stat2 are not displayable
when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
- .thenReturn(mock(ApplicationsState.AppEntry.class));
+ .thenReturn(mock(ApplicationsState.AppEntry.class));
when(mAppState.getEntry(stat2.mPackageName, UserHandle.myUserId()))
- .thenReturn(mock(ApplicationsState.AppEntry.class));
- when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(
- new ResolveInfo());
+ .thenReturn(mock(ApplicationsState.AppEntry.class));
+ when(mPackageManager.resolveActivity(any(Intent.class), anyInt()))
+ .thenReturn(new ResolveInfo());
when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
- .thenReturn(stats);
+ .thenReturn(stats);
mController.displayPreference(mScreen);
@@ -307,18 +296,18 @@
@Test
public void display_showRecents_formatSummary() {
- final List<UsageStats> stats = new ArrayList<>();
final UsageStats stat1 = new UsageStats();
stat1.mLastTimeUsed = System.currentTimeMillis();
stat1.mPackageName = "pkg.class";
+ final List<UsageStats> stats = new ArrayList<>();
stats.add(stat1);
when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
- .thenReturn(mAppEntry);
- when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(
- new ResolveInfo());
+ .thenReturn(mAppEntry);
+ when(mPackageManager.resolveActivity(any(Intent.class), anyInt()))
+ .thenReturn(new ResolveInfo());
when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
- .thenReturn(stats);
+ .thenReturn(stats);
mAppEntry.info = mApplicationInfo;
mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java
index b0cf2f6..fd71af7 100644
--- a/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java
@@ -16,14 +16,12 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,7 +34,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SpecialAccessSettingsTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
index f17addd..bafb0ba 100644
--- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
@@ -22,22 +22,22 @@
import android.content.Context;
import android.support.v7.preference.Preference;
+
import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.datausage.DataSaverBackend;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SpecialAppAccessPreferenceControllerTest {
+
private Context mContext;
@Mock
private DataSaverBackend mBackend;
@@ -65,14 +65,14 @@
mController.updateState(mPreference);
- verify(mPreference).setSummary(mContext.getResources().getQuantityString(
- R.plurals.special_access_summary, 0, 0));
+ verify(mPreference).setSummary(mContext.getResources()
+ .getQuantityString(R.plurals.special_access_summary, 0, 0));
when(mBackend.getWhitelistedCount()).thenReturn(1);
mController.updateState(mPreference);
- verify(mPreference).setSummary(mContext.getResources().getQuantityString(
- R.plurals.special_access_summary, 1, 1));
+ verify(mPreference).setSummary(mContext.getResources()
+ .getQuantityString(R.plurals.special_access_summary, 1, 1));
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
index 2d821f3..79ada89 100644
--- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
@@ -26,7 +26,6 @@
import android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
@@ -35,11 +34,9 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UsageAccessDetailsTest {
private FakeFeatureFactory mFeatureFactory;
@@ -50,7 +47,7 @@
MockitoAnnotations.initMocks(this);
mFeatureFactory = FakeFeatureFactory.setupForTest();
mFragment = new UsageAccessDetails();
- mFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
+ mFragment.onAttach(RuntimeEnvironment.application);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
index 1a79869..516d248 100644
--- a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
@@ -23,7 +23,6 @@
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,10 +30,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VrListenerSettingsTest {
private FakeFeatureFactory mFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java
index 7d5eb31..d7c2964 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java
@@ -43,7 +43,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.ActionButtonPreference;
@@ -70,7 +69,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppActionButtonPreferenceControllerTest {
@Mock
@@ -337,5 +335,4 @@
return false;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
index 970b2ec..ec6e29a 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyDouble;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -39,7 +38,6 @@
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -56,7 +54,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppBatteryPreferenceControllerTest {
private static final int TARGET_UID = 111;
@@ -95,7 +92,7 @@
mFragment = spy(new AppInfoDashboardFragment());
- mBatteryPreference = spy(new Preference(mContext));
+ mBatteryPreference = spy(new Preference(RuntimeEnvironment.application));
mBatterySipper.drainType = BatterySipper.DrainType.IDLE;
mBatterySipper.uidObj = mUid;
@@ -103,7 +100,7 @@
doReturn(OTHER_UID).when(mOtherBatterySipper).getUid();
mController = spy(new AppBatteryPreferenceController(
- mContext, mFragment, "package1", null /* lifecycle */));
+ RuntimeEnvironment.application, mFragment, "package1", null /* lifecycle */));
mController.mBatteryUtils = mBatteryUtils;
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mBatteryPreference);
}
@@ -124,10 +121,10 @@
final List<BatterySipper> usageList = new ArrayList<>();
usageList.add(mBatterySipper);
usageList.add(mOtherBatterySipper);
- doReturn(usageList).when(mBatteryStatsHelper).getUsageList();
+ when(mBatteryStatsHelper.getUsageList()).thenReturn(usageList);
- assertThat(mController.findTargetSipper(mBatteryStatsHelper, TARGET_UID)).isEqualTo(
- mBatterySipper);
+ assertThat(mController.findTargetSipper(mBatteryStatsHelper, TARGET_UID))
+ .isEqualTo(mBatterySipper);
}
@Test
@@ -136,8 +133,8 @@
mController.updateBattery();
- assertThat(mBatteryPreference.getSummary()).isEqualTo(
- "No battery use since last full charge");
+ assertThat(mBatteryPreference.getSummary())
+ .isEqualTo("No battery use since last full charge");
}
@Test
@@ -187,8 +184,8 @@
mController.onResume();
- verify(mLoaderManager).restartLoader(AppInfoDashboardFragment.LOADER_BATTERY, Bundle.EMPTY,
- mController);
+ verify(mLoaderManager)
+ .restartLoader(AppInfoDashboardFragment.LOADER_BATTERY, Bundle.EMPTY, mController);
}
@Test
@@ -199,5 +196,4 @@
verify(mLoaderManager).destroyLoader(AppInfoDashboardFragment.LOADER_BATTERY);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
index 76160ee..b667fdb 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
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.eq;
@@ -36,7 +35,7 @@
import android.os.Bundle;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.datausage.AppDataUsage;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -47,11 +46,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppDataUsagePreferenceControllerTest {
@Mock
@@ -74,14 +71,16 @@
public void getAvailabilityStatus_bandwidthControlEnabled_shouldReturnAvailable() {
doReturn(true).when(mController).isBandwidthControlEnabled();
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getAvailabilityStatus_bandwidthControlDisabled_shouldReturnDisabled() {
doReturn(false).when(mController).isBandwidthControlEnabled();
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_UNSUPPORTED);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
}
@Test
@@ -134,5 +133,4 @@
verify(preference).setSummary(any());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
index ee870b7..553684d 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
@@ -39,7 +39,6 @@
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
@@ -52,10 +51,8 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppHeaderViewPreferenceControllerTest {
@Mock
@@ -86,8 +83,8 @@
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
when(mPreference.findViewById(R.id.entity_header)).thenReturn(mHeader);
- mController = new AppHeaderViewPreferenceController(mContext, mFragment, "Package1",
- mLifecycle);
+ mController =
+ new AppHeaderViewPreferenceController(mContext, mFragment, "Package1", mLifecycle);
}
@Test
@@ -111,7 +108,9 @@
mController.displayPreference(mScreen);
mController.refreshUi();
+ assertThat(title).isNotNull();
assertThat(title.getText()).isEqualTo(appLabel);
+ assertThat(summary).isNotNull();
assertThat(summary.getText()).isEqualTo(mContext.getString(R.string.installed));
}
@@ -128,5 +127,4 @@
verify(actionBar).setBackgroundDrawable(any(Drawable.class));
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
index a9dc472..761b746 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
@@ -17,12 +17,9 @@
package com.android.settings.applications.appinfo;
import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.ARG_PACKAGE_NAME;
-import static com.android.settings.applications.appinfo.AppInfoDashboardFragment
- .UNINSTALL_ALL_USERS_MENU;
+import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.UNINSTALL_ALL_USERS_MENU;
import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.UNINSTALL_UPDATES;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doNothing;
@@ -47,7 +44,6 @@
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
import com.android.settingslib.applications.AppUtils;
@@ -70,10 +66,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION
-)
public final class AppInfoDashboardFragmentTest {
private static final String PACKAGE_NAME = "test_package_name";
@@ -90,7 +82,6 @@
private AppInfoDashboardFragment mFragment;
private Context mShadowContext;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -302,7 +293,6 @@
ReflectionHelpers.setField(mFragment, "mPm", mPackageManager);
assertThat(mFragment.getNumberOfUserWithPackageInstalled(packageName)).isEqualTo(1);
-
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
index aadcb3e..ec6ac24 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
@@ -31,7 +31,7 @@
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.TestConfig;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
@@ -43,10 +43,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppInfoPreferenceControllerBaseTest {
@Mock
@@ -73,7 +71,8 @@
@Test
public void getAvailabilityStatus_shouldReturnAvailable() {
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@@ -102,7 +101,7 @@
private boolean preferenceUpdated;
- public TestPreferenceController(AppInfoDashboardFragment parent) {
+ private TestPreferenceController(AppInfoDashboardFragment parent) {
super(RuntimeEnvironment.application, parent, "TestKey");
}
@@ -122,7 +121,5 @@
bundle.putString("test", "test");
return bundle;
}
-
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java
index d8d11bc..846479f 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.any;
@@ -38,7 +37,7 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -47,10 +46,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppInstallerInfoPreferenceControllerTest {
@Mock
@@ -84,14 +81,16 @@
public void getAvailabilityStatus_managedProfile_shouldReturnDisabled() {
when(mUserManager.isManagedProfile()).thenReturn(true);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
public void getAvailabilityStatus_noAppLabel_shouldReturnDisabled() {
when(mUserManager.isManagedProfile()).thenReturn(false);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -100,7 +99,8 @@
when(mAppInfo.loadLabel(mPackageManager)).thenReturn("Label1");
mController = new AppInstallerInfoPreferenceController(mContext, mFragment, "Package1");
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@@ -142,5 +142,4 @@
verify(mPreference, never()).setEnabled(false);
verify(mPreference).setIntent(any(Intent.class));
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
index 1446c75..6a586d19 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
@@ -24,18 +24,17 @@
import android.content.Context;
import android.content.Intent;
+import android.os.UserManager;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.applications.ProcStatsData;
import com.android.settings.applications.ProcessStatsDetail;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,13 +42,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- ShadowUserManager.class
-})
public class AppMemoryPreferenceControllerTest {
@Mock
@@ -68,7 +65,8 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- ShadowUserManager.getShadow().setIsAdminUser(true);
+ UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+ Shadows.shadowOf(userManager).setIsAdminUser(true);
mController =
spy(new AppMemoryPreferenceController(mContext, mFragment, null /* lifecycle */));
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -77,17 +75,13 @@
when(mFragment.getActivity()).thenReturn(mActivity);
}
- @After
- public void tearDown() {
- ShadowUserManager.getShadow().reset();
- }
-
@Test
public void getAvailabilityStatus_developmentSettingsEnabled_shouldReturnAvailable() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@@ -96,7 +90,8 @@
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_UNSUPPORTED);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
}
@Test
@@ -105,7 +100,8 @@
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_UNSUPPORTED);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
}
@Test
@@ -114,7 +110,7 @@
Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(mController.DISABLED_DEPENDENT_SETTING);
+ .isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
}
@Test
@@ -131,5 +127,4 @@
assertThat(intentCaptor.getValue().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
.isEqualTo(ProcessStatsDetail.class.getName());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
index 8dc47f8..ba51b80 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
@@ -19,7 +19,6 @@
import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -33,7 +32,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -45,11 +43,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppNotificationPreferenceControllerTest {
@Mock
@@ -66,8 +62,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController =
- spy(new AppNotificationPreferenceController(mContext, mFragment));
+ mController = spy(new AppNotificationPreferenceController(mContext, mFragment));
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java
index c5003cc..848fcd5 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -31,7 +30,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.applications.AppLaunchSettings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.AppUtils;
@@ -44,11 +42,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppOpenByDefaultPreferenceControllerTest {
@Mock
@@ -160,5 +156,4 @@
verify(mPreference).setVisible(true);
verify(mPreference).setSummary(any());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
index f0b415c..43ae303 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
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;
@@ -33,7 +32,6 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
@@ -43,12 +41,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppPermissionPreferenceControllerTest {
@Mock
@@ -140,5 +136,4 @@
verify(mActivity).startActivityForResult(argThat(intent-> intent != null &&
Intent.ACTION_MANAGE_APP_PERMISSIONS.equals(intent.getAction())), anyInt());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java
index c069517..588db2a 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -31,7 +30,6 @@
import android.os.Bundle;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.applications.AppStorageSettings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -43,10 +41,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppStoragePreferenceControllerTest {
@Mock
@@ -120,5 +116,4 @@
assertThat(mController.getStorageSummary(stats, false))
.isEqualTo("1 B used in internal storage");
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
index d6ecf3e..928e9eb 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
@@ -24,7 +24,6 @@
import android.content.pm.PackageInfo;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -33,10 +32,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppVersionPreferenceControllerTest {
@Mock
@@ -64,5 +61,4 @@
verify(mPreference).setSummary("version test1234");
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
index 8667f74..e8e4032 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -30,7 +29,6 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.applications.DefaultAppSettings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -40,10 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultAppShortcutPreferenceControllerBaseTest {
@Mock
@@ -126,7 +122,7 @@
private boolean isDefault;
private boolean capable;
- public TestPreferenceController(Context context, AppInfoDashboardFragment parent) {
+ private TestPreferenceController(Context context, AppInfoDashboardFragment parent) {
super(context, "TestKey", "TestPackage");
}
@@ -139,7 +135,5 @@
protected boolean isDefaultApp() {
return isDefault;
}
-
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java
index c7c63f1..34a9e2e 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.spy;
@@ -28,7 +27,6 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,13 +35,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultBrowserShortcutPreferenceControllerTest {
@Mock
@@ -92,5 +88,4 @@
public void isDefaultApp_notDefaultBrowser_shouldReturnFalse() {
assertThat(mController.isDefaultApp()).isFalse();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java
index 740847d..999e802 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.spy;
@@ -29,7 +28,6 @@
import android.provider.Settings;
import android.telephony.TelephonyManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,13 +36,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultEmergencyShortcutPreferenceControllerTest {
@Mock
@@ -94,5 +90,4 @@
public void isDefaultApp_notDefaultEmergency_shouldReturnFalse() {
assertThat(mController.isDefaultApp()).isFalse();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java
index 1164b38..5536cff 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -26,7 +25,6 @@
import android.content.Context;
import android.content.pm.PackageManager;
-import com.android.settings.TestConfig;
import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,7 +39,6 @@
import org.robolectric.annotation.Implements;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultHomeShortcutPreferenceControllerTest {
@Mock
@@ -95,5 +92,4 @@
return true;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java
index c7993bc..cd6a3ae 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java
@@ -17,14 +17,12 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.pm.PackageManager;
-import com.android.settings.TestConfig;
import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,7 +37,6 @@
import org.robolectric.annotation.Implements;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultPhoneShortcutPreferenceControllerTest {
@Mock
@@ -95,5 +92,4 @@
return true;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
index 2c9b6c7..35f3d61 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
@@ -17,14 +17,12 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.pm.PackageManager;
-import com.android.settings.TestConfig;
import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,7 +37,6 @@
import org.robolectric.annotation.Implements;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultSmsShortcutPreferenceControllerTest {
@Mock
@@ -95,5 +92,4 @@
return true;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java
index 18a29e3..de3f868 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java
@@ -18,9 +18,7 @@
import static android.Manifest.permission.SYSTEM_ALERT_WINDOW;
import static android.Manifest.permission.WRITE_SETTINGS;
-
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.verify;
@@ -31,7 +29,7 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,10 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DrawOverlayDetailPreferenceControllerTest {
@Mock
@@ -70,7 +66,8 @@
public void getAvailabilityStatus_managedProfile_shouldReturnDisabled() {
when(mUserManager.isManagedProfile()).thenReturn(true);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -78,7 +75,8 @@
when(mUserManager.isManagedProfile()).thenReturn(false);
when(mFragment.getPackageInfo()).thenReturn(new PackageInfo());
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -88,7 +86,8 @@
info.requestedPermissions = new String[] {WRITE_SETTINGS};
when(mFragment.getPackageInfo()).thenReturn(info);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -98,7 +97,8 @@
info.requestedPermissions = new String[] {SYSTEM_ALERT_WINDOW};
when(mFragment.getPackageInfo()).thenReturn(info);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@@ -115,5 +115,4 @@
verify(mPreference).setSummary(summary);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java
index 7ac112a..6f134ae 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java
@@ -16,26 +16,23 @@
package com.android.settings.applications.appinfo;
+import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
-
import android.app.Activity;
import android.content.Context;
-
import android.view.Window;
import android.view.WindowManager.LayoutParams;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
-
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAppInfoBase;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,11 +41,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DrawOverlayDetailsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -74,8 +70,7 @@
@Test
public void logSpecialPermissionChange() {
- when(mFragment.getContext()).thenReturn(
- ShadowApplication.getInstance().getApplicationContext());
+ when(mFragment.getContext()).thenReturn(RuntimeEnvironment.application);
mFragment.logSpecialPermissionChange(true, "app");
verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java
index 7e542f7..7ad3d18 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
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.verify;
@@ -27,7 +26,7 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ExternalSourceDetailPreferenceControllerTest {
@Mock
@@ -67,7 +64,8 @@
public void getAvailabilityStatus_managedProfile_shouldReturnDisabled() {
when(mUserManager.isManagedProfile()).thenReturn(true);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -75,7 +73,8 @@
when(mUserManager.isManagedProfile()).thenReturn(false);
doReturn(false).when(mController).isPotentialAppSource();
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -83,7 +82,8 @@
when(mUserManager.isManagedProfile()).thenReturn(false);
doReturn(true).when(mController).isPotentialAppSource();
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@@ -100,5 +100,4 @@
verify(mPreference).setSummary(summary);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
index ce38a56..4f89615 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.mock;
@@ -27,7 +26,6 @@
import android.content.pm.PackageInfo;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.applications.AppStateInstallAppsBridge;
import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,11 +36,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ExternalSourcesDetailsTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java
index 24823fe..8a85d70 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
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;
@@ -46,8 +45,8 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
@@ -59,11 +58,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class InstantAppButtonsPreferenceControllerTest {
private static final String TEST_INSTALLER_PACKAGE_NAME = "com.installer";
@@ -115,7 +112,8 @@
ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
(InstantAppDataProvider) (i -> false));
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -123,7 +121,8 @@
ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
(InstantAppDataProvider) (i -> true));
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@@ -295,5 +294,4 @@
verify(packageManagerWrapper)
.deletePackageAsUser(eq(TEST_AIA_PACKAGE_NAME), any(), anyInt(),anyInt());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java
index bb0b42a..5dc09e5 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -30,8 +29,8 @@
import android.content.pm.PackageManager;
import android.util.ArraySet;
-import com.android.settings.TestConfig;
import com.android.settings.applications.AppDomainsPreference;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
@@ -42,14 +41,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class InstantAppDomainsPreferenceControllerTest {
@Mock
@@ -81,7 +78,8 @@
ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
(InstantAppDataProvider) (i -> false));
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -89,7 +87,8 @@
ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
(InstantAppDataProvider) (i -> true));
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@@ -108,5 +107,4 @@
verify(mPreference).setTitles(domain);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java
index 9322966..ddd1b21 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
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.verify;
@@ -27,7 +26,7 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PictureInPictureDetailPreferenceControllerTest {
@Mock
@@ -65,14 +62,16 @@
public void getAvailabilityStatus_noPictureInPictureActivities_shouldReturnDisabled() {
doReturn(false).when(mController).hasPictureInPictureActivites();
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
public void getAvailabilityStatus_hasPictureInPictureActivities_shouldReturnAvailable() {
doReturn(true).when(mController).hasPictureInPictureActivites();
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@@ -89,5 +88,4 @@
verify(mPreference).setSummary(summary);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java
index da603ca..2ddf22a 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java
@@ -24,7 +24,6 @@
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.ActivityInfoWrapper;
@@ -33,10 +32,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PictureInPictureDetailsTest {
private FakeFeatureFactory mFeatureFactory;
@@ -102,7 +99,7 @@
private boolean mSupportsPictureInPicture;
- public MockActivityInfo(boolean supportsPictureInPicture) {
+ private MockActivityInfo(boolean supportsPictureInPicture) {
super(null);
mSupportsPictureInPicture = supportsPictureInPicture;
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java
index 26453cd..3ea2a16 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
@@ -28,33 +27,27 @@
import android.content.pm.UserInfo;
import android.util.Pair;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.UserManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
-
import com.google.common.collect.ImmutableList;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PictureInPictureSettingsTest {
private static final int PRIMARY_USER_ID = 0;
private static final int PROFILE_USER_ID = 10;
- private FakeFeatureFactory mFeatureFactory;
private PictureInPictureSettings mFragment;
@Mock
private PackageManagerWrapper mPackageManager;
@@ -66,7 +59,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mFeatureFactory = FakeFeatureFactory.setupForTest();
+ FakeFeatureFactory.setupForTest();
mFragment = new PictureInPictureSettings(mPackageManager, mUserManager);
mPrimaryUserPackages = new ArrayList<>();
mProfileUserPackages = new ArrayList<>();
@@ -80,8 +73,8 @@
UserInfo profileUserInfo = new UserInfo();
profileUserInfo.id = PROFILE_USER_ID;
- when(mUserManager.getProfiles(PRIMARY_USER_ID)).thenReturn(
- ImmutableList.of(primaryUserInfo, profileUserInfo));
+ when(mUserManager.getProfiles(PRIMARY_USER_ID))
+ .thenReturn(ImmutableList.of(primaryUserInfo, profileUserInfo));
}
@Test
@@ -96,7 +89,7 @@
mProfileUserPackages.add(profileP1);
mProfileUserPackages.add(profileP2);
- ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
+ List<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
assertThat(containsPackages(apps, primaryP1, profileP2)).isTrue();
assertThat(containsPackages(apps, primaryP2, profileP1)).isFalse();
}
@@ -117,17 +110,17 @@
mProfileUserPackages.add(profileP2);
mProfileUserPackages.add(profileP3);
- ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
- Collections.sort(apps, new PictureInPictureSettings.AppComparator(null));
+ List<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
+ apps.sort(new PictureInPictureSettings.AppComparator(null));
assertThat(isOrdered(apps, primaryP1, profileP1, primaryP2, profileP2, primaryP3)).isTrue();
}
- private boolean containsPackages(ArrayList<Pair<ApplicationInfo, Integer>> apps,
+ private boolean containsPackages(List<Pair<ApplicationInfo, Integer>> apps,
PackageInfo... packages) {
- for (int i = 0; i < packages.length; i++) {
+ for (PackageInfo aPackage : packages) {
boolean found = false;
- for (int j = 0; j < apps.size(); j++) {
- if (apps.get(j).first == packages[i].applicationInfo) {
+ for (Pair<ApplicationInfo, Integer> app : apps) {
+ if (app.first == aPackage.applicationInfo) {
found = true;
break;
}
@@ -139,8 +132,7 @@
return true;
}
- private boolean isOrdered(ArrayList<Pair<ApplicationInfo, Integer>> apps,
- PackageInfo... packages) {
+ private boolean isOrdered(List<Pair<ApplicationInfo, Integer>> apps, PackageInfo... packages) {
if (apps.size() != packages.length) {
return false;
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java
index edcf64b..d9e4ad4 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSettingsDetailsTest.java
@@ -23,7 +23,6 @@
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,10 +30,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WriteSettingsDetailsTest {
private FakeFeatureFactory mFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java
index 08133f0..c158595 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java
@@ -18,9 +18,7 @@
import static android.Manifest.permission.SYSTEM_ALERT_WINDOW;
import static android.Manifest.permission.WRITE_SETTINGS;
-
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.verify;
@@ -31,7 +29,7 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,10 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WriteSystemSettingsPreferenceControllerTest {
@Mock
@@ -70,7 +66,8 @@
public void getAvailabilityStatus_managedProfile_shouldReturnDisabled() {
when(mUserManager.isManagedProfile()).thenReturn(true);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -78,7 +75,8 @@
when(mUserManager.isManagedProfile()).thenReturn(false);
when(mFragment.getPackageInfo()).thenReturn(new PackageInfo());
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -88,7 +86,8 @@
info.requestedPermissions = new String[] {SYSTEM_ALERT_WINDOW};
when(mFragment.getPackageInfo()).thenReturn(info);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.DISABLED_FOR_USER);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
}
@Test
@@ -98,7 +97,8 @@
info.requestedPermissions = new String[] {WRITE_SETTINGS};
when(mFragment.getPackageInfo()).thenReturn(info);
- assertThat(mController.getAvailabilityStatus()).isEqualTo(mController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@@ -115,5 +115,4 @@
verify(mPreference).setSummary(summary);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
index 968f049..61a0139 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
@@ -17,9 +17,7 @@
package com.android.settings.applications.assist;
import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-
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;
@@ -33,7 +31,6 @@
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.TwoStatePreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,11 +40,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AssistContextPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
index 57b809e..c8c2ca2 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
@@ -17,9 +17,7 @@
package com.android.settings.applications.assist;
import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-
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;
@@ -36,7 +34,6 @@
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.TwoStatePreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -52,7 +49,6 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AssistFlashScreenPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
index f0956c7..e046219 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
@@ -16,27 +16,21 @@
package com.android.settings.applications.assist;
-
import android.net.Uri;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AssistSettingObserverTest {
- private AssistSettingObserver mObserver;
-
@Test
public void callConstructor_shouldNotCrash() {
- mObserver = new AssistSettingObserver() {
+ new AssistSettingObserver() {
@Override
protected List<Uri> getSettingUris() {
return null;
@@ -48,5 +42,4 @@
}
};
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
index 65f0b46..0ccba4d 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
@@ -16,31 +16,27 @@
package com.android.settings.applications.assist;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
import android.content.ComponentName;
import android.content.Context;
import android.provider.Settings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultAssistPickerTest {
private static ComponentName sTestAssist;
@@ -71,8 +67,7 @@
assertThat(Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.ASSISTANT))
.isEqualTo(sTestAssist.flattenToString());
- assertThat(mPicker.getDefaultKey())
- .isEqualTo(sTestAssist.flattenToString());
+ assertThat(mPicker.getDefaultKey()).isEqualTo(sTestAssist.flattenToString());
}
@Test
@@ -84,8 +79,7 @@
assertThat(Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.ASSISTANT))
.isEmpty();
- assertThat(mPicker.getDefaultKey())
- .isNull();
+ assertThat(mPicker.getDefaultKey()).isNull();
}
@Test
@@ -98,7 +92,6 @@
assertThat(Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.ASSISTANT))
.isEmpty();
- assertThat(mPicker.getDefaultKey())
- .isNull();
+ assertThat(mPicker.getDefaultKey()).isNull();
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
index fc1adef..320471c 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
@@ -39,7 +39,6 @@
import android.provider.Settings;
import com.android.internal.app.AssistUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -49,15 +48,14 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultAssistPreferenceControllerTest {
private static final String TEST_KEY = "test_pref_key";
@@ -91,8 +89,7 @@
@Test
public void getPrefKey_shouldReturnKey() {
- assertThat(mController.getPreferenceKey())
- .isEqualTo(TEST_KEY);
+ assertThat(mController.getPreferenceKey()).isEqualTo(TEST_KEY);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
index 1b4fb09..ab4f301 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/ManageAssistTest.java
@@ -16,20 +16,17 @@
package com.android.settings.applications.assist;
+import static com.google.common.truth.Truth.assertThat;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ManageAssistTest {
private ManageAssist mSettings;
@@ -52,8 +49,6 @@
@Test
public void testGetPreferenceScreenResId() {
- assertThat(mSettings.getPreferenceScreenResId())
- .isEqualTo(R.xml.manage_assist);
+ assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.manage_assist);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
index 26802ee..1c0130a 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
@@ -16,7 +16,6 @@
package com.android.settings.applications.defaultapps;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
@@ -33,7 +32,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.RadioButtonPreference;
@@ -46,13 +44,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultAppPickerFragmentTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
index 7a82f30..e87d16f 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
@@ -26,7 +26,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.TwoTargetPreference;
@@ -37,10 +36,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultAppPreferenceControllerTest {
private static final String TEST_APP_NAME = "test";
@@ -64,8 +61,7 @@
public void updateState_hasDefaultApp_shouldUpdateAppName() {
mController = new TestPreferenceController(mContext);
- when(mController.mAppInfo.loadLabel())
- .thenReturn(TEST_APP_NAME);
+ when(mController.mAppInfo.loadLabel()).thenReturn(TEST_APP_NAME);
mController.updateState(mPreference);
@@ -95,7 +91,7 @@
private DefaultAppInfo mAppInfo;
- public TestPreferenceController(Context context) {
+ private TestPreferenceController(Context context) {
super(context);
mAppInfo = mock(DefaultAppInfo.class);
}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
index 5b8807c..35ce6ca 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
@@ -26,7 +26,6 @@
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -39,11 +38,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultAutofillPickerTest {
private static final String TEST_APP_KEY = "foo.bar/foo.bar.Baz";
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
index 4adebe0..24c7418 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
@@ -16,8 +16,13 @@
package com.android.settings.applications.defaultapps;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
-import android.content.pm.PackageManager;
import android.os.UserManager;
import android.provider.Settings;
import android.support.v7.preference.Preference;
@@ -25,7 +30,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.wrapper.AutofillManagerWrapper;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -37,17 +41,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultAutofillPreferenceControllerTest {
@Mock
@@ -102,8 +98,6 @@
Settings.Secure.putString(RuntimeEnvironment.application.getContentResolver(),
DefaultAutofillPicker.SETTING, "com.android.settings/SettingsActivity.class");
- final DefaultAppInfo info = mController.getDefaultAppInfo();
-
- assertThat(info).isNotNull();
+ assertThat(mController.getDefaultAppInfo()).isNotNull();
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
index e8a6c1e..4f4c90e 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
@@ -16,12 +16,16 @@
package com.android.settings.applications.defaultapps;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.app.Activity;
import android.content.Context;
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -30,16 +34,9 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultBrowserPickerTest {
private static final String TEST_APP_KEY = "";
@@ -67,14 +64,12 @@
@Test
public void setDefaultAppKey_shouldUpdateDefaultBrowser() {
mPicker.setDefaultKey(TEST_APP_KEY);
- verify(mPackageManager)
- .setDefaultBrowserPackageNameAsUser(eq(TEST_APP_KEY), anyInt());
+ verify(mPackageManager).setDefaultBrowserPackageNameAsUser(eq(TEST_APP_KEY), anyInt());
}
@Test
public void getDefaultAppKey_shouldReturnDefaultBrowser() {
mPicker.getDefaultKey();
- verify(mPackageManager)
- .getDefaultBrowserPackageNameAsUser(anyInt());
+ verify(mPackageManager).getDefaultBrowserPackageNameAsUser(anyInt());
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
index 8d527ff..d59cf17 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
@@ -16,6 +16,13 @@
package com.android.settings.applications.defaultapps;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.content.Intent;
import android.content.pm.ResolveInfo;
@@ -24,7 +31,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -33,22 +39,11 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultBrowserPreferenceControllerTest {
@Mock
@@ -78,10 +73,8 @@
@Test
public void isAvailable_hasBrowser_shouldReturnTrue() {
- final List<ResolveInfo> candidates = new ArrayList<>();
- candidates.add(new ResolveInfo());
when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
- .thenReturn(candidates);
+ .thenReturn(Collections.singletonList(new ResolveInfo()));
assertThat(mController.isAvailable()).isTrue();
}
@@ -104,12 +97,10 @@
@Test
public void isBrowserDefault_onlyApp_shouldReturnTrue() {
- final String testPkg = "pkg";
- when(mPackageManager.getDefaultBrowserPackageNameAsUser(anyInt()))
- .thenReturn(null);
+ when(mPackageManager.getDefaultBrowserPackageNameAsUser(anyInt())).thenReturn(null);
when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
- .thenReturn(Arrays.asList(new ResolveInfo()));
+ .thenReturn(Collections.singletonList(new ResolveInfo()));
- assertThat(mController.isBrowserDefault(testPkg, 0)).isTrue();
+ assertThat(mController.isBrowserDefault("pkg", 0)).isTrue();
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
index 124817a..3fe7dc1 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
@@ -16,13 +16,17 @@
package com.android.settings.applications.defaultapps;
+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.app.Activity;
import android.content.Context;
import android.os.UserManager;
import android.provider.Settings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -32,16 +36,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-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;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultEmergencyPickerTest {
private static final String TEST_APP_KEY = "test_app";
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
index 0aab5fb..9e85e0e 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
@@ -16,6 +16,18 @@
package com.android.settings.applications.defaultapps;
+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.anyList;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
@@ -30,7 +42,6 @@
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -41,26 +52,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
-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.anyList;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultHomePickerTest {
private static final String TEST_APP_KEY = "com.android.settings/DefaultEmergencyPickerTest";
@@ -103,8 +100,7 @@
@Test
public void getDefaultAppKey_shouldReturnDefault() {
final ComponentName cn = mock(ComponentName.class);
- when(mPackageManagerWrapper.getHomeActivities(anyList()))
- .thenReturn(cn);
+ when(mPackageManagerWrapper.getHomeActivities(anyList())).thenReturn(cn);
mPicker.getDefaultKey();
verify(cn).flattenToString();
}
@@ -122,9 +118,11 @@
}
@Test
- public void getCandidates_onlyLollipopPlusLaunchersAvailableIfManagedProfile()
- throws NameNotFoundException {
- createManagedProfile();
+ public void getCandidates_onlyLollipopPlusLaunchersAvailableIfManagedProfile() {
+ List<UserInfo> profiles = new ArrayList<>();
+ profiles.add(new UserInfo(/*id=*/ 10, "TestUserName", UserInfo.FLAG_MANAGED_PROFILE));
+ when(mUserManager.getProfiles(anyInt())).thenReturn(profiles);
+
addLaunchers();
List<DefaultAppInfo> candidates = mPicker.getCandidates();
assertThat(candidates.size()).isEqualTo(2);
@@ -137,12 +135,6 @@
assertThat(preLollipopLauncher.enabled).isFalse();
}
- private void createManagedProfile() {
- ArrayList<UserInfo> profiles = new ArrayList<UserInfo>();
- profiles.add(new UserInfo(/*id=*/ 10, "TestUserName", UserInfo.FLAG_MANAGED_PROFILE));
- when(mUserManager.getProfiles(anyInt())).thenReturn(profiles);
- }
-
private ResolveInfo createLauncher(
String packageName, String className, int targetSdk) throws NameNotFoundException {
ResolveInfo launcher = new ResolveInfo();
@@ -156,7 +148,7 @@
return launcher;
}
- private void addLaunchers() throws NameNotFoundException {
+ private void addLaunchers() {
doAnswer(invocation -> {
// The result of this method is stored in the first parameter...
List<ResolveInfo> parameter = (List<ResolveInfo>) invocation.getArguments()[0];
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
index ad1a1cb..2aa2fa6 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.defaultapps;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Matchers.anyList;
@@ -34,7 +33,6 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -44,15 +42,14 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.Arrays;
-
+import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultHomePreferenceControllerTest {
@Mock
@@ -130,17 +127,17 @@
@Test
public void testGetSettingIntent_homeHasNoSetting_shouldNotReturnSettingIntent() {
- when(mPackageManager.getHomeActivities(anyList())).thenReturn(
- new ComponentName("test.pkg", "class"));
+ when(mPackageManager.getHomeActivities(anyList()))
+ .thenReturn(new ComponentName("test.pkg", "class"));
assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull();
}
@Test
public void testGetSettingIntent_homeHasOneSetting_shouldReturnSettingIntent() {
- when(mPackageManager.getHomeActivities(anyList())).thenReturn(
- new ComponentName("test.pkg", "class"));
- when(mPackageManager.queryIntentActivities(any(), eq(0))).thenReturn(
- Arrays.asList(mock(ResolveInfo.class)));
+ when(mPackageManager.getHomeActivities(anyList()))
+ .thenReturn(new ComponentName("test.pkg", "class"));
+ when(mPackageManager.queryIntentActivities(any(), eq(0)))
+ .thenReturn(Collections.singletonList(mock(ResolveInfo.class)));
Intent intent = mController.getSettingIntent(mController.getDefaultAppInfo());
assertThat(intent).isNotNull();
@@ -149,10 +146,10 @@
@Test
public void testGetSettingIntent_homeHasMultipleSettings_shouldNotReturnSettingIntent() {
- when(mPackageManager.getHomeActivities(anyList())).thenReturn(
- new ComponentName("test.pkg", "class"));
- when(mPackageManager.queryIntentActivities(any(), eq(0))).thenReturn(
- Arrays.asList(mock(ResolveInfo.class), mock(ResolveInfo.class)));
+ when(mPackageManager.getHomeActivities(anyList()))
+ .thenReturn(new ComponentName("test.pkg", "class"));
+ when(mPackageManager.queryIntentActivities(any(), eq(0)))
+ .thenReturn(Arrays.asList(mock(ResolveInfo.class), mock(ResolveInfo.class)));
assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull();
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
index 6a73269..48664d5 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.nfc.PaymentBackend;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,11 +37,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultPaymentSettingsPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
index f2b7db8..b752c09 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
@@ -16,12 +16,19 @@
package com.android.settings.applications.defaultapps;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+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 static org.mockito.Mockito.when;
+
import android.app.Activity;
import android.content.Context;
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -31,19 +38,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-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 static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultPhonePickerTest {
private static final String TEST_APP_KEY = "com.android.settings/PickerTest";
@@ -83,8 +80,8 @@
public void setDefaultAppKey_shouldUpdateDefault() {
mPicker.setDefaultKey(TEST_APP_KEY);
- verify(mDefaultKeyUpdater).setDefaultDialerApplication(
- any(Context.class), eq(TEST_APP_KEY), anyInt());
+ verify(mDefaultKeyUpdater)
+ .setDefaultDialerApplication(any(Context.class), eq(TEST_APP_KEY), anyInt());
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
index 91e68ea..f581076 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
@@ -16,12 +16,18 @@
package com.android.settings.applications.defaultapps;
+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 static org.mockito.Mockito.when;
+
import android.app.Activity;
import android.content.Context;
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -31,18 +37,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-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 static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultSmsPickerTest {
private static final String TEST_APP_KEY = "com.android.settings/PickerTest";
@@ -83,5 +80,4 @@
verify(mDefaultKeyUpdater).getDefaultApplication(any(Context.class));
}
-
}
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
index 7e19d57..cf0e299 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
@@ -16,26 +16,20 @@
package com.android.settings.applications.manageapplications;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
- .FILTER_APPS_BLOCKED;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
- .FILTER_APPS_ENABLED;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
- .FILTER_APPS_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_BLOCKED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ENABLED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS;
import static com.google.common.truth.Truth.assertThat;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.AppStateUsageBridge;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppFilterItemTest {
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
index 3fe5e67..a62a8c3 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
@@ -16,76 +16,53 @@
package com.android.settings.applications.manageapplications;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
- .FILTER_APPS_ALL;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
- .FILTER_APPS_INSTALL_SOURCES;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
- .FILTER_APPS_POWER_WHITELIST;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
- .FILTER_APPS_USAGE_ACCESS;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
- .FILTER_APPS_WITH_OVERLAY;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
- .FILTER_APPS_WRITE_SETTINGS;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_GAMES;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_HIGH_POWER;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_MAIN;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_MANAGE_SOURCES;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_MOVIES;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_NOTIFICATION;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_OVERLAY;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_PHOTOGRAPHY;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_STORAGE;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_USAGE_ACCESS;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_WRITE_SETTINGS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTALL_SOURCES;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WITH_OVERLAY;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WRITE_SETTINGS;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MANAGE_SOURCES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MOVIES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_OVERLAY;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_PHOTOGRAPHY;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_STORAGE;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_WRITE_SETTINGS;
import static com.google.common.truth.Truth.assertThat;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppFilterRegistryTest {
- @Test
- public void getDefaultType_shouldMatchForAllListType() {
- final AppFilterRegistry registry = AppFilterRegistry.getInstance();
- assertThat(registry.getDefaultFilterType(LIST_TYPE_USAGE_ACCESS))
- .isEqualTo(FILTER_APPS_USAGE_ACCESS);
- assertThat(registry.getDefaultFilterType(LIST_TYPE_HIGH_POWER))
- .isEqualTo(FILTER_APPS_POWER_WHITELIST);
- assertThat(registry.getDefaultFilterType(LIST_TYPE_OVERLAY)).isEqualTo(
- FILTER_APPS_WITH_OVERLAY);
- assertThat(registry.getDefaultFilterType(LIST_TYPE_WRITE_SETTINGS)).isEqualTo(
- FILTER_APPS_WRITE_SETTINGS);
- assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES)).isEqualTo(
- FILTER_APPS_INSTALL_SOURCES);
+ @Test
+ public void getDefaultType_shouldMatchForAllListType() {
+ final AppFilterRegistry registry = AppFilterRegistry.getInstance();
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_USAGE_ACCESS))
+ .isEqualTo(FILTER_APPS_USAGE_ACCESS);
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_HIGH_POWER))
+ .isEqualTo(FILTER_APPS_POWER_WHITELIST);
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_OVERLAY))
+ .isEqualTo(FILTER_APPS_WITH_OVERLAY);
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_WRITE_SETTINGS))
+ .isEqualTo(FILTER_APPS_WRITE_SETTINGS);
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES))
+ .isEqualTo(FILTER_APPS_INSTALL_SOURCES);
- assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN))
- .isEqualTo(FILTER_APPS_ALL);
- assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
- .isEqualTo(FILTER_APPS_ALL);
- assertThat(registry.getDefaultFilterType(LIST_TYPE_STORAGE)).isEqualTo(FILTER_APPS_ALL);
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN)).isEqualTo(FILTER_APPS_ALL);
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION)).isEqualTo(FILTER_APPS_ALL);
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_STORAGE)).isEqualTo(FILTER_APPS_ALL);
- assertThat(registry.getDefaultFilterType(LIST_TYPE_GAMES)).isEqualTo(FILTER_APPS_ALL);
- assertThat(registry.getDefaultFilterType(LIST_TYPE_MOVIES)).isEqualTo(FILTER_APPS_ALL);
- assertThat(registry.getDefaultFilterType(LIST_TYPE_PHOTOGRAPHY)).isEqualTo(FILTER_APPS_ALL);
- }
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_GAMES)).isEqualTo(FILTER_APPS_ALL);
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_MOVIES)).isEqualTo(FILTER_APPS_ALL);
+ assertThat(registry.getDefaultFilterType(LIST_TYPE_PHOTOGRAPHY)).isEqualTo(FILTER_APPS_ALL);
+ }
}
-
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java
index c32b262..a18bf1f 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java
@@ -26,7 +26,6 @@
import android.widget.FrameLayout;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
@@ -34,10 +33,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ApplicationViewHolderTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
index 5341109..ca9ddcf 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
@@ -16,15 +16,10 @@
package com.android.settings.applications.manageapplications;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
- .FILTER_APPS_ALL;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_MAIN;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .LIST_TYPE_NOTIFICATION;
-
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION;
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.eq;
@@ -47,11 +42,7 @@
import android.view.ViewGroup;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.widget.LoadingViewController;
import com.android.settingslib.applications.ApplicationsState;
@@ -61,24 +52,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.fakes.RoboMenuItem;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
-/**
- * Tests for {@link ManageApplications}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-// TODO: Consider making the shadow class set global using a robolectric.properties file.
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowTheme.class,
- ShadowEventLogWriter.class
- })
public class ManageApplicationsTest {
@Mock
@@ -88,7 +67,6 @@
@Mock
private Menu mMenu;
private MenuItem mAppReset;
- private Looper mBgLooper;
private ManageApplications mFragment;
@Before
@@ -97,8 +75,7 @@
mAppReset = new RoboMenuItem(R.id.reset_app_preferences);
ReflectionHelpers.setStaticField(ApplicationsState.class, "sInstance", mState);
when(mState.newSession(any())).thenReturn(mSession);
- mBgLooper = Looper.myLooper();
- when(mState.getBackgroundLooper()).thenReturn(mBgLooper);
+ when(mState.getBackgroundLooper()).thenReturn(Looper.myLooper());
mFragment = new ManageApplications();
}
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
index 47a08e9..776235c 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.manageapplications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -32,7 +31,6 @@
import android.view.View;
import android.widget.FrameLayout;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.StorageStatsSource;
@@ -44,11 +42,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MusicViewHolderControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Fragment mFragment;
@@ -57,20 +52,17 @@
private Context mContext;
private MusicViewHolderController mController;
- private VolumeInfo mVolume;
- private View mView;
private ApplicationViewHolder mHolder;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mVolume = new VolumeInfo("id", 0, null, "id");
- mController = new MusicViewHolderController(mContext, mSource, mVolume.fsUuid,
- new UserHandle(0));
+ final String fsUuid = new VolumeInfo("id", 0, null, "id").fsUuid;
+ mController = new MusicViewHolderController(mContext, mSource, fsUuid, new UserHandle(0));
- mView = ApplicationViewHolder.newView(new FrameLayout(mContext));
- mHolder = new ApplicationViewHolder(mView, false /* useStableHeight */);
+ View view = ApplicationViewHolder.newView(new FrameLayout(mContext));
+ mHolder = new ApplicationViewHolder(view, false /* useStableHeight */);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
index e87e3f0..fc8f272 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.manageapplications;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -31,7 +30,6 @@
import android.view.View;
import android.widget.FrameLayout;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.StorageStatsSource;
@@ -43,10 +41,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PhotosViewHolderControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Fragment mFragment;
@@ -55,42 +51,37 @@
private Context mContext;
private PhotosViewHolderController mController;
- private VolumeInfo mVolume;
- private View mView;
private ApplicationViewHolder mHolder;
-
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mVolume = new VolumeInfo("id", 0, null, "id");
- mController =
- new PhotosViewHolderController(
- mContext, mSource, mVolume.fsUuid, new UserHandle(0));
+ final String fsUuid = new VolumeInfo("id", 0, null, "id").fsUuid;
+ mController = new PhotosViewHolderController(mContext, mSource, fsUuid, new UserHandle(0));
- mView = ApplicationViewHolder.newView(new FrameLayout(mContext));
- mHolder = new ApplicationViewHolder(mView, false /* useStableHeight */);
+ final View view = ApplicationViewHolder.newView(new FrameLayout(mContext));
+ mHolder = new ApplicationViewHolder(view, false /* useStableHeight */);
}
@Test
public void storageShouldBeZeroBytesIfQueriedBeforeStorageQueryFinishes() {
mController.setupView(mHolder);
- assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
- Formatter.formatFileSize(mContext, 0));
+ assertThat(mHolder.mSummary.getText().toString())
+ .isEqualTo(Formatter.formatFileSize(mContext, 0));
}
@Test
public void storageShouldRepresentStorageStatsQuery() throws Exception {
when(mSource.getExternalStorageStats(nullable(String.class), nullable(UserHandle.class)))
- .thenReturn(new StorageStatsSource.ExternalStorageStats(1, 0, 1, 10, 0));
+ .thenReturn(new StorageStatsSource.ExternalStorageStats(1, 0, 1, 10, 0));
mController.queryStats();
mController.setupView(mHolder);
- assertThat(mHolder.mSummary.getText().toString()).isEqualTo(
- Formatter.formatFileSize(mContext, 11));
+ assertThat(mHolder.mSummary.getText().toString())
+ .isEqualTo(Formatter.formatFileSize(mContext, 11));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
index 0c98ddc..23c5d44 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
@@ -17,22 +17,17 @@
package com.android.settings.backup;
import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.backup.BackupManager;
import android.content.Context;
-import android.os.RemoteException;
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -45,9 +40,9 @@
import org.robolectric.annotation.Implements;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class})
+@Config(shadows = BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class)
public class BackupSettingsActivityPreferenceControllerTest {
+
private static final String KEY_BACKUP_SETTINGS = "backup_settings";
private Context mContext;
@@ -55,8 +50,6 @@
private UserManager mUserManager;
@Mock
- private PreferenceScreen mScreen;
- @Mock
private Preference mBackupPreference;
private BackupSettingsActivityPreferenceController mController;
@@ -64,7 +57,7 @@
private static boolean mBackupEnabled;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
@@ -73,7 +66,7 @@
}
@Test
- public void updateState_backupOn() throws RemoteException {
+ public void updateState_backupOn() {
mBackupEnabled = true;
mController.updateState(mBackupPreference);
@@ -82,7 +75,7 @@
}
@Test
- public void updateState_backupOff() throws RemoteException {
+ public void updateState_backupOff() {
mBackupEnabled = false;
mController.updateState(mBackupPreference);
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
index 44c7e10..cd0ba79 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
@@ -17,12 +17,12 @@
package com.android.settings.backup;
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.isA;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
import android.app.Application;
@@ -34,7 +34,6 @@
import android.content.pm.PackageManager;
import android.os.UserHandle;
-import com.android.settings.TestConfig;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -56,10 +55,8 @@
import java.util.List;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class,
+@Config(shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class,
BackupSettingsActivityTest.ShadowUserHandle.class})
public class BackupSettingsActivityTest {
private ActivityController<BackupSettingsActivity> mActivityController;
@@ -86,7 +83,12 @@
mActivityController = Robolectric.buildActivity(BackupSettingsActivity.class);
mActivity = mActivityController.get();
mPackageManager = Shadows.shadowOf(mApplication.getPackageManager());
- doReturn(mComponent).when(mIntent).getComponent();
+ when(mIntent.getComponent()).thenReturn(mComponent);
+ }
+
+ @After
+ public void resetShadows() {
+ ShadowUserHandle.reset();
}
@Test
@@ -94,14 +96,15 @@
mIsBackupProvidedByOEM = false;
// Testing the scenario when the activity is disabled
- mPackageManager.setComponentEnabledSetting(mComponent,
+ mApplication.getPackageManager().setComponentEnabledSetting(mComponent,
PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
mActivityController.create();
// Verify that the component to launch was enabled.
- assertThat(mPackageManager.getComponentState(mComponent).newState)
- .isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+ final int flags = mPackageManager.getComponentEnabledSettingFlags(mComponent);
+ assertThat(flags & PackageManager.COMPONENT_ENABLED_STATE_ENABLED)
+ .isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
// Verify that the intent returned by BackupSettingsHelper.getIntentForBackupSettings()
// was launched.
@@ -122,21 +125,14 @@
assertThat(shadowOf(mApplication).getNextStartedActivity()).isNull();
verify(mFragmentTransaction).replace(anyInt(), isA(BackupSettingsFragment.class));
-
}
@Test
public void getNonIndexableKeys_SystemUser() {
- final List<SearchIndexableRaw> indexableRaws =
- BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
- mApplication.getApplicationContext(), true);
- final List<String> nonIndexableKeys =
- BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
- mApplication.getApplicationContext());
-
- assertThat(indexableRaws).isNotNull();
- assertThat(indexableRaws).isNotEmpty();
- assertThat(nonIndexableKeys).isEmpty();
+ assertThat(BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
+ mApplication, true)).isNotEmpty();
+ assertThat(BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
+ mApplication)).isEmpty();
}
@Test
@@ -145,21 +141,16 @@
final List<SearchIndexableRaw> indexableRaws =
BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
- mApplication.getApplicationContext(), true);
+ mApplication, true);
final List<String> nonIndexableKeys =
BackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
- mApplication.getApplicationContext());
+ mApplication);
assertThat(indexableRaws).isNotNull();
assertThat(indexableRaws).isNotEmpty();
assertThat(nonIndexableKeys).isNotEmpty();
}
- @After
- public void resetShadows() {
- ShadowUserHandle.reset();
- }
-
@Implements(BackupSettingsHelper.class)
public static class ShadowBackupSettingsHelper {
@Implementation
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
index 4e5428c..d156a2d 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
@@ -35,7 +35,6 @@
import android.os.RemoteException;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -49,8 +48,7 @@
import org.robolectric.annotation.Implements;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {BackupSettingsHelperTest.ShadowBackupManagerStub.class})
+@Config(shadows = BackupSettingsHelperTest.ShadowBackupManagerStub.class)
public class BackupSettingsHelperTest {
private static final String DEFAULT_SETTINGS_CLASSNAME =
@@ -89,6 +87,8 @@
Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettingsFromTransport();
+ assertThat(backupIntent).isEqualTo(intent);
+
verify(mBackupManager).getDataManagementIntent(anyString());
}
@@ -260,8 +260,8 @@
Intent backupIntent = mBackupSettingsHelper.getIntentForBackupSettings();
- assertThat(backupIntent.getComponent().getClassName()).isEqualTo(
- DEFAULT_SETTINGS_CLASSNAME);
+ assertThat(backupIntent.getComponent().getClassName())
+ .isEqualTo(DEFAULT_SETTINGS_CLASSNAME);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
index 3ad49e7..504b6f1 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
@@ -16,8 +16,17 @@
package com.android.settings.backup;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -29,28 +38,25 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class})
+@Config(shadows = BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class)
public class BackupSettingsPreferenceControllerTest {
+
private static final String BACKUP_SETTINGS = "backup_settings";
private static final String MANUFACTURER_SETTINGS = "manufacturer_backup";
- private Context mContext;
+ private static final String sBackupLabel = "Test Backup Label";
+ private static final String sBackupSummary = "Test Backup Summary";
+ private static final String sManufacturerLabel = "Test Manufacturer Label";
@Mock
- private BackupSettingsHelper mBackupHelper;
+ private static Intent sBackupIntent;
+
+ @Mock
+ private static Intent sManufacturerIntent;
+
+ private Context mContext;
+
@Mock
private PreferenceScreen mScreen;
@Mock
@@ -58,22 +64,12 @@
@Mock
private Preference mManufacturerPreference;
- @Mock
- private static Intent mBackupIntent;
-
- private static String mBackupLabel = "Test Backup Label";
- private static String mBackupSummary = "Test Backup Summary";
- private static String mManufacturerLabel = "Test Manufacturer Label";
-
- @Mock
- private static Intent mManufacturerIntent;
-
private BackupSettingsPreferenceController mController;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+ mContext = spy(RuntimeEnvironment.application);
mController = new BackupSettingsPreferenceController(mContext);
}
@@ -84,11 +80,11 @@
mController.displayPreference(mScreen);
- verify(mBackupPreference).setIntent(mBackupIntent);
- verify(mBackupPreference).setTitle(mBackupLabel);
- verify(mBackupPreference).setSummary(mBackupSummary);
- verify(mManufacturerPreference).setIntent(mManufacturerIntent);
- verify(mManufacturerPreference).setTitle(mManufacturerLabel);
+ verify(mBackupPreference).setIntent(sBackupIntent);
+ verify(mBackupPreference).setTitle(sBackupLabel);
+ verify(mBackupPreference).setSummary(sBackupSummary);
+ verify(mManufacturerPreference).setIntent(sManufacturerIntent);
+ verify(mManufacturerPreference).setTitle(sManufacturerLabel);
}
@Test
@@ -106,27 +102,27 @@
@Implementation
public Intent getIntentForBackupSettings() {
- return mBackupIntent;
+ return sBackupIntent;
}
@Implementation
public String getLabelForBackupSettings() {
- return mBackupLabel;
+ return sBackupLabel;
}
@Implementation
public String getSummaryForBackupSettings() {
- return mBackupSummary;
+ return sBackupSummary;
}
@Implementation
public Intent getIntentProvidedByManufacturer() {
- return mManufacturerIntent;
+ return sManufacturerIntent;
}
@Implementation
public String getLabelProvidedByManufacturer() {
- return mManufacturerLabel;
+ return sManufacturerLabel;
}
}
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
index fd46b4b..d9261c2 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
@@ -16,7 +16,6 @@
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.eq;
@@ -29,7 +28,6 @@
import android.content.Context;
import android.content.Intent;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
@@ -38,11 +36,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AlwaysDiscoverableTest {
+
@Mock
private LocalBluetoothAdapter mLocalAdapter;
@@ -100,14 +97,14 @@
@Test
public void resetsToDiscoverableModeWhenScanModeChanges() {
mAlwaysDiscoverable.start();
- verify(mLocalAdapter, times(1)).setScanMode(
- BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+ verify(mLocalAdapter, times(1))
+ .setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
sendScanModeChangedIntent(BluetoothAdapter.SCAN_MODE_CONNECTABLE,
BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
- verify(mLocalAdapter, times(2)).setScanMode(
- BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+ verify(mLocalAdapter, times(2))
+ .setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
}
private void sendScanModeChangedIntent(int newMode, int previousMode) {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
index 7b0a3f23..17d46a8 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
@@ -30,7 +30,6 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
import com.android.settings.widget.ActionButtonPreference;
@@ -43,8 +42,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = SettingsShadowBluetoothDevice.class)
+@Config(shadows = SettingsShadowBluetoothDevice.class)
public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsControllerTestBase {
private BluetoothDetailsButtonsController mController;
private ActionButtonPreference mButtonsPref;
@@ -58,8 +56,8 @@
RuntimeEnvironment.application, R.layout.two_action_buttons, null /* parent */);
mConnectButton = buttons.findViewById(R.id.button2_positive);
mForgetButton = buttons.findViewById(R.id.button1_positive);
- mController = new BluetoothDetailsButtonsController(mContext, mFragment, mCachedDevice,
- mLifecycle);
+ mController =
+ new BluetoothDetailsButtonsController(mContext, mFragment, mCachedDevice, mLifecycle);
mButtonsPref = ActionButtonPreferenceTest.createMock();
when(mButtonsPref.getKey()).thenReturn(mController.getPreferenceKey());
when(mButtonsPref.setButton2OnClickListener(any(View.OnClickListener.class)))
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
index 240ece1..6de0bde 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
@@ -26,7 +26,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -36,34 +35,13 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows=SettingsShadowBluetoothDevice.class)
+@Config(shadows = SettingsShadowBluetoothDevice.class)
public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase {
- static class TestController extends BluetoothDetailsController {
- public TestController(Context context, PreferenceFragment fragment,
- CachedBluetoothDevice device,
- Lifecycle lifecycle) {
- super(context, fragment, device, lifecycle);
- }
-
- @Override
- public String getPreferenceKey() {
- return null;
- }
-
- @Override
- protected void init(PreferenceScreen screen) {}
-
- @Override
- protected void refresh() {}
- }
-
@Test
public void pauseResumeEvents() {
-
- TestController controller = spy(new TestController(mContext, mFragment, mCachedDevice,
- mLifecycle));
+ TestController controller =
+ spy(new TestController(mContext, mFragment, mCachedDevice, mLifecycle));
verify(mLifecycle).addObserver(any(BluetoothDetailsController.class));
showScreen(controller);
@@ -81,4 +59,22 @@
// The init function should only have been called once
verify(controller, times(1)).init(mScreen);
}
+
+ private static class TestController extends BluetoothDetailsController {
+ private TestController(Context context, PreferenceFragment fragment,
+ CachedBluetoothDevice device, Lifecycle lifecycle) {
+ super(context, fragment, device, lifecycle);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return null;
+ }
+
+ @Override
+ protected void init(PreferenceScreen screen) {}
+
+ @Override
+ protected void refresh() {}
+ }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
index 7f58254..2fd3f0e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
@@ -29,7 +29,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -39,11 +38,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothDetailsControllerTestBase {
+
protected Context mContext;
private LifecycleOwner mLifecycleOwner;
protected Lifecycle mLifecycle;
@@ -82,58 +80,60 @@
}
protected static class DeviceConfig {
+
private String name;
private String address;
private int majorDeviceClass;
private boolean connected;
private String connectionSummary;
- public DeviceConfig setName(String newValue) {
+ DeviceConfig setName(String newValue) {
this.name = newValue;
return this;
}
- public DeviceConfig setAddress(String newValue) {
+ DeviceConfig setAddress(String newValue) {
this.address = newValue;
return this;
}
- public DeviceConfig setMajorDeviceClass(int newValue) {
+ DeviceConfig setMajorDeviceClass(int newValue) {
this.majorDeviceClass = newValue;
return this;
}
- public DeviceConfig setConnected(boolean newValue) {
+ DeviceConfig setConnected(boolean newValue) {
this.connected = newValue;
return this;
}
- public DeviceConfig setConnectionSummary(String connectionSummary) {
+
+ DeviceConfig setConnectionSummary(String connectionSummary) {
this.connectionSummary = connectionSummary;
return this;
}
- public String getName() {
+ String getName() {
return name;
}
- public String getAddress() {
+ String getAddress() {
return address;
}
- public int getMajorDeviceClass() {
+ int getMajorDeviceClass() {
return majorDeviceClass;
}
- public boolean isConnected() {
+ boolean isConnected() {
return connected;
}
- public String getConnectionSummary() {
+ String getConnectionSummary() {
return connectionSummary;
}
}
- protected DeviceConfig makeDefaultDeviceConfig() {
+ DeviceConfig makeDefaultDeviceConfig() {
return new DeviceConfig()
.setName("Mock Device")
.setAddress("B4:B0:34:B5:3B:1B")
@@ -144,9 +144,8 @@
/**
* Sets up the device mock to return various state based on a test config.
- * @param config
*/
- protected void setupDevice(DeviceConfig config) {
+ void setupDevice(DeviceConfig config) {
when(mCachedDevice.getName()).thenReturn(config.getName());
when(mBluetoothDeviceClass.getMajorDeviceClass()).thenReturn(config.getMajorDeviceClass());
when(mCachedDevice.isConnected()).thenReturn(config.isConnected());
@@ -160,7 +159,7 @@
/**
* Convenience method to call displayPreference and onResume.
*/
- protected void showScreen(BluetoothDetailsController controller) {
+ void showScreen(BluetoothDetailsController controller) {
controller.displayPreference(mScreen);
controller.onResume();
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
index 0129b1c..39ec535 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.verify;
@@ -26,12 +25,10 @@
import android.graphics.drawable.Drawable;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.widget.EntityHeaderController;
@@ -45,11 +42,9 @@
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class,
- SettingsShadowResources.class})
+@Config(shadows = {SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class})
public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsControllerTestBase {
+
private BluetoothDetailsHeaderController mController;
private LayoutPreference mPreference;
@@ -61,8 +56,8 @@
super.setUp();
FakeFeatureFactory.setupForTest();
ShadowEntityHeaderController.setUseMock(mHeaderController);
- mController = new BluetoothDetailsHeaderController(mContext, mFragment, mCachedDevice,
- mLifecycle);
+ mController =
+ new BluetoothDetailsHeaderController(mContext, mFragment, mCachedDevice, mLifecycle);
mPreference = new LayoutPreference(mContext, R.layout.settings_entity_header);
mPreference.setKey(mController.getPreferenceKey());
mScreen.addPreference(mPreference);
@@ -97,20 +92,20 @@
@Test
public void connectionStatusChangesWhileScreenOpen() {
InOrder inOrder = inOrder(mHeaderController);
- when(mCachedDevice.getConnectionSummary()).thenReturn(
- mContext.getString(R.string.bluetooth_connected));
+ when(mCachedDevice.getConnectionSummary())
+ .thenReturn(mContext.getString(R.string.bluetooth_connected));
showScreen(mController);
- inOrder.verify(mHeaderController).setSummary(
- mContext.getString(R.string.bluetooth_connected));
+ inOrder.verify(mHeaderController)
+ .setSummary(mContext.getString(R.string.bluetooth_connected));
when(mCachedDevice.getConnectionSummary()).thenReturn(null);
mController.onDeviceAttributesChanged();
inOrder.verify(mHeaderController).setSummary((CharSequence) null);
- when(mCachedDevice.getConnectionSummary()).thenReturn(
- mContext.getString(R.string.bluetooth_connecting));
+ when(mCachedDevice.getConnectionSummary())
+ .thenReturn(mContext.getString(R.string.bluetooth_connecting));
mController.onDeviceAttributesChanged();
- inOrder.verify(mHeaderController).setSummary(
- mContext.getString(R.string.bluetooth_connecting));
+ inOrder.verify(mHeaderController)
+ .setSummary(mContext.getString(R.string.bluetooth_connecting));
}
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
index 5ea20bd..4fdef8b 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java
@@ -17,7 +17,6 @@
import static com.google.common.truth.Truth.assertThat;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
import com.android.settingslib.widget.FooterPreference;
@@ -27,25 +26,24 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = SettingsShadowBluetoothDevice.class)
+@Config(shadows = SettingsShadowBluetoothDevice.class)
public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase {
- private BluetoothDetailsMacAddressController mController;
+ private BluetoothDetailsMacAddressController mController;
- @Override
- public void setUp() {
- super.setUp();
- mController = new BluetoothDetailsMacAddressController(mContext, mFragment, mCachedDevice,
- mLifecycle);
- setupDevice(mDeviceConfig);
- }
+ @Override
+ public void setUp() {
+ super.setUp();
+ mController =
+ new BluetoothDetailsMacAddressController(mContext, mFragment, mCachedDevice, mLifecycle);
+ setupDevice(mDeviceConfig);
+ }
- @Test
- public void macAddress() {
- showScreen(mController);
- FooterPreference footer = (FooterPreference) mScreen.findPreference(
- mController.getPreferenceKey());
- assertThat(footer.getTitle().toString()).endsWith(mDeviceConfig.getAddress());
- }
+ @Test
+ public void macAddress() {
+ showScreen(mController);
+ FooterPreference footer =
+ (FooterPreference) mScreen.findPreference(mController.getPreferenceKey());
+ assertThat(footer.getTitle().toString()).endsWith(mDeviceConfig.getAddress());
+ }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
index 445e4e3..53fc1e6 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -33,7 +32,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -52,11 +50,13 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows=SettingsShadowBluetoothDevice.class)
+@Config(shadows = SettingsShadowBluetoothDevice.class)
public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase {
+
private BluetoothDetailsProfilesController mController;
private List<LocalBluetoothProfile> mConnectableProfiles;
private PreferenceCategory mProfiles;
@@ -87,14 +87,13 @@
}
static class FakeBluetoothProfile implements LocalBluetoothProfile {
- protected HashSet<BluetoothDevice> mConnectedDevices;
- protected HashMap<BluetoothDevice, Boolean> mPreferred;
- protected Context mContext;
- protected int mNameResourceId;
- public FakeBluetoothProfile(Context context, int nameResourceId) {
- mConnectedDevices = new HashSet<>();
- mPreferred = new HashMap<>();
+ private Set<BluetoothDevice> mConnectedDevices = new HashSet<>();
+ private Map<BluetoothDevice, Boolean> mPreferred = new HashMap<>();
+ private Context mContext;
+ private int mNameResourceId;
+
+ private FakeBluetoothProfile(Context context, int nameResourceId) {
mContext = context;
mNameResourceId = nameResourceId;
}
@@ -180,8 +179,8 @@
/**
* Creates and adds a mock LocalBluetoothProfile to the list of connectable profiles for the
* device.
- @param profileNameResId the resource id for the name used by this profile
- @param deviceIsPreferred whether this profile should start out as enabled for the device
+ * @param profileNameResId the resource id for the name used by this profile
+ * @param deviceIsPreferred whether this profile should start out as enabled for the device
*/
private LocalBluetoothProfile addFakeProfile(int profileNameResId,
boolean deviceIsPreferred) {
@@ -200,7 +199,7 @@
assertThat(mConnectableProfiles).isNotEmpty();
assertThat(mProfiles.getPreferenceCount()).isEqualTo(mConnectableProfiles.size());
}
- ArrayList<SwitchPreference> result = new ArrayList<>();
+ List<SwitchPreference> result = new ArrayList<>();
for (int i = 0; i < mProfiles.getPreferenceCount(); i++) {
result.add((SwitchPreference)mProfiles.getPreference(i));
}
@@ -209,8 +208,8 @@
private void verifyProfileSwitchTitles(List<SwitchPreference> switches) {
for (int i = 0; i < switches.size(); i++) {
- String expectedTitle = mContext.getString(
- mConnectableProfiles.get(i).getNameResource(mDevice));
+ String expectedTitle =
+ mContext.getString(mConnectableProfiles.get(i).getNameResource(mDevice));
assertThat(switches.get(i).getTitle()).isEqualTo(expectedTitle);
}
}
@@ -285,8 +284,8 @@
@Test
public void pbapProfileStartsEnabled() {
setupDevice(makeDefaultDeviceConfig());
- when(mCachedDevice.getPhonebookPermissionChoice()).thenReturn(
- CachedBluetoothDevice.ACCESS_ALLOWED);
+ when(mCachedDevice.getPhonebookPermissionChoice())
+ .thenReturn(CachedBluetoothDevice.ACCESS_ALLOWED);
PbapServerProfile psp = mock(PbapServerProfile.class);
when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap);
when(psp.toString()).thenReturn(PbapServerProfile.NAME);
@@ -307,8 +306,8 @@
@Test
public void pbapProfileStartsDisabled() {
setupDevice(makeDefaultDeviceConfig());
- when(mCachedDevice.getPhonebookPermissionChoice()).thenReturn(
- CachedBluetoothDevice.ACCESS_REJECTED);
+ when(mCachedDevice.getPhonebookPermissionChoice())
+ .thenReturn(CachedBluetoothDevice.ACCESS_REJECTED);
PbapServerProfile psp = mock(PbapServerProfile.class);
when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap);
when(psp.toString()).thenReturn(PbapServerProfile.NAME);
@@ -333,8 +332,8 @@
when(mapProfile.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_map);
when(mProfileManager.getMapProfile()).thenReturn(mapProfile);
when(mProfileManager.getProfileByName(eq(mapProfile.toString()))).thenReturn(mapProfile);
- when(mCachedDevice.getMessagePermissionChoice()).thenReturn(
- CachedBluetoothDevice.ACCESS_REJECTED);
+ when(mCachedDevice.getMessagePermissionChoice())
+ .thenReturn(CachedBluetoothDevice.ACCESS_REJECTED);
showScreen(mController);
List<SwitchPreference> switches = getProfileSwitches(false);
assertThat(switches.size()).isEqualTo(1);
@@ -352,8 +351,8 @@
A2dpProfile profile = mock(A2dpProfile.class);
when(mProfileManager.getProfileByName(eq(profile.toString()))).thenReturn(profile);
when(profile.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_a2dp);
- when(profile.getHighQualityAudioOptionLabel(mDevice)).thenReturn(mContext.getString(
- R.string.bluetooth_profile_a2dp_high_quality_unknown_codec));
+ when(profile.getHighQualityAudioOptionLabel(mDevice)).thenReturn(
+ mContext.getString(R.string.bluetooth_profile_a2dp_high_quality_unknown_codec));
when(profile.supportsHighQualityAudio(mDevice)).thenReturn(supportsHighQualityAudio);
when(profile.isHighQualityAudioEnabled(mDevice)).thenReturn(highQualityAudioEnabled);
when(profile.isPreferred(mDevice)).thenReturn(preferred);
@@ -390,8 +389,8 @@
showScreen(mController);
assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
SwitchPreference pref = (SwitchPreference) mProfiles.getPreference(0);
- assertThat(pref.getKey()).isNotEqualTo(
- BluetoothDetailsProfilesController.HIGH_QUALITY_AUDIO_PREF_TAG);
+ assertThat(pref.getKey())
+ .isNotEqualTo(BluetoothDetailsProfilesController.HIGH_QUALITY_AUDIO_PREF_TAG);
assertThat(pref.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_profile_a2dp));
}
@@ -414,8 +413,8 @@
// Disabling media audio should cause the high quality audio switch to disappear, but not
// the regular audio one.
- SwitchPreference audioPref = (SwitchPreference) mScreen.findPreference(
- audioProfile.toString());
+ SwitchPreference audioPref =
+ (SwitchPreference) mScreen.findPreference(audioProfile.toString());
audioPref.performClick();
verify(audioProfile).setPreferred(mDevice, false);
when(audioProfile.isPreferred(mDevice)).thenReturn(false);
@@ -438,8 +437,8 @@
setupDevice(makeDefaultDeviceConfig());
A2dpProfile audioProfile = addMockA2dpProfile(false, true, true);
showScreen(mController);
- SwitchPreference audioPref = (SwitchPreference) mScreen.findPreference(
- audioProfile.toString());
+ SwitchPreference audioPref =
+ (SwitchPreference) mScreen.findPreference(audioProfile.toString());
SwitchPreference highQualityAudioPref = getHighQualityAudioPref();
assertThat(audioPref).isNotNull();
assertThat(audioPref.isChecked()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
index 6d996c0..4be2775 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
@@ -17,7 +17,6 @@
package com.android.settings.bluetooth;
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;
@@ -35,7 +34,6 @@
import android.view.MenuItem;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -49,12 +47,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.fakes.RoboMenu;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothDeviceDetailsFragmentTest {
+
private BluetoothDeviceDetailsFragment mFragment;
private Context mContext;
@@ -98,8 +95,8 @@
MenuInflater inflater = new MenuInflater(mContext);
mFragment.onCreateOptionsMenu(menu, inflater);
MenuItem item = menu.getItem(0);
- assertThat(item.getItemId()).isEqualTo(
- BluetoothDeviceDetailsFragment.EDIT_DEVICE_NAME_ITEM_ID);
+ assertThat(item.getItemId())
+ .isEqualTo(BluetoothDeviceDetailsFragment.EDIT_DEVICE_NAME_ITEM_ID);
FragmentManager fragmentManager = mock(FragmentManager.class);
when(mFragment.getFragmentManager()).thenReturn(fragmentManager);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
index c3515df..f5070ef 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
@@ -22,12 +22,12 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
@@ -37,11 +37,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothDeviceNamePreferenceControllerTest {
+
private static final String DEVICE_NAME = "Nightshade";
private static final int ORDER = 1;
@@ -60,11 +59,10 @@
mContext = spy(RuntimeEnvironment.application);
- doReturn(mContext).when(mPreferenceScreen).getContext();
+ when(mPreferenceScreen.getContext()).thenReturn(mContext);
mPreference = new Preference(mContext);
mPreference.setKey(BluetoothDeviceNamePreferenceController.KEY_DEVICE_NAME);
- mController = spy(new BluetoothDeviceNamePreferenceController(
- mContext, mLocalAdapter));
+ mController = spy(new BluetoothDeviceNamePreferenceController(mContext, mLocalAdapter));
doReturn(DEVICE_NAME).when(mController).getDeviceName();
}
@@ -81,8 +79,8 @@
@Test
public void testCreateBluetoothDeviceNamePreference() {
- Preference preference = mController.createBluetoothDeviceNamePreference(mPreferenceScreen,
- ORDER);
+ Preference preference =
+ mController.createBluetoothDeviceNamePreference(mPreferenceScreen, ORDER);
assertThat(preference.getKey()).isEqualTo(mController.KEY_DEVICE_NAME);
assertThat(preference.getOrder()).isEqualTo(ORDER);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
index 71020be..1162f8e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -16,7 +16,6 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -31,10 +30,8 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -44,20 +41,15 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = SettingsShadowResources.class)
public class BluetoothDevicePreferenceTest {
private static final boolean SHOW_DEVICES_WITHOUT_NAMES = true;
private Context mContext;
@Mock
private CachedBluetoothDevice mCachedBluetoothDevice;
- @Mock
- private DeviceListPreferenceFragment mDeviceListPreferenceFragment;
private FakeFeatureFactory mFakeFeatureFactory;
private MetricsFeatureProvider mMetricsFeatureProvider;
@@ -79,8 +71,8 @@
mPreference.onClicked();
- verify(mMetricsFeatureProvider).action(
- mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT);
+ verify(mMetricsFeatureProvider)
+ .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT);
}
@Test
@@ -90,8 +82,8 @@
mPreference.onClicked();
- verify(mMetricsFeatureProvider).action(
- mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT);
+ verify(mMetricsFeatureProvider)
+ .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT);
}
@Test
@@ -103,10 +95,10 @@
mPreference.onClicked();
- verify(mMetricsFeatureProvider).action(
- mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
- verify(mMetricsFeatureProvider, never()).action(mContext,
- MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
+ verify(mMetricsFeatureProvider)
+ .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
+ verify(mMetricsFeatureProvider, never())
+ .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
}
@Test
@@ -118,10 +110,10 @@
mPreference.onClicked();
- verify(mMetricsFeatureProvider).action(
- mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
- verify(mMetricsFeatureProvider).action(mContext,
- MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
+ verify(mMetricsFeatureProvider)
+ .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
+ verify(mMetricsFeatureProvider)
+ .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
}
@Test
@@ -147,8 +139,7 @@
public void shouldHideSecondTarget_hasUserRestriction_shouldReturnTrue() {
final UserManager um = mock(UserManager.class);
ReflectionHelpers.setField(mPreference, "mUserManager", um);
- when(um.hasUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH))
- .thenReturn(true);
+ when(um.hasUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH)).thenReturn(true);
assertThat(mPreference.shouldHideSecondTarget()).isTrue();
}
@@ -158,18 +149,17 @@
when(mCachedBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
final UserManager um = mock(UserManager.class);
ReflectionHelpers.setField(mPreference, "mUserManager", um);
- when(um.hasUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH))
- .thenReturn(false);
+ when(um.hasUserRestriction(UserManager.DISALLOW_CONFIG_BLUETOOTH)).thenReturn(false);
assertThat(mPreference.shouldHideSecondTarget()).isFalse();
}
@Test
public void imagingDeviceIcon_isICSettingsPrint() {
- when(mCachedBluetoothDevice.getBatteryLevel()).thenReturn(
- BluetoothDevice.BATTERY_LEVEL_UNKNOWN);
- when(mCachedBluetoothDevice.getBtClass()).thenReturn(
- new BluetoothClass(BluetoothClass.Device.Major.IMAGING));
+ when(mCachedBluetoothDevice.getBatteryLevel())
+ .thenReturn(BluetoothDevice.BATTERY_LEVEL_UNKNOWN);
+ when(mCachedBluetoothDevice.getBtClass())
+ .thenReturn(new BluetoothClass(BluetoothClass.Device.Major.IMAGING));
mPreference.onDeviceAttributesChanged();
assertThat(mPreference.getIcon()).isEqualTo(
@@ -190,8 +180,7 @@
public void testVisible_hideDeviceWithoutNames_invisible() {
doReturn(false).when(mCachedBluetoothDevice).hasHumanReadableName();
BluetoothDevicePreference preference =
- new BluetoothDevicePreference(mContext, mCachedBluetoothDevice,
- false);
+ new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
assertThat(preference.isVisible()).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
index faf9069..6ba8593 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
@@ -30,7 +30,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
@@ -41,10 +40,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothDeviceRenamePreferenceControllerTest {
private static final String DEVICE_NAME = "Nightshade";
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
index f53d3ea..5334833 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
@@ -20,6 +20,7 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
@@ -27,7 +28,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -40,11 +40,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothDeviceUpdaterTest {
+
@Mock
private DashboardFragment mDashboardFragment;
@Mock
@@ -66,11 +65,11 @@
mContext = RuntimeEnvironment.application;
doReturn(mContext).when(mDashboardFragment).getContext();
- doReturn(mBluetoothDevice).when(mCachedBluetoothDevice).getDevice();
+ when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
- mBluetoothDeviceUpdater = new BluetoothDeviceUpdater(mDashboardFragment,
- mDevicePreferenceCallback, null) {
+ mBluetoothDeviceUpdater =
+ new BluetoothDeviceUpdater(mDashboardFragment, mDevicePreferenceCallback, null) {
@Override
public boolean isFilterMatched(CachedBluetoothDevice cachedBluetoothDevice) {
return true;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
index 828b5a1..fdd4f44 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
@@ -15,6 +15,15 @@
*/
package com.android.settings.bluetooth;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -28,7 +37,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.widget.MasterSwitchController;
import com.android.settings.widget.MasterSwitchPreference;
@@ -47,20 +55,8 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- SettingsShadowResources.class, SettingsShadowResources.SettingsShadowTheme.class
-})
+@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public class BluetoothEnablerTest {
private static EnforcedAdmin sFakeEnforcedAdmin;
@@ -80,8 +76,7 @@
private LocalBluetoothAdapter mBluetoothAdapter;
private Context mContext;
- Switch mSwitch;
- private MasterSwitchPreference mMasterSwitchPreference;
+ private Switch mSwitch;
private MasterSwitchController mMasterSwitchController;
private BluetoothEnabler mBluetoothEnabler;
@@ -92,8 +87,8 @@
when(mBluetoothManager.getBluetoothAdapter()).thenReturn(mBluetoothAdapter);
mSwitch = new Switch(mContext);
- mMasterSwitchPreference = new MasterSwitchPreference(mContext);
- mMasterSwitchController = spy(new MasterSwitchController(mMasterSwitchPreference));
+ MasterSwitchPreference masterSwitchPreference = new MasterSwitchPreference(mContext);
+ mMasterSwitchController = spy(new MasterSwitchController(masterSwitchPreference));
mBluetoothEnabler = new BluetoothEnabler(
mContext,
mMasterSwitchController,
@@ -103,7 +98,7 @@
mRestrictionUtils);
PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(mock(View.class));
when(holder.findViewById(R.id.switchWidget)).thenReturn(mSwitch);
- mMasterSwitchPreference.onBindViewHolder(holder);
+ masterSwitchPreference.onBindViewHolder(holder);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
index cdaf876..2c1e46d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
@@ -24,19 +24,17 @@
import android.support.v7.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothFilesPreferenceControllerTest {
+
private Context mContext;
private BluetoothFilesPreferenceController mController;
private Preference mPreference;
@@ -57,12 +55,12 @@
final Intent intent = ShadowApplication.getInstance().getNextStartedActivity();
assertThat(intent).isNotNull();
- assertThat(intent.getAction()).isEqualTo(
- BluetoothFilesPreferenceController.ACTION_OPEN_FILES);
+ assertThat(intent.getAction())
+ .isEqualTo(BluetoothFilesPreferenceController.ACTION_OPEN_FILES);
final Bundle bundle = intent.getExtras();
assertThat(bundle.getInt(BluetoothFilesPreferenceController.EXTRA_DIRECTION)).isEqualTo(1);
- assertThat(bundle.getBoolean(
- BluetoothFilesPreferenceController.EXTRA_SHOW_ALL_FILES)).isTrue();
+ assertThat(bundle.getBoolean(BluetoothFilesPreferenceController.EXTRA_SHOW_ALL_FILES))
+ .isTrue();
}
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
index 8048c0f..f46d2e3 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
@@ -26,7 +26,6 @@
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,10 +40,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothMasterSwitchPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -60,13 +57,12 @@
private Context mContext;
private BluetoothMasterSwitchPreferenceController mController;
- private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
- mFeatureFactory = FakeFeatureFactory.setupForTest();
+ FakeFeatureFactory.setupForTest();
mController = new BluetoothMasterSwitchPreferenceController(
mContext, mBluetoothManager, mRestrictionUtils, mFragment);
@@ -90,8 +86,8 @@
public void onPause_shouldUnregisterCallback() {
mController.onPause();
- verify(mBluetoothManager.getEventManager()).unregisterCallback(
- any(BluetoothCallback.class));
+ verify(mBluetoothManager.getEventManager())
+ .unregisterCallback(any(BluetoothCallback.class));
}
@Test
@@ -106,7 +102,6 @@
public void onStop_shouldRegisterPreferenceChangeListener() {
mController.displayPreference(mScreen);
mController.onStart();
-
mController.onStop();
verify(mPreference).setOnPreferenceChangeListener(null);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
index 9bc8017..1364c63 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
@@ -17,7 +17,6 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
@@ -35,7 +34,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -48,10 +46,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothPairingDetailTest {
@Mock
@@ -87,10 +83,10 @@
@Test
public void testInitPreferencesFromPreferenceScreen_findPreferences() {
- doReturn(mAvailableDevicesCategory).when(mFragment).findPreference(
- BluetoothPairingDetail.KEY_AVAIL_DEVICES);
- doReturn(mFooterPreference).when(mFragment).findPreference(
- BluetoothPairingDetail.KEY_FOOTER_PREF);
+ doReturn(mAvailableDevicesCategory).when(mFragment)
+ .findPreference(BluetoothPairingDetail.KEY_AVAIL_DEVICES);
+ doReturn(mFooterPreference).when(mFragment)
+ .findPreference(BluetoothPairingDetail.KEY_FOOTER_PREF);
mFragment.initPreferencesFromPreferenceScreen();
@@ -196,5 +192,4 @@
// Verify that clean up only happen once at initialization
verify(mAvailableDevicesCategory, times(1)).removeAll();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
index a617fc4..759c0cd 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -16,7 +16,6 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
-
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doNothing;
@@ -38,23 +37,18 @@
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.FragmentTestUtil;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows=ShadowEventLogWriter.class)
public class BluetoothPairingDialogTest {
private static final String FILLER = "text that goes in a view";
@@ -139,7 +133,7 @@
when(controller.getDeviceVariantMessageHintId())
.thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
- Context context = spy(ShadowApplication.getInstance().getApplicationContext());
+ Context context = spy(RuntimeEnvironment.application);
InputMethodManager imm = mock(InputMethodManager.class);
doReturn(imm).when(context).getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -176,8 +170,7 @@
// get the relevant views
View messagePairing = frag.getmDialog().findViewById(R.id.pairing_code_message);
- TextView pairingViewContent =
- (TextView) frag.getmDialog().findViewById(R.id.pairing_subhead);
+ TextView pairingViewContent = frag.getmDialog().findViewById(R.id.pairing_subhead);
View pairingViewCaption = frag.getmDialog().findViewById(R.id.pairing_caption);
// check that the relevant views are visible and that the passkey is shown
@@ -288,8 +281,8 @@
BluetoothPairingDialogFragment frag = makeFragment();
// verify that the checkbox is visible and that the device name is correct
- CheckBox sharingCheckbox = (CheckBox) frag.getmDialog()
- .findViewById(R.id.phonebook_sharing_message_confirm_pin);
+ CheckBox sharingCheckbox =
+ frag.getmDialog().findViewById(R.id.phonebook_sharing_message_confirm_pin);
assertThat(sharingCheckbox.getVisibility()).isEqualTo(View.VISIBLE);
}
@@ -306,8 +299,8 @@
BluetoothPairingDialogFragment frag = makeFragment();
// verify that the checkbox is gone
- CheckBox sharingCheckbox = (CheckBox) frag.getmDialog()
- .findViewById(R.id.phonebook_sharing_message_confirm_pin);
+ CheckBox sharingCheckbox =
+ frag.getmDialog().findViewById(R.id.phonebook_sharing_message_confirm_pin);
assertThat(sharingCheckbox.getVisibility()).isEqualTo(View.GONE);
}
@@ -325,7 +318,7 @@
BluetoothPairingDialogFragment frag = makeFragment();
// verify message is what we expect it to be and is visible
- TextView message = (TextView) frag.getmDialog().findViewById(R.id.message_below_pin);
+ TextView message = frag.getmDialog().findViewById(R.id.message_below_pin);
assertThat(message.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(TextUtils.equals(frag.getString(R.string.cancel), message.getText())).isTrue();
}
@@ -344,7 +337,7 @@
BluetoothPairingDialogFragment frag = makeFragment();
// verify message is what we expect it to be and is visible
- TextView hint = (TextView) frag.getmDialog().findViewById(R.id.pin_values_hint);
+ TextView hint = frag.getmDialog().findViewById(R.id.pin_values_hint);
assertThat(hint.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(TextUtils.equals(frag.getString(R.string.cancel), hint.getText())).isTrue();
}
@@ -364,16 +357,16 @@
BluetoothPairingDialogFragment frag = makeFragment();
// verify message is what we expect it to be and is visible
- TextView hint = (TextView) frag.getmDialog().findViewById(R.id.pin_values_hint);
+ TextView hint = frag.getmDialog().findViewById(R.id.pin_values_hint);
assertThat(hint.getVisibility()).isEqualTo(View.GONE);
- TextView message = (TextView) frag.getmDialog().findViewById(R.id.message_below_pin);
+ TextView message = frag.getmDialog().findViewById(R.id.message_below_pin);
assertThat(message.getVisibility()).isEqualTo(View.GONE);
}
@Test
public void pairingStringIsFormattedCorrectly() {
final String device = "test_device";
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
assertThat(context.getString(R.string.bluetooth_pb_acceptance_dialog_text, device, device))
.contains(device);
}
@@ -443,6 +436,7 @@
when(fragment.getPairingViewText()).thenReturn(existingText);
setupFragment(fragment);
AlertDialog dialog = ShadowAlertDialog.getLatestAlertDialog();
+ assertThat(dialog).isNotNull();
boolean expected = !TextUtils.isEmpty(existingText);
assertThat(dialog.getButton(Dialog.BUTTON_POSITIVE).isEnabled()).isEqualTo(expected);
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
index 172d009..866756c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,11 +38,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothPairingPreferenceControllerTest {
+
private static final int ORDER = 1;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -74,8 +72,8 @@
assertThat(pref.getKey()).isEqualTo(BluetoothPairingPreferenceController.KEY_PAIRING);
assertThat(pref.getIcon()).isEqualTo(mContext.getDrawable(R.drawable.ic_menu_add));
assertThat(pref.getOrder()).isEqualTo(ORDER);
- assertThat(pref.getTitle()).isEqualTo(
- mContext.getString(R.string.bluetooth_pairing_pref_title));
+ assertThat(pref.getTitle())
+ .isEqualTo(mContext.getString(R.string.bluetooth_pairing_pref_title));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
index 0061ee5..3a67dcb 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
@@ -16,11 +16,12 @@
package com.android.settings.bluetooth;
+import static org.mockito.Mockito.verify;
+
import android.content.Context;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import org.junit.Before;
@@ -30,12 +31,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothSettingsSummaryProviderTest {
private Context mContext;
@@ -50,8 +47,8 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application.getApplicationContext();
- mSummaryProvider = new BluetoothSettings.SummaryProvider(mContext, mSummaryLoader,
- mBluetoothManager);
+ mSummaryProvider =
+ new BluetoothSettings.SummaryProvider(mContext, mSummaryLoader, mBluetoothManager);
}
@Test
@@ -77,5 +74,4 @@
verify(mSummaryLoader).setSummary(mSummaryProvider, summary);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
index 5f3ac32..e52049d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java
@@ -17,7 +17,6 @@
package com.android.settings.bluetooth;
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;
@@ -26,16 +25,14 @@
import android.app.Activity;
import android.content.Context;
import android.content.res.Resources;
-import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import android.view.View;
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
import com.android.settingslib.widget.FooterPreference;
@@ -45,12 +42,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothSettingsTest {
private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx";
@@ -103,8 +98,8 @@
@Test
public void setUpdateMyDevicePreference_setTitleCorrectly() {
- doReturn(FOOTAGE_MAC_STRING).when(mFragment).getString(
- eq(R.string.bluetooth_footer_mac_message), any());
+ doReturn(FOOTAGE_MAC_STRING).when(mFragment)
+ .getString(eq(R.string.bluetooth_footer_mac_message), any());
mFragment.updateFooterPreference(mFooterPreference);
@@ -129,10 +124,10 @@
@Test
public void testInitPreferencesFromPreferenceScreen() {
- doReturn(mPairedDevicesCategory).when(mFragment).findPreference(
- BluetoothSettings.KEY_PAIRED_DEVICES);
- doReturn(mFooterPreference).when(mFragment).findPreference(
- BluetoothSettings.KEY_FOOTER_PREF);
+ doReturn(mPairedDevicesCategory).when(mFragment)
+ .findPreference(BluetoothSettings.KEY_PAIRED_DEVICES);
+ doReturn(mFooterPreference).when(mFragment)
+ .findPreference(BluetoothSettings.KEY_FOOTER_PREF);
mFragment.initPreferencesFromPreferenceScreen();
@@ -144,18 +139,17 @@
public void testSearchIndexProvider_pairPageEnabled_keyNotAdded() {
doReturn(true).when(mFeatureFactory.bluetoothFeatureProvider).isPairingPageEnabled();
- final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
- mContext);
+ final List<String> keys =
+ BluetoothSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
assertThat(keys).doesNotContain(BluetoothSettings.DATA_KEY_REFERENCE);
}
@Test
public void testSearchIndexProvider_pairPageDisabled_keyAdded() {
- final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(
- mContext);
+ final List<String> keys =
+ BluetoothSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
assertThat(keys).contains(BluetoothSettings.DATA_KEY_REFERENCE);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
index df3ef63..2ac1ed8 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
@@ -17,7 +17,6 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doCallRealMethod;
@@ -31,7 +30,6 @@
import android.content.Context;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
@@ -44,14 +42,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.HashSet;
import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothSummaryUpdaterTest {
+
private static final String DEVICE_NAME = "Nightshade";
private static final String DEVICE_KEYBOARD_NAME = "Bluetooth Keyboard";
@@ -91,8 +88,7 @@
doAnswer(invocation -> mDeviceConnected[0]).when(mConnectedDevice).isConnected();
// Setup second device
doReturn(DEVICE_KEYBOARD_NAME).when(mConnectedKeyBoardDevice).getName();
- doAnswer(invocation -> mDeviceConnected[1]).when(mConnectedKeyBoardDevice)
- .isConnected();
+ doAnswer(invocation -> mDeviceConnected[1]).when(mConnectedKeyBoardDevice).isConnected();
doReturn(mBondedDevices).when(mBtAdapter).getBondedDevices();
}
@@ -242,8 +238,7 @@
mSummaryUpdater.onConnectionStateChanged(null /* device */,
BluetoothAdapter.STATE_CONNECTED);
- verify(mListener).onSummaryChanged(
- mContext.getString(R.string.disconnected));
+ verify(mListener).onSummaryChanged(mContext.getString(R.string.disconnected));
}
@Test
@@ -274,8 +269,8 @@
public void getConnectedDeviceSummary_hasConnectedDevice_returnOneDeviceSummary() {
mBondedDevices.add(mConnectedDevice);
mDeviceConnected[0] = true;
- final String expectedSummary = mContext.getString(R.string.bluetooth_connected_summary,
- DEVICE_NAME);
+ final String expectedSummary =
+ mContext.getString(R.string.bluetooth_connected_summary, DEVICE_NAME);
assertThat(mSummaryUpdater.getConnectedDeviceSummary()).isEqualTo(expectedSummary);
}
@@ -286,8 +281,8 @@
mBondedDevices.add(mConnectedKeyBoardDevice);
mDeviceConnected[0] = true;
mDeviceConnected[1] = true;
- final String expectedSummary = mContext.getString(
- R.string.bluetooth_connected_multiple_devices_summary);
+ final String expectedSummary =
+ mContext.getString(R.string.bluetooth_connected_multiple_devices_summary);
assertThat(mSummaryUpdater.getConnectedDeviceSummary()).isEqualTo(expectedSummary);
}
@@ -300,5 +295,4 @@
this.summary = summary;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
index aa9d266..a05859d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -28,7 +27,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,10 +40,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothSwitchPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -68,8 +64,8 @@
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
FakeFeatureFactory.setupForTest();
- mController = new BluetoothSwitchPreferenceController(
- mContext, mBluetoothManager, mRestrictionUtils);
+ mController =
+ new BluetoothSwitchPreferenceController(mContext, mBluetoothManager, mRestrictionUtils);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
}
@@ -78,16 +74,16 @@
public void testGetAvailabilityStatus_adapterNull_returnDisabled() {
mController.mBluetoothAdapter = null;
- assertThat(mController.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.DISABLED_UNSUPPORTED);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
}
@Test
public void testGetAvailabilityStatus_adapterExisted_returnAvailable() {
mController.mBluetoothAdapter = mLocalBluetoothAdapter;
- assertThat(mController.getAvailabilityStatus()).isEqualTo(
- BasePreferenceController.AVAILABLE);
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
index 1cd6a27..036f09d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
@@ -20,12 +20,12 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,11 +37,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ConnectedBluetoothDeviceUpdaterTest {
+
@Mock
private DashboardFragment mDashboardFragment;
@Mock
@@ -60,7 +59,7 @@
mContext = RuntimeEnvironment.application;
doReturn(mContext).when(mDashboardFragment).getContext();
- doReturn(mBluetoothDevice).when(mCachedBluetoothDevice).getDevice();
+ when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
mBluetoothDeviceUpdater = spy(new ConnectedBluetoothDeviceUpdater(mDashboardFragment,
mDevicePreferenceCallback, null));
@@ -104,5 +103,4 @@
verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
index 94c6add..3781a75 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
@@ -17,7 +17,6 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.eq;
@@ -28,12 +27,10 @@
import android.content.Context;
import android.content.res.Resources;
-import android.os.UserManager;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -44,18 +41,15 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DeviceListPreferenceFragmentTest {
+
private static final String FOOTAGE_MAC_STRING = "Bluetooth mac: xxxx";
@Mock
- private UserManager mUserManager;
- @Mock
private Resources mResource;
@Mock
private Context mContext;
@@ -78,8 +72,8 @@
@Test
public void setUpdateMyDevicePreference_setTitleCorrectly() {
- doReturn(FOOTAGE_MAC_STRING).when(mFragment).getString(
- eq(R.string.bluetooth_footer_mac_message), any());
+ doReturn(FOOTAGE_MAC_STRING).when(mFragment)
+ .getString(eq(R.string.bluetooth_footer_mac_message), any());
mFragment.updateFooterPreference(mMyDevicePreference);
@@ -212,5 +206,4 @@
return null;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
index 3294ffd..3023d71 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
@@ -18,22 +18,17 @@
import static org.mockito.Mockito.verify;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DevicePickerFragmentTest {
- @Mock
- private LocalBluetoothAdapter mLocalAdapter;
+
@Mock
private BluetoothProgressCategory mAvailableDevicesCategory;
private DevicePickerFragment mFragment;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
index a6793bb..96f09e2 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java
@@ -16,7 +16,12 @@
package com.android.settings.bluetooth;
-import android.app.Activity;
+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.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.os.Bundle;
import android.view.View;
@@ -24,8 +29,6 @@
import android.widget.CheckBox;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settingslib.R;
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -40,47 +43,39 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.FragmentTestUtil;
import org.robolectric.util.ReflectionHelpers;
-import org.robolectric.RuntimeEnvironment;
-
-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.when;
-import static org.mockito.Mockito.verify;
import java.util.ArrayList;
-
+import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- ShadowEventLogWriter.class
-})
public class DeviceProfilesSettingsTest {
- Context mContext;
- @Mock Activity mActivity;
- @Mock LocalBluetoothManager mManager;
- @Mock LocalBluetoothAdapter mAdapter;
- @Mock LocalBluetoothProfileManager mProfileManager;
- @Mock CachedBluetoothDeviceManager mDeviceManager;
- @Mock CachedBluetoothDevice mCachedDevice;
- @Mock A2dpProfile mProfile;
- ArrayList<LocalBluetoothProfile> mProfiles;
- DeviceProfilesSettings mFragment;
+ @Mock
+ private LocalBluetoothManager mManager;
+ @Mock
+ private LocalBluetoothAdapter mAdapter;
+ @Mock
+ private LocalBluetoothProfileManager mProfileManager;
+ @Mock
+ private CachedBluetoothDeviceManager mDeviceManager;
+ @Mock
+ private CachedBluetoothDevice mCachedDevice;
+ @Mock
+ private A2dpProfile mProfile;
+
+ private DeviceProfilesSettings mFragment;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
when(mProfile.getNameResource(any())).thenReturn(R.string.bluetooth_profile_a2dp);
- mProfiles = new ArrayList<>();
- mProfiles.add(mProfile);
- when(mCachedDevice.getConnectableProfiles()).thenReturn(mProfiles);
+ List<LocalBluetoothProfile> profiles = new ArrayList<>();
+ profiles.add(mProfile);
+ when(mCachedDevice.getConnectableProfiles()).thenReturn(profiles);
mFragment = new DeviceProfilesSettings();
mFragment.setArguments(new Bundle());
@@ -101,8 +96,8 @@
FragmentTestUtil.startFragment(mFragment);
ViewGroup profilesGroup = mFragment.getDialog().findViewById(R.id.profiles_section);
- CheckBox box = (CheckBox) profilesGroup.findViewWithTag(
- DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
+ CheckBox box =
+ profilesGroup.findViewWithTag(DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
assertThat(box).isNotNull();
assertThat(box.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(box.isEnabled()).isTrue();
@@ -125,8 +120,8 @@
// Make sure that the high quality audio option is present but disabled when the device
// is busy.
ViewGroup profilesGroup = mFragment.getDialog().findViewById(R.id.profiles_section);
- CheckBox box = (CheckBox) profilesGroup.findViewWithTag(
- DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
+ CheckBox box =
+ profilesGroup.findViewWithTag(DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
assertThat(box).isNotNull();
assertThat(box.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(box.isEnabled()).isFalse();
@@ -141,8 +136,8 @@
ViewGroup profilesGroup = mFragment.getDialog().findViewById(R.id.profiles_section);
CheckBox audioBox = profilesGroup.findViewWithTag(mProfile.toString());
- CheckBox highQualityAudioBox = profilesGroup.findViewWithTag(
- DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
+ CheckBox highQualityAudioBox =
+ profilesGroup.findViewWithTag(DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
assertThat(audioBox).isNotNull();
assertThat(audioBox.isChecked()).isTrue();
assertThat(highQualityAudioBox).isNotNull();
@@ -152,8 +147,8 @@
when(mProfile.isPreferred(any())).thenReturn(false);
mFragment.onDeviceAttributesChanged();
audioBox = profilesGroup.findViewWithTag(mProfile.toString());
- highQualityAudioBox = profilesGroup.findViewWithTag(
- DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
+ highQualityAudioBox =
+ profilesGroup.findViewWithTag(DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
assertThat(audioBox).isNotNull();
assertThat(audioBox.isChecked()).isFalse();
assertThat(highQualityAudioBox).isNotNull();
@@ -163,8 +158,8 @@
when(mProfile.isPreferred(any())).thenReturn(true);
mFragment.onDeviceAttributesChanged();
audioBox = profilesGroup.findViewWithTag(mProfile.toString());
- highQualityAudioBox = profilesGroup.findViewWithTag(
- DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
+ highQualityAudioBox =
+ profilesGroup.findViewWithTag(DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
assertThat(audioBox).isNotNull();
assertThat(audioBox.isChecked()).isTrue();
assertThat(highQualityAudioBox).isNotNull();
@@ -180,8 +175,8 @@
FragmentTestUtil.startFragment(mFragment);
ViewGroup profilesGroup = mFragment.getDialog().findViewById(R.id.profiles_section);
CheckBox audioBox = profilesGroup.findViewWithTag(mProfile.toString());
- CheckBox highQualityAudioBox = profilesGroup.findViewWithTag(
- DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
+ CheckBox highQualityAudioBox =
+ profilesGroup.findViewWithTag(DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
assertThat(audioBox).isNotNull();
assertThat(audioBox.isChecked()).isFalse();
@@ -198,9 +193,8 @@
// A device that doesn't support high quality audio shouldn't have the checkbox for
// high quality audio support.
ViewGroup profilesGroup = mFragment.getDialog().findViewById(R.id.profiles_section);
- CheckBox box = (CheckBox) profilesGroup.findViewWithTag(
- DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
+ CheckBox box =
+ profilesGroup.findViewWithTag(DeviceProfilesSettings.HIGH_QUALITY_AUDIO_PREF_TAG);
assertThat(box).isNull();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
index cacba0c..c9a93ac 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
@@ -27,7 +27,6 @@
import android.app.Activity;
import android.app.AlertDialog;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -39,11 +38,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowDialog;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ForgetDeviceDialogFragmentTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
index ca11ba1..5a8f249 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
@@ -31,7 +31,6 @@
import android.widget.EditText;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -42,12 +41,10 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowDialog;
import org.robolectric.util.FragmentTestUtil;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RemoteDeviceNameDialogFragmentTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -82,7 +79,7 @@
public void deviceNameDisplayIsCorrect() {
String deviceName = "ABC Corp Headphones";
AlertDialog dialog = startDialog(deviceName);
- EditText editText = (EditText) dialog.findViewById(R.id.edittext);
+ EditText editText = dialog.findViewById(R.id.edittext);
assertThat(editText.getText().toString()).isEqualTo(deviceName);
// Make sure that the "rename" button isn't enabled since the text hasn't changed yet, but
@@ -108,7 +105,7 @@
// Once we modify the text, the positive button should be clickable, and clicking it should
// cause a call to change the name.
- EditText editText = (EditText) dialog.findViewById(R.id.edittext);
+ EditText editText = dialog.findViewById(R.id.edittext);
editText.setText(deviceNameModified);
assertThat(positiveButton.isEnabled()).isTrue();
positiveButton.performClick();
@@ -124,7 +121,7 @@
// Modifying the text but then hitting cancel should not cause the name to change.
Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
assertThat(negativeButton.isEnabled()).isTrue();
- EditText editText = (EditText) dialog.findViewById(R.id.edittext);
+ EditText editText = dialog.findViewById(R.id.edittext);
editText.setText(deviceNameModified);
negativeButton.performClick();
verify(mCachedDevice, never()).setName(anyString());
diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
index 54b946b..ee76269 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
@@ -20,12 +20,12 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,11 +37,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SavedBluetoothDeviceUpdaterTest {
+
@Mock
private DashboardFragment mDashboardFragment;
@Mock
@@ -60,7 +59,7 @@
mContext = RuntimeEnvironment.application;
doReturn(mContext).when(mDashboardFragment).getContext();
- doReturn(mBluetoothDevice).when(mCachedBluetoothDevice).getDevice();
+ when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
mBluetoothDeviceUpdater = spy(new SavedBluetoothDeviceUpdater(mDashboardFragment,
mDevicePreferenceCallback, null));
@@ -91,18 +90,17 @@
@Test
public void testOnConnectionStateChanged_deviceConnected_removePreference() {
- mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
- BluetoothAdapter.STATE_CONNECTED);
+ mBluetoothDeviceUpdater
+ .onConnectionStateChanged(mCachedBluetoothDevice, BluetoothAdapter.STATE_CONNECTED);
verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);
}
@Test
public void testOnConnectionStateChanged_deviceDisconnected_addPreference() {
- mBluetoothDeviceUpdater.onConnectionStateChanged(mCachedBluetoothDevice,
- BluetoothAdapter.STATE_DISCONNECTED);
+ mBluetoothDeviceUpdater
+ .onConnectionStateChanged(mCachedBluetoothDevice, BluetoothAdapter.STATE_DISCONNECTED);
verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
index c3b22b3..80366e2 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java
@@ -25,10 +25,8 @@
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -38,24 +36,19 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = SettingsShadowResources.class)
public class UtilsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
- private FakeFeatureFactory mFakeFeatureFactory;
private MetricsFeatureProvider mMetricsFeatureProvider;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
- mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
+ mMetricsFeatureProvider = FakeFeatureFactory.setupForTest().getMetricsFeatureProvider();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
index 5c1c132..a628d400 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settingslib.drawer.CategoryKey;
@@ -30,13 +29,12 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AdvancedConnectedDeviceDashboardFragmentTest {
+
private AdvancedConnectedDeviceDashboardFragment mFragment;
@Before
@@ -54,9 +52,8 @@
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
- mFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- RuntimeEnvironment.application,
- true /* enabled */);
+ AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+ .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
@@ -72,7 +69,7 @@
final Context context = RuntimeEnvironment.application;
final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(context);
- final int xmlId = (new ConnectedDeviceDashboardFragment()).getPreferenceScreenResId();
+ final int xmlId = new ConnectedDeviceDashboardFragment().getPreferenceScreenResId();
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java
index 3e60ca6..12fca1e 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java
@@ -19,65 +19,49 @@
import android.content.Context;
import android.provider.Settings;
+import android.provider.Settings.Secure;
import android.util.FeatureFlagUtils;
-import com.android.settings.TestConfig;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.FeatureFlags;
-import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
- SettingsShadowSystemProperties.class)
public class BluetoothOnWhileDrivingPreferenceControllerTest {
+
private BluetoothOnWhileDrivingPreferenceController mController;
private Context mContext;
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new BluetoothOnWhileDrivingPreferenceController(mContext);
}
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void getAvailabilityStatus_onWhenEnabled() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.BLUETOOTH_WHILE_DRIVING, true);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.AVAILABLE);
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getAvailabilityStatus_offWhenDisabled() {
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+ .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
}
@Test
public void setChecked_togglesSettingSecure() {
mController.setChecked(true);
- assertThat(
- Settings.Secure.getInt(
- mContext.getContentResolver(),
- Settings.Secure.BLUETOOTH_ON_WHILE_DRIVING,
- 0))
- .isEqualTo(1);
+ final String name = Secure.BLUETOOTH_ON_WHILE_DRIVING;
+ assertThat(Settings.Secure.getInt(mContext.getContentResolver(), name, 0)).isEqualTo(1);
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
index b478c4e..3656b38 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
@@ -16,11 +16,11 @@
package com.android.settings.connecteddevice;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
@@ -29,7 +29,6 @@
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
import com.android.settings.dashboard.DashboardFragment;
@@ -43,11 +42,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ConnectedDeviceGroupControllerTest {
+
private static final String PREFERENCE_KEY_1 = "pref_key_1";
@Mock
@@ -78,7 +76,7 @@
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
mPreferenceGroup = spy(new PreferenceScreen(mContext, null));
- doReturn(mPreferenceManager).when(mPreferenceGroup).getPreferenceManager();
+ when(mPreferenceGroup.getPreferenceManager()).thenReturn(mPreferenceManager);
doReturn(mContext).when(mDashboardFragment).getContext();
mConnectedDeviceGroupController = new ConnectedDeviceGroupController(mDashboardFragment,
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
index 011d620..535531e 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
@@ -16,15 +16,12 @@
package com.android.settings.connecteddevice.usb;
import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,11 +32,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ConnectedUsbDeviceUpdaterTest {
+
private Context mContext;
private ConnectedUsbDeviceUpdater mDeviceUpdater;
@@ -58,8 +54,8 @@
mContext = RuntimeEnvironment.application;
when(mFragment.getContext()).thenReturn(mContext);
- mDeviceUpdater = new ConnectedUsbDeviceUpdater(mFragment, mDevicePreferenceCallback,
- mUsbBackend);
+ mDeviceUpdater =
+ new ConnectedUsbDeviceUpdater(mFragment, mDevicePreferenceCallback, mUsbBackend);
mDeviceUpdater.mUsbReceiver = mUsbReceiver;
}
@@ -68,16 +64,16 @@
mDeviceUpdater.initUsbPreference(mContext);
assertThat(mDeviceUpdater.mUsbPreference.getTitle()).isEqualTo("USB");
- assertThat(mDeviceUpdater.mUsbPreference.getIcon()).isEqualTo(mContext.getDrawable(
- R.drawable.ic_usb));
+ assertThat(mDeviceUpdater.mUsbPreference.getIcon())
+ .isEqualTo(mContext.getDrawable(R.drawable.ic_usb));
assertThat(mDeviceUpdater.mUsbPreference.isSelectable()).isFalse();
}
@Test
public void testInitUsbPreference_usbConnected_preferenceAdded() {
mDeviceUpdater.initUsbPreference(mContext);
- mDeviceUpdater.mUsbConnectionListener.onUsbConnectionChanged(true /* connected */,
- UsbBackend.MODE_DATA_NONE);
+ mDeviceUpdater.mUsbConnectionListener
+ .onUsbConnectionChanged(true /* connected */, UsbBackend.MODE_DATA_NONE);
verify(mDevicePreferenceCallback).onDeviceAdded(mDeviceUpdater.mUsbPreference);
}
@@ -85,10 +81,9 @@
@Test
public void testInitUsbPreference_usbDisconnected_preferenceRemoved() {
mDeviceUpdater.initUsbPreference(mContext);
- mDeviceUpdater.mUsbConnectionListener.onUsbConnectionChanged(false /* connected */,
- UsbBackend.MODE_DATA_NONE);
+ mDeviceUpdater.mUsbConnectionListener
+ .onUsbConnectionChanged(false /* connected */, UsbBackend.MODE_DATA_NONE);
verify(mDevicePreferenceCallback).onDeviceRemoved(mDeviceUpdater.mUsbPreference);
}
-
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
index 01d4b82..c70184a 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
@@ -17,9 +17,6 @@
package com.android.settings.connecteddevice.usb;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -28,7 +25,6 @@
import android.net.ConnectivityManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.wrapper.UserManagerWrapper;
import org.junit.Before;
@@ -36,10 +32,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UsbBackendTest {
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -58,7 +52,7 @@
.thenReturn(true);
when((Object)mContext.getSystemService(UsbManager.class)).thenReturn(mUsbManager);
when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
- .thenReturn((Object) mConnectivityManager);
+ .thenReturn(mConnectivityManager);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java
index 50b47e0..e493ef3 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java
@@ -16,20 +16,12 @@
package com.android.settings.connecteddevice.usb;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.hardware.usb.UsbManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,17 +30,14 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-
-import java.util.List;
+import org.robolectric.shadows.ShadowApplication.Wrapper;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UsbConnectionBroadcastReceiverTest {
+
private Context mContext;
private UsbConnectionBroadcastReceiver mReceiver;
- private ShadowApplication mShadowApplication;
@Mock
private UsbConnectionBroadcastReceiver.UsbConnectionListener mListener;
@@ -59,7 +48,6 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- mShadowApplication = ShadowApplication.getInstance();
mContext = RuntimeEnvironment.application;
mReceiver = new UsbConnectionBroadcastReceiver(mContext, mListener, mUsbBackend);
}
@@ -104,9 +92,7 @@
mReceiver.register();
mReceiver.register();
- final List<BroadcastReceiver> receivers = mShadowApplication.getReceiversForIntent(
- new Intent(UsbManager.ACTION_USB_STATE));
- assertHasOneUsbConnectionBroadcastReceiver(receivers);
+ assertThat(countUsbConnectionBroadcastReceivers()).isEqualTo(1);
}
@Test
@@ -115,29 +101,16 @@
mReceiver.unregister();
mReceiver.unregister();
- final List<BroadcastReceiver> receivers = mShadowApplication.getReceiversForIntent(
- new Intent(UsbManager.ACTION_USB_STATE));
- assertHasNoUsbConnectionBroadcastReceiver(receivers);
+ assertThat(countUsbConnectionBroadcastReceivers()).isEqualTo(0);
}
- private void assertHasOneUsbConnectionBroadcastReceiver(List<BroadcastReceiver> receivers) {
- boolean hasReceiver = false;
- for (final BroadcastReceiver receiver : receivers) {
- if (receiver instanceof UsbConnectionBroadcastReceiver) {
- // If hasReceiver is true, then we're at the second copy of it so fail.
- assertWithMessage(
- "Only one instance of UsbConnectionBroadcastReceiver should be "
- + "registered").that(
- hasReceiver).isFalse();
- hasReceiver = true;
+ private int countUsbConnectionBroadcastReceivers() {
+ int count = 0;
+ for (Wrapper wrapper : ShadowApplication.getInstance().getRegisteredReceivers()) {
+ if (wrapper.getBroadcastReceiver() instanceof UsbConnectionBroadcastReceiver) {
+ count++;
}
}
- assertThat(hasReceiver).isTrue();
- }
-
- private void assertHasNoUsbConnectionBroadcastReceiver(List<BroadcastReceiver> receivers) {
- for (final BroadcastReceiver receiver : receivers) {
- assertThat(receiver instanceof UsbConnectionBroadcastReceiver).isFalse();
- }
+ return count;
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
index 0f6adbe..62b018f 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
@@ -17,13 +17,11 @@
package com.android.settings.connecteddevice.usb;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.hardware.usb.UsbManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -31,10 +29,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UsbDefaultFragmentTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java
index e1f9078..5e219f9 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java
@@ -16,24 +16,19 @@
package com.android.settings.connecteddevice.usb;
-import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.Activity;
import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
+import android.support.v14.preference.PreferenceFragment;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
-import android.support.v14.preference.PreferenceFragment;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
-import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -49,8 +44,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowEntityHeaderController.class, SettingsShadowResources.class})
+@Config(shadows = ShadowEntityHeaderController.class)
public class UsbDetailsHeaderControllerTest {
private UsbDetailsHeaderController mDetailsHeaderController;
@@ -104,8 +98,8 @@
mDetailsHeaderController.refresh(UsbBackend.MODE_DATA_NONE);
verify(mHeaderController).setLabel(mContext.getString(R.string.usb_pref));
verify(mHeaderController).setIcon(mContext.getDrawable(R.drawable.ic_usb));
- verify(mHeaderController).setSummary(
- mContext.getString(R.string.usb_summary_charging_only));
+ verify(mHeaderController)
+ .setSummary(mContext.getString(R.string.usb_summary_charging_only));
verify(mHeaderController).done(mActivity, true);
}
@@ -115,8 +109,8 @@
mDetailsHeaderController.refresh(UsbBackend.MODE_DATA_MTP);
verify(mHeaderController).setLabel(mContext.getString(R.string.usb_pref));
verify(mHeaderController).setIcon(mContext.getDrawable(R.drawable.ic_usb));
- verify(mHeaderController).setSummary(
- mContext.getString(R.string.usb_summary_file_transfers));
+ verify(mHeaderController)
+ .setSummary(mContext.getString(R.string.usb_summary_file_transfers));
verify(mHeaderController).done(mActivity, true);
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesControllerTest.java
index 234be88..95547f4 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.connecteddevice.usb;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -25,27 +24,20 @@
import android.app.Activity;
import android.content.Context;
import android.hardware.usb.UsbManager;
+import android.support.v14.preference.PreferenceFragment;
+import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
-import android.support.v14.preference.PreferenceFragment;
-import android.support.v14.preference.SwitchPreference;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settingslib.core.lifecycle.Lifecycle;
-
import com.google.android.collect.Lists;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
@@ -55,7 +47,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UsbDetailsProfilesControllerTest {
private UsbDetailsProfilesController mDetailsProfilesController;
@@ -238,7 +229,7 @@
}
private List<SwitchPreference> getProfileSwitches() {
- ArrayList<SwitchPreference> result = new ArrayList<>();
+ List<SwitchPreference> result = new ArrayList<>();
for (int i = 0; i < mPreference.getPreferenceCount(); i++) {
result.add((SwitchPreference) mPreference.getPreference(i));
}
diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
index 3949652..34fbb01 100644
--- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
@@ -23,7 +23,6 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
-import com.android.settings.TestConfig;
import com.android.settings.slices.SliceData;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,10 +32,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BasePreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java
index ecd756a..394437f 100644
--- a/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java
+++ b/tests/robotests/src/com/android/settings/core/InstrumentedActivityTest.java
@@ -16,17 +16,13 @@
package com.android.settings.core;
-import android.content.res.Resources;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class InstrumentedActivityTest {
/**
diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
index e8724a7..026906c 100644
--- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
@@ -30,23 +30,16 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- SettingsShadowSystemProperties.class
-})
public class InstrumentedPreferenceFragmentTest {
@Mock
@@ -67,11 +60,6 @@
ReflectionHelpers.setField(mFragment, "mPreferenceManager", mPreferenceManager);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onCreatePreferences_noPreferenceScreenResId_shouldNotAddPreference() {
mFragment.onCreatePreferences(Bundle.EMPTY, null /* rootKey */);
@@ -118,7 +106,7 @@
return mScreenId;
}
- public void setPreferenceScreenResId(int id) {
+ private void setPreferenceScreenResId(int id) {
mScreenId = id;
}
}
diff --git a/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java b/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java
index 4361f78..9287976 100644
--- a/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java
+++ b/tests/robotests/src/com/android/settings/core/PreferenceControllerListHelperTest.java
@@ -21,7 +21,6 @@
import android.content.Context;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.slices.FakePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -36,7 +35,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PreferenceControllerListHelperTest {
private Context mContext;
@@ -125,5 +123,4 @@
.filterControllers(controllers, filter);
assertThat(result).isEmpty();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java
index 3143381..55a0acb 100644
--- a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java
+++ b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java
@@ -32,7 +32,6 @@
import android.os.UserHandle;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
@@ -43,10 +42,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SubSettingLauncherTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
index ab770f1..6afb54d 100644
--- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.support.v14.preference.SwitchPreference;
-import com.android.settings.TestConfig;
import com.android.settings.slices.SliceData;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -28,10 +27,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TogglePreferenceControllerTest {
FakeToggle mToggleController;
diff --git a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
index 4939cca..078393f 100644
--- a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
+++ b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
@@ -2,8 +2,6 @@
import static com.google.common.truth.Truth.assertWithMessage;
-import static org.mockito.Mockito.mock;
-
import android.content.Context;
import android.content.res.XmlResourceParser;
import android.provider.SearchIndexableResource;
@@ -12,7 +10,6 @@
import android.util.Xml;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchFeatureProvider;
@@ -21,12 +18,10 @@
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.xmlpull.v1.XmlPullParser;
import java.lang.reflect.Constructor;
@@ -38,20 +33,13 @@
import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class XmlControllerAttributeTest {
// List of classes that are too hard to mock in order to retrieve xml information.
- private final List<Class> illegalClasses = new ArrayList<>(
- Arrays.asList(
- SecuritySettings.class
- ));
+ private final List<Class> illegalClasses = Arrays.asList(SecuritySettings.class);
// List of XML that could be retrieved from the illegalClasses list.
- private final List<Integer> whitelistXml = new ArrayList<>(
- Arrays.asList(
- R.xml.security_dashboard_settings
- ));
+ private final List<Integer> whitelistXml = Arrays.asList(R.xml.security_dashboard_settings);
private static final String NO_VALID_CONSTRUCTOR_ERROR =
"Controllers added in XML need a constructor following either:"
@@ -67,20 +55,12 @@
Context mContext;
SearchFeatureProvider mSearchProvider;
- private FakeFeatureFactory mFakeFeatureFactory;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mSearchProvider = new SearchFeatureProviderImpl();
- mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
- mFakeFeatureFactory.searchFeatureProvider = mSearchProvider;
- }
-
- @After
- public void cleanUp() {
- mFakeFeatureFactory.searchFeatureProvider = mock(
- SearchFeatureProvider.class);
+ FakeFeatureFactory.setupForTest().searchFeatureProvider = mSearchProvider;
}
@Test
@@ -130,7 +110,7 @@
}
private Set<Integer> getIndexableXml() {
- Set<Integer> xmlResSet = new HashSet();
+ Set<Integer> xmlResSet = new HashSet<>();
Collection<Class> indexableClasses =
mSearchProvider.getSearchIndexableResources().getProviderValues();
@@ -138,15 +118,15 @@
for (Class clazz : indexableClasses) {
- Indexable.SearchIndexProvider provider = DatabaseIndexingUtils.getSearchIndexProvider(
- clazz);
+ Indexable.SearchIndexProvider provider =
+ DatabaseIndexingUtils.getSearchIndexProvider(clazz);
if (provider == null) {
continue;
}
- List<SearchIndexableResource> resources = provider.getXmlResourcesToIndex(mContext,
- true);
+ List<SearchIndexableResource> resources =
+ provider.getXmlResourcesToIndex(mContext, true);
if (resources == null) {
continue;
@@ -203,19 +183,18 @@
}
private Class<?> getClassFromClassName(String className) {
- Class<?> clazz = null;
try {
- clazz = Class.forName(className);
+ return Class.forName(className);
} catch (ClassNotFoundException e) {
+ return null;
}
- return clazz;
}
private Constructor<?> getConstructorFromClass(Class<?> clazz) {
Constructor<?> constructor = null;
try {
constructor = clazz.getConstructor(Context.class);
- } catch (NoSuchMethodException e) {
+ } catch (NoSuchMethodException ignored) {
}
if (constructor != null) {
@@ -224,7 +203,7 @@
try {
constructor = clazz.getConstructor(Context.class, String.class);
- } catch (NoSuchMethodException e) {
+ } catch (NoSuchMethodException ignored) {
}
return constructor;
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java b/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java
index bf57f40..982264a 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/ClassScanner.java
@@ -29,8 +29,7 @@
*/
public class ClassScanner {
- public List<Class<?>> getClassesForPackage(String packageName)
- throws ClassNotFoundException {
+ public List<Class<?>> getClassesForPackage(String packageName) throws ClassNotFoundException {
final List<Class<?>> classes = new ArrayList<>();
try {
@@ -64,5 +63,4 @@
}
return classes;
}
-
}
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
index 126a346..8470acb 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
@@ -18,25 +18,22 @@
import static com.google.common.truth.Truth.assertThat;
-import com.android.settings.TestConfig;
import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector;
import com.android.settings.search.SearchIndexProviderCodeInspector;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
import java.util.List;
/**
- * Test suite that scans all class in app package, and perform different types of code inspection
+ * Test suite that scans all classes in app package, and performs different types of code inspection
* for conformance.
*/
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- assetDir = "/tests/robotests/assets")
public class CodeInspectionTest {
private List<Class<?>> mClasses;
@@ -48,8 +45,13 @@
}
@Test
- public void runCodeInspections() {
+ public void runInstrumentableFragmentCodeInspection() {
new InstrumentableFragmentCodeInspector(mClasses).run();
+ }
+
+ @Ignore("b/73960706")
+ @Test
+ public void runSearchIndexProviderCodeInspection() {
new SearchIndexProviderCodeInspector(mClasses).run();
}
}
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
index 91046fe..d8869ea 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
@@ -16,7 +16,9 @@
package com.android.settings.core.codeinspection;
-import org.robolectric.shadows.ShadowApplication;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import org.robolectric.RuntimeEnvironment;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -24,8 +26,6 @@
import java.lang.reflect.Modifier;
import java.util.List;
-import static com.google.common.truth.Truth.assertWithMessage;
-
/**
* Inspector takes a list of class objects and perform static code analysis in its {@link #run()}
* method.
@@ -34,7 +34,7 @@
protected static final String PACKAGE_NAME = "com.android.settings";
- protected static final String TEST_CLASS_SUFFIX = "Test";
+ private static final String TEST_CLASS_SUFFIX = "Test";
private static final String TEST_INNER_CLASS_SIGNATURE = "Test$";
protected final List<Class<?>> mClasses;
@@ -49,14 +49,12 @@
public abstract void run();
protected void assertNoObsoleteInGrandfatherList(String listName, List<String> list) {
- final StringBuilder obsoleteGrandfatherItems = new StringBuilder(
- listName + " contains item that should not be grandfathered.\n");
+ final StringBuilder obsoleteGrandfatherItems = new StringBuilder(listName)
+ .append(" contains item that should not be grandfathered.\n");
for (String c : list) {
obsoleteGrandfatherItems.append(c).append("\n");
}
- assertWithMessage(obsoleteGrandfatherItems.toString())
- .that(list)
- .isEmpty();
+ assertWithMessage(obsoleteGrandfatherItems.toString()).that(list).isEmpty();
}
protected boolean isConcreteSettingsClass(Class clazz) {
@@ -82,9 +80,7 @@
public static void initializeGrandfatherList(List<String> grandfather, String filename) {
try {
- final InputStream in = ShadowApplication.getInstance().getApplicationContext()
- .getAssets()
- .open(filename);
+ final InputStream in = RuntimeEnvironment.application.getAssets().open(filename);
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
String line;
while ((line = reader.readLine()) != null) {
@@ -93,6 +89,5 @@
} catch (Exception e) {
throw new IllegalArgumentException("Error initializing grandfather " + filename, e);
}
-
}
}
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
index 867b5df..f0c2442 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
@@ -61,13 +61,11 @@
}
}
final StringBuilder sb = new StringBuilder(
- "All fragment should implement Instrumentable, but the following are not:\n");
+ "All fragments should implement Instrumentable, but the following are not:\n");
for (String c : broken) {
sb.append(c).append("\n");
}
- assertWithMessage(sb.toString())
- .that(broken.isEmpty())
- .isTrue();
+ assertWithMessage(sb.toString()).that(broken.isEmpty()).isTrue();
assertNoObsoleteInGrandfatherList("grandfather_not_implementing_instrumentable",
grandfather_notImplementingInstrumentable);
}
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
index 8ad2d69..c5a6bca 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
@@ -19,17 +19,14 @@
import android.os.Bundle;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class InstrumentedDialogFragmentTest {
public static class TestDialogFragment extends InstrumentedDialogFragment {
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
index 2950c07..17fa381 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -16,55 +16,24 @@
package com.android.settings.core.instrumentation;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-import android.content.ComponentName;
import android.content.Context;
-import android.content.Intent;
-import android.util.Pair;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.TestConfig;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.instrumentation.LogWriter;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MetricsFeatureProviderTest {
- private static int CATEGORY = 10;
- private static boolean SUBTYPE_BOOLEAN = true;
- private static int SUBTYPE_INTEGER = 1;
- private static long ELAPSED_TIME = 1000;
-
- @Mock private LogWriter mockLogWriter;
- @Mock private VisibilityLoggerMixin mockVisibilityLogger;
private Context mContext;
- @Captor
- private ArgumentCaptor<Pair> mPairCaptor;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -78,6 +47,6 @@
MetricsFeatureProvider feature2 =
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
- assertThat(feature1 == feature2).isTrue();
+ assertThat(feature1).isSameAs(feature2);
}
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index 427f1d0..e28e89d 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -40,7 +40,6 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.conditional.Condition;
import com.android.settings.dashboard.suggestions.SuggestionAdapter;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -63,12 +62,7 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- })
+@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public class DashboardAdapterTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -93,8 +87,7 @@
when(mContext.getSystemService(Context.WINDOW_SERVICE)).thenReturn(mWindowManager);
when(mContext.getResources()).thenReturn(mResources);
- when(mResources.getQuantityString(any(int.class), any(int.class), any()))
- .thenReturn("");
+ when(mResources.getQuantityString(any(int.class), any(int.class), any())).thenReturn("");
mConditionList = new ArrayList<>();
mConditionList.add(mCondition);
@@ -108,8 +101,7 @@
public void testSuggestionDismissed_notOnlySuggestion_updateSuggestionOnly() {
final DashboardAdapter adapter =
spy(new DashboardAdapter(mContext, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */, null /*
- lifecycle */));
+ null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */));
final List<Suggestion> suggestions = makeSuggestionsV2("pkg1", "pkg2", "pkg3");
adapter.setSuggestions(suggestions);
@@ -142,8 +134,7 @@
public void testSuggestionDismissed_onlySuggestion_updateDashboardData() {
DashboardAdapter adapter =
spy(new DashboardAdapter(mContext, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */, null /*
- lifecycle */));
+ null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */));
final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
adapter.setSuggestions(suggestions);
final DashboardData dashboardData = adapter.mDashboardData;
@@ -230,9 +221,4 @@
}
return suggestions;
}
-
- private void setupSuggestions(List<Suggestion> suggestions) {
- final Context context = RuntimeEnvironment.application;
- mDashboardAdapter.setSuggestions(suggestions);
- }
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
index 35f525e..e9ea654 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
@@ -18,8 +18,8 @@
import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_CONTAINER;
import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_FOOTER;
-import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONTAINER;
import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONDITION_DIVIDER;
+import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONTAINER;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -30,7 +30,6 @@
import android.support.v7.util.DiffUtil;
import android.support.v7.util.ListUpdateCallback;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.conditional.AirplaneModeCondition;
import com.android.settings.dashboard.conditional.Condition;
import com.android.settingslib.drawer.DashboardCategory;
@@ -42,17 +41,15 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DashboardDataTest {
+
private static final String TEST_SUGGESTION_TITLE = "Use fingerprint";
private static final String TEST_CATEGORY_TILE_TITLE = "Display";
@@ -125,7 +122,7 @@
public void testBuildItemsData_shouldSetstableId() {
final List<DashboardData.Item> items = mDashboardDataWithOneConditions.getItemList();
- // suggestion, seperator, condition, footer, 1 tile
+ // suggestion, separator, condition, footer, 1 tile
assertThat(items).hasSize(5);
assertThat(items.get(0).id).isEqualTo(STABLE_ID_SUGGESTION_CONTAINER);
@@ -151,8 +148,7 @@
if (item instanceof List) {
assertThat(item).isEqualTo(expectedObjects[i]);
} else if (item instanceof DashboardData.ConditionHeaderData) {
- DashboardData.ConditionHeaderData i1 =
- (DashboardData.ConditionHeaderData) item;
+ DashboardData.ConditionHeaderData i1 = (DashboardData.ConditionHeaderData) item;
DashboardData.ConditionHeaderData i2 =
(DashboardData.ConditionHeaderData) expectedObjects[i];
assertThat(i1.title).isEqualTo(i2.title);
@@ -179,8 +175,7 @@
@Test
public void testGetPositionByTile_selfInstance_returnPositionFound() {
- final int position = mDashboardDataWithOneConditions
- .getPositionByTile(mTestCategoryTile);
+ final int position = mDashboardDataWithOneConditions.getPositionByTile(mTestCategoryTile);
assertThat(position).isNotEqualTo(DashboardData.POSITION_NOT_FOUND);
}
@@ -209,7 +204,6 @@
@Test
public void testDiffUtil_InsertOneCondition_ResultDataOneChanged() {
- //Build testResultData
final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
// Item in position 3 is the condition container containing the list of conditions, which
// gets 1 more item
@@ -222,7 +216,6 @@
@Test
public void testDiffUtil_RemoveOneSuggestion_causeItemRemoveAndChange() {
- //Build testResultData
final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
// removed suggestion and the divider
testResultData.add(new ListUpdateResult.ResultData(
@@ -254,7 +247,6 @@
@Test
public void testDiffUtil_DeleteAllData_ResultDataOneDeleted() {
- //Build testResultData
final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
testResultData.add(new ListUpdateResult.ResultData(
ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 5));
@@ -264,18 +256,17 @@
@Test
public void testDiffUtil_typeSuggestedContainer_ResultDataNothingChanged() {
- //Build testResultData
final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
DashboardData prevData = new DashboardData.Builder()
.setConditions(null)
.setCategory(null)
- .setSuggestions(Arrays.asList(mTestSuggestion))
+ .setSuggestions(Collections.singletonList(mTestSuggestion))
.build();
DashboardData currentData = new DashboardData.Builder()
.setConditions(null)
.setCategory(null)
- .setSuggestions(Arrays.asList(mTestSuggestion))
+ .setSuggestions(Collections.singletonList(mTestSuggestion))
.build();
testDiffUtil(prevData, currentData, testResultData);
}
@@ -333,7 +324,7 @@
mResultData = new ArrayList<>();
}
- public List<ResultData> getResultData() {
+ private List<ResultData> getResultData() {
return mResultData;
}
@@ -368,16 +359,17 @@
* or "The data is moved(operation) from position1(arg1) to position2(arg2)"
*/
private static class ResultData implements Comparable<ResultData> {
- public static final int TYPE_OPERATION_INSERT = 0;
- public static final int TYPE_OPERATION_REMOVE = 1;
- public static final int TYPE_OPERATION_MOVE = 2;
- public static final int TYPE_OPERATION_CHANGE = 3;
- public final int operation;
- public final int arg1;
- public final int arg2;
+ private static final int TYPE_OPERATION_INSERT = 0;
+ private static final int TYPE_OPERATION_REMOVE = 1;
+ private static final int TYPE_OPERATION_MOVE = 2;
+ private static final int TYPE_OPERATION_CHANGE = 3;
- public ResultData(int operation, int arg1, int arg2) {
+ private final int operation;
+ private final int arg1;
+ private final int arg2;
+
+ private ResultData(int operation, int arg1, int arg2) {
this.operation = operation;
this.arg1 = arg1;
this.arg2 = arg2;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index afa914c..4a09b40 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -17,7 +17,6 @@
package com.android.settings.dashboard;
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.eq;
@@ -26,7 +25,6 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import static org.robolectric.RuntimeEnvironment.application;
import static org.robolectric.Shadows.shadowOf;
import android.app.Activity;
@@ -45,7 +43,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowThreadUtils;
@@ -74,9 +71,7 @@
import java.util.ArrayList;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = ShadowUserManager.class)
+@Config(shadows = ShadowUserManager.class)
public class DashboardFeatureProviderImplTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -97,8 +92,8 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
doReturn(mPackageManager).when(mContext).getPackageManager();
- when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(
- new ResolveInfo());
+ when(mPackageManager.resolveActivity(any(Intent.class), anyInt()))
+ .thenReturn(new ResolveInfo());
mFeatureFactory = FakeFeatureFactory.setupForTest();
mImpl = new DashboardFeatureProviderImpl(mContext);
}
@@ -110,8 +105,7 @@
@Test
public void bindPreference_shouldBindAllData() {
- final Preference preference = new Preference(
- ShadowApplication.getInstance().getApplicationContext());
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.title = "title";
tile.summary = "summary";
@@ -132,8 +126,7 @@
@Test
public void bindPreference_noFragmentMetadata_shouldBindIntent() {
- final Preference preference = new Preference(
- ShadowApplication.getInstance().getApplicationContext());
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.metaData = new Bundle();
tile.priority = 10;
@@ -150,7 +143,7 @@
@Test
public void bindPreference_noFragmentMetadata_shouldBindToProfileSelector() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.metaData = new Bundle();
tile.userHandle = new ArrayList<>();
@@ -171,7 +164,7 @@
@Test
public void bindPreference_noFragmentMetadataSingleUser_shouldBindToDirectLaunchIntent() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.metaData = new Bundle();
tile.userHandle = new ArrayList<>();
@@ -196,19 +189,19 @@
@Test
public void bindPreference_toInternalSettingActivity_shouldBindToDirectLaunchIntentAndNotLog() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.metaData = new Bundle();
tile.userHandle = new ArrayList<>();
tile.userHandle.add(mock(UserHandle.class));
tile.intent = new Intent();
tile.intent.setComponent(
- new ComponentName(application.getPackageName(), "class"));
+ new ComponentName(RuntimeEnvironment.application.getPackageName(), "class"));
when(mActivity.getSystemService(Context.USER_SERVICE))
.thenReturn(mUserManager);
when(mActivity.getApplicationContext().getPackageName())
- .thenReturn(application.getPackageName());
+ .thenReturn(RuntimeEnvironment.application.getPackageName());
mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
preference, tile, "123", Preference.DEFAULT_ORDER);
@@ -223,7 +216,7 @@
@Test
public void bindPreference_withNullKeyNullPriority_shouldGenerateKeyAndPriority() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.intent = new Intent();
tile.intent.setComponent(new ComponentName("pkg", "class"));
@@ -236,7 +229,7 @@
@Test
public void bindPreference_noSummary_shouldSetSummaryToPlaceholder() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.intent = new Intent();
tile.intent.setComponent(new ComponentName("pkg", "class"));
@@ -244,12 +237,12 @@
preference, tile, null /*key */, Preference.DEFAULT_ORDER);
assertThat(preference.getSummary())
- .isEqualTo(application.getString(R.string.summary_placeholder));
+ .isEqualTo(RuntimeEnvironment.application.getString(R.string.summary_placeholder));
}
@Test
public void bindPreference_hasSummary_shouldSetSummary() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.summary = "test";
tile.intent = new Intent();
@@ -261,12 +254,9 @@
}
@Test
- @Config(shadows = {
- ShadowTileUtils.class,
- ShadowThreadUtils.class
- })
+ @Config(shadows = {ShadowTileUtils.class, ShadowThreadUtils.class})
public void bindPreference_hasSummaryUri_shouldLoadSummaryFromContentProvider() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.intent = new Intent();
tile.intent.setComponent(new ComponentName("pkg", "class"));
@@ -282,7 +272,7 @@
@Test
public void bindPreference_withNullKeyTileKey_shouldUseTileKey() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.key = "key";
tile.intent = new Intent();
@@ -294,17 +284,14 @@
}
@Test
- @Config(shadows = {
- ShadowTileUtils.class,
- ShadowThreadUtils.class
- })
+ @Config(shadows = {ShadowTileUtils.class, ShadowThreadUtils.class})
public void bindPreference_withIconUri_shouldLoadIconFromContentProvider() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.key = "key";
tile.intent = new Intent();
tile.intent.setComponent(
- new ComponentName(application.getPackageName(), "class"));
+ new ComponentName(RuntimeEnvironment.application.getPackageName(), "class"));
tile.metaData = new Bundle();
tile.metaData.putString(TileUtils.META_DATA_PREFERENCE_ICON_URI,
"content://com.android.settings/tile_icon");
@@ -316,7 +303,7 @@
@Test
public void bindPreference_withBaseOrder_shouldOffsetPriority() {
final int baseOrder = 100;
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.metaData = new Bundle();
tile.priority = 10;
@@ -328,7 +315,7 @@
@Test
public void bindPreference_withOrderMetadata_shouldUseOrderInMetadata() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final int testOrder = -30;
final Tile tile = new Tile();
tile.metaData = new Bundle();
@@ -342,7 +329,7 @@
@Test
public void bindPreference_invalidOrderMetadata_shouldIgnore() {
- final Preference preference = new Preference(application);
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.metaData = new Bundle();
tile.metaData.putString(mImpl.META_DATA_KEY_ORDER, "hello");
@@ -356,8 +343,7 @@
@Test
public void bindPreference_withIntentActionMetadata_shouldSetLaunchAction() {
Activity activity = Robolectric.buildActivity(Activity.class).get();
- final ShadowApplication application = ShadowApplication.getInstance();
- final Preference preference = new Preference(application.getApplicationContext());
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile();
tile.key = "key";
tile.intent = new Intent();
@@ -380,7 +366,7 @@
@Test
public void clickPreference_withUnresolvableIntent_shouldNotLaunchAnything() {
ReflectionHelpers.setField(
- mImpl, "mPackageManager", application.getPackageManager());
+ mImpl, "mPackageManager", RuntimeEnvironment.application.getPackageManager());
Activity activity = Robolectric.buildActivity(Activity.class).get();
final ShadowApplication application = ShadowApplication.getInstance();
final Preference preference = new Preference(application.getApplicationContext());
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index 49734b6..2da3f0d 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -33,7 +33,6 @@
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -49,17 +48,14 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DashboardFragmentTest {
-
@Mock
private FakeFeatureFactory mFakeFeatureFactory;
private DashboardCategory mDashboardCategory;
@@ -73,11 +69,11 @@
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
mDashboardCategory = new DashboardCategory();
mDashboardCategory.addTile(new Tile());
- mTestFragment = new TestFragment(mContext);
+ mTestFragment = new TestFragment(RuntimeEnvironment.application);
when(mFakeFeatureFactory.dashboardFeatureProvider
.getTilesForCategory(nullable(String.class)))
.thenReturn(mDashboardCategory);
- mTestFragment.onAttach(mContext);
+ mTestFragment.onAttach(RuntimeEnvironment.application);
when(mContext.getPackageName()).thenReturn("TestPackage");
}
@@ -154,8 +150,7 @@
preferenceControllers.add(mockController2);
when(mockController1.isAvailable()).thenReturn(false);
when(mockController2.isAvailable()).thenReturn(true);
-
- mTestFragment.onAttach(mContext);
+ mTestFragment.onAttach(RuntimeEnvironment.application);
mTestFragment.onResume();
verify(mockController1).getPreferenceKey();
@@ -196,8 +191,7 @@
@Test
public void tintTileIcon_noIcon_shouldReturnFalse() {
final Tile tile = new Tile();
- final Bundle metaData = new Bundle();
- tile.metaData = metaData;
+ tile.metaData = new Bundle();
assertThat(mTestFragment.tintTileIcon(tile)).isFalse();
}
@@ -208,8 +202,8 @@
tile.icon = mock(Icon.class);
final Intent intent = new Intent();
tile.intent = intent;
-
- intent.setComponent(new ComponentName(mContext.getPackageName(), "TestClass"));
+ intent.setComponent(
+ new ComponentName(RuntimeEnvironment.application.getPackageName(), "TestClass"));
assertThat(mTestFragment.tintTileIcon(tile)).isFalse();
intent.setComponent(new ComponentName("OtherPackage", "TestClass"));
@@ -219,7 +213,7 @@
public static class TestPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
- public TestPreferenceController(Context context) {
+ private TestPreferenceController(Context context) {
super(context);
}
@@ -240,7 +234,6 @@
@Override
public void updateNonIndexableKeys(List<String> keys) {
-
}
}
@@ -298,5 +291,4 @@
return mPreferenceManager;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
index 7ec2c58..774b62e 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
@@ -16,23 +16,21 @@
package com.android.settings.dashboard;
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
+
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.drawer.Tile;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DashboardItemAnimatorTest {
private DashboardItemAnimator mDashboardItemAnimator;
@@ -40,23 +38,22 @@
@Before
public void SetUp() {
- final Context context = ShadowApplication.getInstance().getApplicationContext();
mDashboardItemAnimator = new DashboardItemAnimator();
- mViewHolder = new ViewHolder(new TextView(context));
+ mViewHolder = new ViewHolder(new TextView(RuntimeEnvironment.application));
mViewHolder.itemView.setTag(new Tile());
}
@Test
public void testAnimateChange_NoPositionChange_NoPendingAnimation() {
- final boolean hasPendingAnimation = mDashboardItemAnimator
- .animateChange(mViewHolder, mViewHolder, 0, 1, 0, 1);
+ final boolean hasPendingAnimation =
+ mDashboardItemAnimator.animateChange(mViewHolder, mViewHolder, 0, 1, 0, 1);
assertThat(hasPendingAnimation).isFalse();
}
@Test
public void testAnimateChange_HasPositionChange_HasPendingAnimation() {
- final boolean hasPendingAnimation = mDashboardItemAnimator
- .animateChange(mViewHolder, mViewHolder, 0, 0, 1, 1);
+ final boolean hasPendingAnimation =
+ mDashboardItemAnimator.animateChange(mViewHolder, mViewHolder, 0, 0, 1, 1);
assertThat(hasPendingAnimation).isTrue();
}
@@ -65,8 +62,8 @@
// Set pending move animations
mDashboardItemAnimator.animateMove(mViewHolder, 0, 0, 1, 1);
- final boolean hasPendingAnimation = mDashboardItemAnimator
- .animateChange(mViewHolder, mViewHolder, 0, 1, 0, 1);
+ final boolean hasPendingAnimation =
+ mDashboardItemAnimator.animateChange(mViewHolder, mViewHolder, 0, 1, 0, 1);
assertThat(hasPendingAnimation).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
index d9c709e..c4ada03 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
@@ -29,10 +29,8 @@
import android.app.Activity;
import android.content.Context;
-import android.service.settings.suggestions.Suggestion;
import android.support.v7.widget.LinearLayoutManager;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.conditional.ConditionManager;
import com.android.settings.dashboard.conditional.FocusRecyclerView;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -47,12 +45,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DashboardSummaryTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
index c48f30c..1d2bf5a 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
@@ -16,12 +16,16 @@
package com.android.settings.dashboard;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -29,18 +33,10 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DashboardTilePlaceholderPreferenceControllerTest {
-
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock(answer = RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java
index 4c62a6f..f270395 100644
--- a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java
@@ -16,7 +16,6 @@
package com.android.settings.dashboard;
-
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
@@ -24,17 +23,14 @@
import android.graphics.drawable.ColorDrawable;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RoundedHomepageIconTest {
private Context mContext;
@@ -46,11 +42,11 @@
@Test
public void createIcon_shouldSetBackgroundAndInset() {
- final RoundedHomepageIcon icon = new RoundedHomepageIcon(
- mContext, new ColorDrawable(Color.BLACK));
+ final RoundedHomepageIcon icon =
+ new RoundedHomepageIcon(mContext, new ColorDrawable(Color.BLACK));
assertThat(icon.getNumberOfLayers()).isEqualTo(2);
assertThat(icon.getDrawable(0))
- .isEqualTo(mContext.getDrawable(R.drawable.ic_homepage_generic_background));
+ .isEqualTo(mContext.getDrawable(R.drawable.ic_homepage_generic_background));
}
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
index 574443d..0fac2fc 100644
--- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
@@ -23,7 +23,6 @@
import android.app.Activity;
import android.content.Intent;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.drawer.CategoryKey;
@@ -35,10 +34,8 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SummaryLoaderTest {
private static final String SUMMARY_1 = "summary1";
@@ -85,7 +82,6 @@
@Test
public void testUpdateSummaryToCache_hasCache_shouldUpdate() {
-
final String testSummary = "test_summary";
final DashboardCategory category = new DashboardCategory();
final Tile tile = new Tile();
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java
index be0da83..9b5bec3 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java
@@ -15,16 +15,18 @@
*/
package com.android.settings.dashboard.conditional;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.content.Intent;
import android.util.FeatureFlagUtils;
import com.android.settings.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Test;
@@ -33,16 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
- SettingsShadowSystemProperties.class)
public class BackgroundDataConditionTest {
@Mock
private ConditionManager mConditionManager;
@@ -57,7 +51,7 @@
}
@Test
- public void onPrimaryClick_v2enabled_shouldReturnv2SummaryActivity() {
+ public void onPrimaryClick_v2enabled_shouldReturn2SummaryActivity() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.DATA_USAGE_SETTINGS_V2, true);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
index e33db6e..0586d33 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
@@ -16,7 +16,6 @@
package com.android.settings.dashboard.conditional;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -27,7 +26,6 @@
import android.widget.LinearLayout;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.DashboardAdapter;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,14 +35,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ConditionAdapterTest {
+
@Mock
private Condition mCondition1;
@Mock
@@ -92,27 +89,29 @@
@Test
public void onBindViewHolder_shouldSetListener() {
- final View view = LayoutInflater.from(mContext).inflate(
- R.layout.condition_tile, new LinearLayout(mContext), true);
+ final View view = LayoutInflater.from(mContext)
+ .inflate(R.layout.condition_tile, new LinearLayout(mContext), true);
final DashboardAdapter.DashboardItemHolder viewHolder =
new DashboardAdapter.DashboardItemHolder(view);
mConditionAdapter = new ConditionAdapter(mContext, mOneCondition, true);
mConditionAdapter.onBindViewHolder(viewHolder, 0);
final View card = view.findViewById(R.id.content);
+ assertThat(card).isNotNull();
assertThat(card.hasOnClickListeners()).isTrue();
}
@Test
public void viewClick_shouldInvokeConditionPrimaryClick() {
- final View view = LayoutInflater.from(mContext).inflate(
- R.layout.condition_tile, new LinearLayout(mContext), true);
+ final View view = LayoutInflater.from(mContext)
+ .inflate(R.layout.condition_tile, new LinearLayout(mContext), true);
final DashboardAdapter.DashboardItemHolder viewHolder =
new DashboardAdapter.DashboardItemHolder(view);
mConditionAdapter = new ConditionAdapter(mContext, mOneCondition, true);
mConditionAdapter.onBindViewHolder(viewHolder, 0);
final View card = view.findViewById(R.id.content);
+ assertThat(card).isNotNull();
card.performClick();
verify(mCondition1).onPrimaryClick();
}
@@ -131,5 +130,4 @@
mConditionAdapter.mSwipeCallback.onSwiped(viewHolder, 0);
// no crash
}
-
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
index 1a3fa5e..0333ae0 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
@@ -15,22 +15,6 @@
*/
package com.android.settings.dashboard.conditional;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.IntentFilter;
-import android.graphics.drawable.Icon;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.RuntimeEnvironment;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
@@ -40,8 +24,23 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.IntentFilter;
+import android.graphics.drawable.Icon;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ConditionTest {
@Mock
@@ -107,14 +106,12 @@
private static final IntentFilter TESTS_INTENT_FILTER = new IntentFilter("TestIntent");
private static final BroadcastReceiver mReceiver = mock(BroadcastReceiver.class);
- TestCondition(ConditionManager manager,
- MetricsFeatureProvider metricsFeatureProvider) {
+ TestCondition(ConditionManager manager, MetricsFeatureProvider metricsFeatureProvider) {
super(manager, metricsFeatureProvider);
}
@Override
public void refreshState() {
-
}
@Override
@@ -144,12 +141,10 @@
@Override
public void onPrimaryClick() {
-
}
@Override
public void onActionClick(int index) {
-
}
@Override
@@ -161,6 +156,5 @@
public IntentFilter getIntentFilter() {
return TESTS_INTENT_FILTER;
}
-
}
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
index e46ae9e..8be7b6f 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
@@ -15,18 +15,6 @@
*/
package com.android.settings.dashboard.conditional;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.never;
@@ -34,8 +22,19 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DndConditionTest {
@Mock
@@ -54,22 +53,21 @@
@Test
public void constructor_shouldNotDisableReceiver() {
- DndCondition condition = new DndCondition(mConditionManager);
+ new DndCondition(mConditionManager);
verify(mPackageManager, never()).setComponentEnabledSetting(any(ComponentName.class),
eq(PackageManager.COMPONENT_ENABLED_STATE_DISABLED), eq(PackageManager.DONT_KILL_APP));
}
@Test
public void constructor_shouldRegisterReceiver() {
- DndCondition condition = new DndCondition(mConditionManager);
+ new DndCondition(mConditionManager);
verify(mContext).registerReceiver(any(DndCondition.Receiver.class),
eq(DndCondition.DND_FILTER));
}
@Test
public void silence_shouldNotDisableReceiver() {
- DndCondition condition = new DndCondition(mConditionManager);
- condition.silence();
+ new DndCondition(mConditionManager).silence();
verify(mPackageManager, never()).setComponentEnabledSetting(any(ComponentName.class),
eq(PackageManager.COMPONENT_ENABLED_STATE_DISABLED), eq(PackageManager.DONT_KILL_APP));
@@ -88,8 +86,7 @@
@Test
public void onPause_shouldUnregisterReceiver() {
- DndCondition condition = new DndCondition(mConditionManager);
- condition.onPause();
+ new DndCondition(mConditionManager).onPause();
verify(mContext).unregisterReceiver(any(DndCondition.Receiver.class));
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/WorkModeConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/WorkModeConditionTest.java
index dff7700..8ba6ecc 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/WorkModeConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/WorkModeConditionTest.java
@@ -24,7 +24,6 @@
import android.content.Context;
import com.android.settings.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,10 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WorkModeConditionTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
index d96e660..fc34724 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -16,7 +16,6 @@
package com.android.settings.dashboard.suggestions;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -33,7 +32,6 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.service.settings.suggestions.Suggestion;
-import android.view.Display;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager;
@@ -43,7 +41,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.DashboardAdapter;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -57,14 +54,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SuggestionAdapterTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
index e9c8805..f1fe249 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -16,7 +16,6 @@
package com.android.settings.dashboard.suggestions;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
@@ -38,7 +37,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.Settings.NightDisplaySuggestionActivity;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -61,10 +59,7 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- ShadowSecureSettings.class,
- SettingsShadowResources.class,
-})
+@Config(shadows = ShadowSecureSettings.class)
public class SuggestionFeatureProviderImplTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java
index bfd7b4f..5ff88bd 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java
@@ -24,7 +24,6 @@
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,10 +32,8 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SuggestionStateProviderTest {
private SuggestionStateProvider mProvider;
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
index 15ca6e4..5de54ea 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
@@ -16,16 +16,13 @@
package com.android.settings.datausage;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowThreadUtils;
import com.android.settingslib.AppItem;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
@@ -36,11 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = ShadowThreadUtils.class)
public class AppDataUsagePreferenceTest {
@Mock
@@ -71,7 +65,6 @@
assertThat(mPreference.getIcon()).isEqualTo(mUidDetail.icon);
}
-
@Test
public void createPref_noCachedUidDetail_shouldSetAppInfo() {
when(mUidDetailProvider.getUidDetail(mAppItem.key, true /* blocking */))
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index 58643b6..5941f2f 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -36,7 +36,6 @@
import android.util.ArraySet;
import android.view.View;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
@@ -59,11 +58,7 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowEntityHeaderController.class,
- ShadowRestrictedLockUtils.class
- })
+@Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtils.class})
public class AppDataUsageTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -92,9 +87,8 @@
mFragment = spy(new AppDataUsage());
- doReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS))
- .when(mFragment)
- .getPreferenceManager();
+ when(mFragment.getPreferenceManager())
+ .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
ReflectionHelpers.setField(mFragment, "mAppItem", mock(AppItem.class));
@@ -125,9 +119,8 @@
when(mHeaderController.setUid(fakeUserId)).thenReturn(mHeaderController);
when(mHeaderController.setHasAppInfoLink(anyBoolean())).thenReturn(mHeaderController);
- doReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS))
- .when(mFragment)
- .getPreferenceManager();
+ when(mFragment.getPreferenceManager())
+ .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
index ac28e1d..30a28e5 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
@@ -22,47 +22,37 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.graphics.drawable.Drawable;
import android.support.v7.preference.Preference;
-
import android.util.ArraySet;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppPrefLoaderTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
@Mock
private PackageManager mPackageManager;
private AppPrefLoader mLoader;
-
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- final ArraySet<String> pkgs = new ArraySet<>();
+ final ArraySet<String> pkgs = new ArraySet<>(2);
pkgs.add("pkg0");
pkgs.add("pkg1");
- mLoader =
- new AppPrefLoader(RuntimeEnvironment.application, pkgs, mPackageManager);
+ mLoader = new AppPrefLoader(RuntimeEnvironment.application, pkgs, mPackageManager);
}
@Test
@@ -71,8 +61,7 @@
when(mPackageManager.getApplicationInfo(anyString(), anyInt()))
.thenThrow(new NameNotFoundException());
- ArraySet<Preference> preferences = mLoader.loadInBackground();
- assertThat(preferences).isEmpty();
+ assertThat(mLoader.loadInBackground()).isEmpty();
}
@Test
@@ -89,5 +78,4 @@
assertThat(preference.getIcon()).isEqualTo(drawable);
assertThat(preference.isSelectable()).isFalse();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
index 8b635d2..928d01e 100644
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
@@ -15,21 +15,6 @@
*/
package com.android.settings.datausage;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.v7.preference.PreferenceManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
import static org.mockito.Matchers.anyLong;
@@ -37,8 +22,22 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.v7.preference.PreferenceManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BillingCycleSettingsTest {
private static final int LIMIT_BYTES = 123;
diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java
index e520a7b..b634cb6 100644
--- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java
@@ -16,7 +16,6 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.when;
@@ -28,7 +27,6 @@
import android.view.View;
import android.widget.LinearLayout;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class CellDataPreferenceTest {
@Mock
@@ -79,5 +75,4 @@
mListener.onSubscriptionsChanged();
assertThat(mPreference.isEnabled()).isTrue();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
index e60243b..fcbffbe 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
@@ -1,27 +1,28 @@
package com.android.settings.datausage;
+import static com.google.common.truth.Truth.assertThat;
+
import android.net.NetworkPolicy;
import android.net.NetworkTemplate;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.net.DataUsageController.DataUsageInfo;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DataUsageInfoControllerTest {
- private DataUsageInfoController mInfoController;
- private DataUsageInfo info;
+
private static final int NEGATIVE = -1;
private static final int ZERO = 0;
private static final int POSITIVE_SMALL = 1;
private static final int POSITIVE_LARGE = 5;
+ private DataUsageInfoController mInfoController;
+ private DataUsageInfo info;
+
@Before
public void setUp() {
mInfoController = new DataUsageInfoController();
@@ -77,13 +78,13 @@
}
private NetworkPolicy getDefaultNetworkPolicy() {
- NetworkTemplate template = new NetworkTemplate(NetworkTemplate.MATCH_WIFI_WILDCARD,
- null, null);
+ NetworkTemplate template =
+ new NetworkTemplate(NetworkTemplate.MATCH_WIFI_WILDCARD, null, null);
int cycleDay = -1;
String cycleTimezone = "UTC";
long warningBytes = -1;
long limitBytes = -1;
- return new NetworkPolicy(template,cycleDay, cycleTimezone, warningBytes, limitBytes, true);
+ return new NetworkPolicy(template, cycleDay, cycleTimezone, warningBytes, limitBytes, true);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
index 54fbe71..8789595 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
@@ -16,11 +16,15 @@
package com.android.settings.datausage;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
import android.content.Context;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.NetworkPolicyEditor;
import org.junit.Before;
@@ -28,16 +32,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DataUsageListTest {
@Mock
@@ -48,12 +45,10 @@
private Context mContext;
private DataUsageList mDataUsageList;
- private FakeFeatureFactory mFactory;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mFactory = FakeFeatureFactory.setupForTest();
+ FakeFeatureFactory.setupForTest();
mNetworkServices.mPolicyEditor = mock(NetworkPolicyEditor.class);
mDataUsageList = spy(DataUsageList.class);
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java
index ad1defb..2216792 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java
@@ -18,38 +18,26 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
import android.text.format.Formatter;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.NetworkPolicyEditor;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DataUsageSummaryLegacyTest {
+
@Mock
private ConnectivityManager mManager;
private Context mContext;
@@ -69,13 +57,9 @@
}
@Test
- @Config(shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class
- })
public void formatUsage_shouldLookLikeFormatFileSize() {
- SettingsShadowResources.overrideResource(com.android.internal.R.string.fileSizeSuffix,
- "%1$s %2$s");
+ SettingsShadowResources
+ .overrideResource(com.android.internal.R.string.fileSizeSuffix, "%1$s %2$s");
final long usage = 2147483648L; // 2GB
final String formattedUsage =
DataUsageSummaryLegacy.formatUsage(mContext, "^1", usage).toString();
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
index 41032bb..eb94d8d 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
@@ -16,15 +16,17 @@
package com.android.settings.datausage;
-import static org.mockito.Mockito.spy;
+import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.Intent;
import android.net.NetworkTemplate;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.net.DataUsageController;
@@ -35,17 +37,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.concurrent.TimeUnit;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DataUsageSummaryPreferenceControllerTest {
+
private static final long UPDATE_BACKOFF_MS = TimeUnit.MINUTES.toMillis(13);
private static final long CYCLE_BACKOFF_MS = TimeUnit.DAYS.toMillis(6);
private static final long CYCLE_LENGTH_MS = TimeUnit.DAYS.toMillis(30);
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
index 769d9e7..ecd556d 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
@@ -16,6 +16,8 @@
package com.android.settings.datausage;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import android.content.Intent;
import android.support.v7.preference.PreferenceViewHolder;
@@ -25,7 +27,6 @@
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settingslib.utils.StringUtil;
@@ -37,13 +38,10 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
- SettingsShadowResourcesImpl.class)
+@Config(shadows = SettingsShadowResourcesImpl.class)
public class DataUsageSummaryPreferenceTest {
+
private static final long CYCLE_DURATION_MILLIS = 1000000000L;
private static final long UPDATE_LAG_MILLIS = 10000000L;
private static final String DUMMY_CARRIER = "z-mobile";
@@ -63,7 +61,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = RuntimeEnvironment.application;
mSummaryPreference = new DataUsageSummaryPreference(mContext, null /* attrs */);
LayoutInflater inflater = LayoutInflater.from(mContext);
View view = inflater.inflate(mSummaryPreference.getLayoutResource(), null /* root */,
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index c122105..6892264 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -18,38 +18,26 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
import android.text.format.Formatter;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.NetworkPolicyEditor;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DataUsageSummaryTest {
+
@Mock
private ConnectivityManager mManager;
private Context mContext;
@@ -69,10 +57,6 @@
}
@Test
- @Config(shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class
- })
public void formatUsage_shouldLookLikeFormatFileSize() {
SettingsShadowResources.overrideResource(com.android.internal.R.string.fileSizeSuffix,
"%1$s %2$s");
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
index cdcd3a9..b988a6e 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
@@ -22,20 +22,21 @@
import android.content.Context;
import android.net.ConnectivityManager;
-import com.android.settings.TestConfig;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class DataUsageUtilsTest {
- @Mock private ConnectivityManager mManager;
+
+ @Mock
+ private ConnectivityManager mManager;
private Context mContext;
@Before
diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
index fff879f..587dbf2 100644
--- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
@@ -16,8 +16,6 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.nullable;
@@ -27,6 +25,7 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -36,7 +35,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
import com.android.settings.datausage.UnrestrictedDataAccess.AccessPreference;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -56,10 +54,7 @@
import java.util.ArrayList;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowRestrictedLockUtils.class
- })
+@Config(shadows = ShadowRestrictedLockUtils.class)
public class UnrestrictedDataAccessTest {
@Mock
@@ -111,11 +106,11 @@
public void testOnRebuildComplete_restricted_shouldBeDisabled() {
final Context context = RuntimeEnvironment.application;
doReturn(context).when(mFragment).getContext();
- doReturn(context).when(mPreferenceManager).getContext();
+ when(mPreferenceManager.getContext()).thenReturn(context);
doReturn(true).when(mFragment).shouldAddPreference(any(AppEntry.class));
doNothing().when(mFragment).setLoading(anyBoolean(), anyBoolean());
doReturn(mPreferenceScreen).when(mFragment).getPreferenceScreen();
- doReturn(mPreferenceManager).when(mFragment).getPreferenceManager();
+ when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
ReflectionHelpers.setField(mFragment, "mDataSaverBackend", mDataSaverBackend);
final String testPkg1 = "com.example.one";
@@ -160,8 +155,7 @@
info.packageName = packageNames[i];
info.uid = Process.FIRST_APPLICATION_UID + i;
info.sourceDir = info.packageName;
- final AppEntry appEntry = spy(new AppEntry(RuntimeEnvironment.application,
- info, i));
+ final AppEntry appEntry = spy(new AppEntry(RuntimeEnvironment.application, info, i));
appEntry.extraInfo = new DataUsageState(false, false);
doNothing().when(appEntry).ensureLabel(any(Context.class));
ReflectionHelpers.setField(appEntry, "info", info);
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java
index 06969bb..e6af48a 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java
@@ -16,35 +16,30 @@
package com.android.settings.datetime;
-
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
import android.text.format.DateFormat;
-import com.android.settings.TestConfig;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import java.util.List;
-import java.util.Locale;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
+import java.util.List;
+import java.util.Locale;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AutoTimeFormatPreferenceControllerTest {
- @Mock(answer = RETURNS_DEEP_STUBS)
- private PreferenceScreen mScreen;
@Mock
private UpdateTimeAndDateCallback mCallback;
@@ -57,7 +52,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mApplication = ShadowApplication.getInstance();
- mContext = mApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
}
@Test
@@ -158,7 +153,7 @@
}
/**
- * Extend class under test to change {@link #is24HourLocale()} to not call
+ * Extend class under test to change {@link #is24HourLocale} to not call
* {@link DateFormat#is24HourLocale(Locale)} because that's not available in roboelectric.
*/
private static class TestAutoTimeFormatPreferenceController
@@ -166,7 +161,7 @@
private boolean is24HourLocale = false;
- public TestAutoTimeFormatPreferenceController(Context context,
+ private TestAutoTimeFormatPreferenceController(Context context,
UpdateTimeAndDateCallback callback) {
super(context, callback);
}
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
index d28cad1..e725877 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
@@ -16,11 +16,13 @@
package com.android.settings.datetime;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+
import android.content.Context;
import android.provider.Settings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.RestrictedSwitchPreference;
import org.junit.Before;
@@ -28,14 +30,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AutoTimePreferenceControllerTest {
@Mock
@@ -48,7 +45,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = ShadowApplication.getInstance().getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mPreference = new RestrictedSwitchPreference(mContext);
mController = new AutoTimePreferenceController(mContext, mCallback);
}
@@ -56,13 +53,11 @@
@Test
public void testIsEnabled_shouldReadFromSettingsProvider() {
// Disabled
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.AUTO_TIME, 0);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AUTO_TIME, 0);
assertThat(mController.isEnabled()).isFalse();
// Enabled
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.AUTO_TIME, 1);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AUTO_TIME, 1);
assertThat(mController.isEnabled()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
index 5cbef72..8bacbe2 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.datetime;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.robolectric.shadow.api.Shadow.extract;
@@ -26,7 +25,6 @@
import android.provider.Settings;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
@@ -39,8 +37,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = ShadowConnectivityManager.class)
+@Config(shadows = ShadowConnectivityManager.class)
public class AutoTimeZonePreferenceControllerTest {
@Mock
@@ -49,15 +46,14 @@
private Context mContext;
private AutoTimeZonePreferenceController mController;
private Preference mPreference;
-
+ private ShadowConnectivityManager connectivityManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mPreference = new Preference(mContext);
- ShadowConnectivityManager connectivityManager =
- extract(mContext.getSystemService(ConnectivityManager.class));
+ connectivityManager = extract(mContext.getSystemService(ConnectivityManager.class));
connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
}
@@ -79,32 +75,28 @@
@Test
public void isWifiOnly_notAvailable() {
- ShadowConnectivityManager connectivityManager =
- extract(mContext.getSystemService(ConnectivityManager.class));
connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
mController = new AutoTimeZonePreferenceController(
- mContext, null /* callback */, false /* isFromSUW */);
+ mContext, null /* callback */, false /* fromSUW */);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isFromSUW_notEnable() {
- mController = new AutoTimeZonePreferenceController(
- mContext, null /* callback */, true /* isFromSUW */);
+ mController =
+ new AutoTimeZonePreferenceController(mContext, null /* callback */, true /* fromSUW */);
assertThat(mController.isEnabled()).isFalse();
}
@Test
public void isWifiOnly_notEnable() {
- ShadowConnectivityManager connectivityManager =
- extract(mContext.getSystemService(ConnectivityManager.class));
connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
mController = new AutoTimeZonePreferenceController(
- mContext, null /* callback */, false /* isFromSUW */);
+ mContext, null /* callback */, false /* fromSUW */);
assertThat(mController.isEnabled()).isFalse();
}
@@ -112,23 +104,21 @@
@Test
public void testIsEnabled_shouldReadFromSettingsProvider() {
mController = new AutoTimeZonePreferenceController(
- mContext, null /* callback */, false /* isFromSUW */);
+ mContext, null /* callback */, false /* fromSUW */);
// Disabled
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.AUTO_TIME_ZONE, 0);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AUTO_TIME_ZONE, 0);
assertThat(mController.isEnabled()).isFalse();
// Enabled
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.AUTO_TIME_ZONE, 1);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AUTO_TIME_ZONE, 1);
assertThat(mController.isEnabled()).isTrue();
}
@Test
public void updatePreferenceChange_prefIsChecked_shouldUpdatePreferenceAndNotifyCallback() {
- mController = new AutoTimeZonePreferenceController(
- mContext, mCallback, false /* isFromSUW */);
+ mController =
+ new AutoTimeZonePreferenceController(mContext, mCallback, false /* fromSUW */);
mController.onPreferenceChange(mPreference, true);
@@ -138,8 +128,8 @@
@Test
public void updatePreferenceChange_prefIsUnchecked_shouldUpdatePreferenceAndNotifyCallback() {
- mController = new AutoTimeZonePreferenceController(
- mContext, mCallback, false /* isFromSUW */);
+ mController =
+ new AutoTimeZonePreferenceController(mContext, mCallback, false /* fromSUW */);
mController.onPreferenceChange(mPreference, false);
diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
index 7317300..7fd5b46 100644
--- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
@@ -16,11 +16,14 @@
package com.android.settings.datetime;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.app.AlarmManager;
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.RestrictedPreference;
import org.junit.Before;
@@ -28,15 +31,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DatePreferenceControllerTest {
@Mock
@@ -55,8 +52,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mAlarmManager);
- mPreference = new RestrictedPreference(ShadowApplication.getInstance().
- getApplicationContext());
+ mPreference = new RestrictedPreference(RuntimeEnvironment.application);
mController = new DatePreferenceController(mContext, mHost, mAutoTimePreferenceController);
}
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
index ada59f4..802d9ed 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
@@ -16,11 +16,15 @@
package com.android.settings.datetime;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
import android.content.Context;
import android.content.Intent;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -30,16 +34,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TimeChangeListenerMixinTest {
@Mock
@@ -51,7 +48,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = ShadowApplication.getInstance().getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mMixin = new TimeChangeListenerMixin(mContext, mCallback);
}
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
index cd13513..c9331ad 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
@@ -16,6 +16,8 @@
package com.android.settings.datetime;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import android.content.Context;
import android.content.Intent;
@@ -24,24 +26,18 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.verify;
+import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TimeFormatPreferenceControllerTest {
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -58,7 +54,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mApplication = ShadowApplication.getInstance();
- mContext = mApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
}
@Test
diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
index bc53b32..c6f99a3 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
@@ -16,10 +16,13 @@
package com.android.settings.datetime;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.RestrictedPreference;
import org.junit.Before;
@@ -27,16 +30,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TimePreferenceControllerTest {
@Mock
@@ -52,8 +48,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mPreference = new RestrictedPreference(
- ShadowApplication.getInstance().getApplicationContext());
+ mPreference = new RestrictedPreference(RuntimeEnvironment.application);
mController = new TimePreferenceController(mContext, mHost, mAutoTimePreferenceController);
}
@@ -96,5 +91,4 @@
// Should show date picker
verify(mHost).showTimePicker();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
index 07bc333..38aace8 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
@@ -16,10 +16,14 @@
package com.android.settings.datetime;
+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 com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.RestrictedPreference;
import org.junit.Before;
@@ -27,16 +31,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-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 org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TimeZonePreferenceControllerTest {
@Mock
@@ -49,7 +46,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = ShadowApplication.getInstance().getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mPreference = new RestrictedPreference(mContext);
mController = spy(new TimeZonePreferenceController(mContext,
mAutoTimeZonePreferenceController));
diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
index 0ab685a..5e07308 100644
--- a/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerComparatorTest.java
@@ -1,46 +1,42 @@
package com.android.settings.datetime;
+import static com.google.common.truth.Truth.assertThat;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.datetime.ZoneGetter;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import java.util.Arrays;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZonePickerComparatorTest {
// Strings in Chinese are sorted by alphabet order of their Pinyin.
// "伦敦" -> "lundun"; "纽约" -> "niuyue"; "悉尼" -> "xini"
// "开罗" -> "kailuo"; "雅典" -> "yadian"; "上海" -> "shanghai"
private static final String[] TEST_CHINESE_NAME =
- new String[]{"伦敦", "纽约", "悉尼", "开罗", "雅典", "上海"};
+ {"伦敦", "纽约", "悉尼", "开罗", "雅典", "上海"};
private static final String[] ORDERED_CHINESE_NAME =
- new String[]{"开罗", "伦敦", "纽约", "上海", "悉尼", "雅典"};
+ {"开罗", "伦敦", "纽约", "上海", "悉尼", "雅典"};
private static final String[] TEST_ENGLISH_NAME =
- new String[]{"London", "New York", "Sydney", "Cairo", "Athens", "Shanghai"};
+ {"London", "New York", "Sydney", "Cairo", "Athens", "Shanghai"};
private static final String[] ORDERED_ENGLISH_NAME =
- new String[]{"Athens", "Cairo", "London", "New York", "Shanghai", "Sydney"};
+ {"Athens", "Cairo", "London", "New York", "Shanghai", "Sydney"};
private static final Locale INIT_LOCALE = Locale.getDefault();
- private Map<String, List> mTestDataMap;
+ private Map<String, List<String>> mTestDataMap;
private List<Map<String, Object>> mTestList;
@Before
@@ -60,12 +56,9 @@
String sortKey = ZoneGetter.KEY_DISPLAY_LABEL;
mTestList = getMockZonesList("zh_CN");
Locale.setDefault(new Locale("zh"));
- final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
- assertThat(comparator).isNotNull();
- Collections.sort(mTestList, comparator);
+ mTestList.sort(new ZonePicker.MyComparator(sortKey));
for (int i = 0; i < mTestList.size(); i++) {
- assertThat(mTestList.get(i).get(sortKey).toString())
- .isEqualTo(ORDERED_CHINESE_NAME[i]);
+ assertThat(mTestList.get(i).get(sortKey).toString()).isEqualTo(ORDERED_CHINESE_NAME[i]);
}
}
@@ -74,12 +67,9 @@
String sortKey = ZoneGetter.KEY_DISPLAY_LABEL;
mTestList = getMockZonesList("en_US");
Locale.setDefault(new Locale("en"));
- final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
- assertThat(comparator).isNotNull();
- Collections.sort(mTestList, comparator);
+ mTestList.sort(new ZonePicker.MyComparator(sortKey));
for (int i = 0; i < mTestList.size(); i++) {
- assertThat(mTestList.get(i).get(sortKey).toString())
- .isEqualTo(ORDERED_ENGLISH_NAME[i]);
+ assertThat(mTestList.get(i).get(sortKey).toString()).isEqualTo(ORDERED_ENGLISH_NAME[i]);
}
}
@@ -88,9 +78,7 @@
String sortKey = ZoneGetter.KEY_OFFSET;
// TestList of any locale can be selected to test integer sorting.
mTestList = getMockZonesList("en_US");
- final ZonePicker.MyComparator comparator = new ZonePicker.MyComparator(sortKey);
- assertThat(comparator).isNotNull();
- Collections.sort(mTestList, comparator);
+ mTestList.sort(new ZonePicker.MyComparator(sortKey));
for (int i = 0; i < mTestList.size(); i++) {
assertThat(mTestList.get(i).get(sortKey)).isEqualTo(i);
}
@@ -102,8 +90,7 @@
TimeZone tz = TimeZone.getDefault();
int testSize = testData.size();
for (int i = 0; i < testSize; i++) {
- zones.add(createMockDisplayEntry(tz, "GMT+08:00",
- testData.get(i), testSize - i - 1));
+ zones.add(createMockDisplayEntry(tz, "GMT+08:00", testData.get(i), testSize - i - 1));
}
return zones;
}
diff --git a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
index 9f6d0ef..e6a9ca7 100644
--- a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
@@ -27,7 +27,6 @@
import android.view.ViewGroup;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowZoneGetter;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
@@ -39,7 +38,6 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZonePickerTest {
private Activity mActivity;
@@ -57,10 +55,7 @@
@Config(shadows = ShadowZoneGetter.class)
public void testLaunch() {
// Shouldn't crash
- mActivity.getFragmentManager()
- .beginTransaction()
- .add(mZonePicker, "test_tag")
- .commit();
+ mActivity.getFragmentManager().beginTransaction().add(mZonePicker, "test_tag").commit();
// Should render
verify(mZonePicker).onCreateView(
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/DataLoaderTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/DataLoaderTest.java
index 23bfabb..6e211e6 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/DataLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/DataLoaderTest.java
@@ -20,18 +20,15 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
import java.util.List;
import java.util.Locale;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DataLoaderTest {
@Test
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneAdapterTest.java
index 1377f1d..030f168 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneAdapterTest.java
@@ -15,16 +15,15 @@
*/
package com.android.settings.datetime.timezone;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import android.icu.util.TimeZone;
-import android.provider.Settings;
import android.text.TextUtils;
import android.view.View;
import android.widget.FrameLayout;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.After;
import org.junit.Before;
@@ -40,15 +39,10 @@
import java.util.Collections;
import java.util.Locale;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- TimeZoneAdapterTest.ShadowDataFormat.class})
+@Config(shadows = TimeZoneAdapterTest.ShadowDataFormat.class)
public class TimeZoneAdapterTest {
+
@Mock
private View.OnClickListener mOnClickListener;
@@ -58,7 +52,7 @@
private Locale mDefaultLocale;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mTimeZoneAdapter = new TimeZoneAdapter(mOnClickListener, mContext);
@@ -66,26 +60,16 @@
}
@After
- public void tearDown() throws Exception {
+ public void tearDown() {
Locale.setDefault(mDefaultLocale);
}
- @Implements(android.text.format.DateFormat.class)
- public static class ShadowDataFormat {
-
- public static String mTimeFormatString = "";
-
- @Implementation
- public static String getTimeFormatString(Context context) {
- return mTimeFormatString;
- }
- }
-
@Test
public void getItemViewType_onDefaultTimeZone_returnsTypeSelected() {
final TimeZoneInfo tzi = dummyTimeZoneInfo(TimeZone.getDefault());
mTimeZoneAdapter.setTimeZoneInfos(Collections.singletonList(tzi));
- assertThat(mTimeZoneAdapter.getItemViewType(0)).isEqualTo(TimeZoneAdapter.VIEW_TYPE_SELECTED);
+ assertThat(mTimeZoneAdapter.getItemViewType(0))
+ .isEqualTo(TimeZoneAdapter.VIEW_TYPE_SELECTED);
}
@Test
@@ -102,8 +86,10 @@
final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
- final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
+ final ViewHolder viewHolder =
+ (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
+ assertThat(viewHolder.mDstView).isNotNull();
assertThat(viewHolder.mDstView.getVisibility()).isEqualTo(View.VISIBLE);
}
@@ -114,8 +100,10 @@
final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
- final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
+ final ViewHolder viewHolder =
+ (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
+ assertThat(viewHolder.mDstView).isNotNull();
assertThat(viewHolder.mDstView.getVisibility()).isEqualTo(View.GONE);
}
@@ -130,8 +118,10 @@
final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
- final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
+ final ViewHolder viewHolder =
+ (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
+ assertThat(viewHolder.mTimeView).isNotNull();
assertThat(viewHolder.mTimeView.getText().toString()).hasLength(5);
}
@@ -146,8 +136,10 @@
final FrameLayout parent = new FrameLayout(RuntimeEnvironment.application);
- final ViewHolder viewHolder = (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
+ final ViewHolder viewHolder =
+ (ViewHolder) mTimeZoneAdapter.createViewHolder(parent, TimeZoneAdapter.VIEW_TYPE_NORMAL);
mTimeZoneAdapter.bindViewHolder(viewHolder, 0);
+ assertThat(viewHolder.mTimeView).isNotNull();
assertThat(viewHolder.mTimeView.getText().toString()).hasLength(8);
}
@@ -164,4 +156,15 @@
private TimeZoneInfo dummyTimeZoneInfo(TimeZone timeZone) {
return new TimeZoneInfo.Builder(timeZone).setGmtOffset("GMT+0").setItemId(1).build();
}
+
+ @Implements(android.text.format.DateFormat.class)
+ public static class ShadowDataFormat {
+
+ private static String mTimeFormatString = "";
+
+ @Implementation
+ public static String getTimeFormatString(Context context) {
+ return mTimeFormatString;
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
index 6042dd3..c6f5fe6 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
@@ -16,23 +16,18 @@
package com.android.settings.datetime.timezone;
+import static com.google.common.truth.Truth.assertThat;
-import com.android.settings.TestConfig;
import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
import java.util.Date;
import java.util.Locale;
-import static com.google.common.truth.Truth.assertThat;
-
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TimeZoneInfoTest {
@Test
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
index 2748604..e6073a8 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
@@ -16,29 +16,25 @@
package com.android.settings.datetime.timezone.model;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
-import libcore.util.CountryTimeZones;
-import libcore.util.CountryZonesFinder;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
+
+import libcore.util.CountryTimeZones;
+import libcore.util.CountryTimeZones.TimeZoneMapping;
+import libcore.util.CountryZonesFinder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Set;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertSame;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TimeZoneDataTest {
private CountryZonesFinder mCountryZonesFinder;
@@ -61,7 +57,7 @@
@Test
public void testGetRegionIds() {
- when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(Arrays.asList());
+ when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(Collections.emptyList());
TimeZoneData timeZoneData = new TimeZoneData(mCountryZonesFinder);
assertThat(timeZoneData.getRegionIds()).isEmpty();
@@ -82,8 +78,8 @@
));
CountryTimeZones GB = mock(CountryTimeZones.class);
when(GB.getCountryIso()).thenReturn("gb");
- when(GB.getTimeZoneMappings()).thenReturn(Arrays.asList(
- new CountryTimeZones.TimeZoneMapping("Unknown/Secret_City", true)
+ when(GB.getTimeZoneMappings()).thenReturn(Collections.singletonList(
+ new TimeZoneMapping("Unknown/Secret_City", true)
));
when(mCountryZonesFinder.lookupCountryTimeZonesForZoneId("Unknown/Secret_City"))
.thenReturn(Arrays.asList(US, GB));
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
index dd438ff..53d1705 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
@@ -10,7 +10,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -23,10 +22,12 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AutomaticStorageManagerDescriptionPreferenceControllerTest {
- @Mock private PreferenceScreen mScreen;
- @Mock private Preference mPreference;
+
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private Preference mPreference;
private AutomaticStorageManagerDescriptionPreferenceController mController;
private Context mContext = RuntimeEnvironment.application;
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
index ab32fa2..b11b232 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
@@ -26,14 +26,13 @@
import android.app.Fragment;
import android.app.FragmentManager;
import android.content.Context;
+import android.os.SystemProperties;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -44,11 +43,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AutomaticStorageManagerSwitchBarControllerTest {
+
private Context mContext;
private SwitchBar mSwitchBar;
private MetricsFeatureProvider mMetricsFeatureProvider;
@@ -108,10 +106,9 @@
.add(any(Fragment.class), eq(ActivationWarningFragment.TAG));
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void onSwitchChange_doNotShowWarningFragmentIfEnabledByDefault() {
- SettingsShadowSystemProperties.set("ro.storage_manager.enabled", "true");
+ SystemProperties.set("ro.storage_manager.enabled", "true");
mController.onSwitchChanged(null, true);
diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
index f4c4c6f..798927f 100644
--- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
@@ -16,9 +16,7 @@
package com.android.settings.development;
-import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController
- .STREAMING_LABEL_ID;
-
+import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController.STREAMING_LABEL_ID;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -34,7 +32,6 @@
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -44,10 +41,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AbstractBluetoothA2dpPreferenceControllerTest {
@Mock
@@ -108,8 +103,8 @@
mController.updateState(mPreference);
verify(mPreference).setValue(mController.getListValues()[2]);
- verify(mPreference).setSummary(mContext.getResources().getString(STREAMING_LABEL_ID,
- mController.getListSummaries()[2]));
+ verify(mPreference).setSummary(mContext.getString(STREAMING_LABEL_ID,
+ mController.getListSummaries()[2]));
}
@Test
@@ -119,10 +114,10 @@
verify(mController).updateState(mPreference);
}
- static class AbstractBluetoothA2dpPreferenceControllerImpl extends
- AbstractBluetoothA2dpPreferenceController {
+ private static class AbstractBluetoothA2dpPreferenceControllerImpl
+ extends AbstractBluetoothA2dpPreferenceController {
- public AbstractBluetoothA2dpPreferenceControllerImpl(Context context,
+ private AbstractBluetoothA2dpPreferenceControllerImpl(Context context,
Lifecycle lifecycle, BluetoothA2dpConfigStore store) {
super(context, lifecycle, store);
}
@@ -156,5 +151,4 @@
return 0;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
index cc3a567..d73093e 100644
--- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
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.verify;
@@ -29,7 +28,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,10 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AdbPreferenceControllerTest {
@Mock
@@ -62,8 +58,8 @@
mContext = RuntimeEnvironment.application;
mController = spy(new AdbPreferenceController(mContext, mFragment));
doReturn(true).when(mController).isAvailable();
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
index 4b7d2a2..c289358 100644
--- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
@@ -16,14 +16,9 @@
package com.android.settings.development;
-
-import static com.android.settings.development.AllowAppsOnExternalPreferenceController
- .SETTING_VALUE_OFF;
-import static com.android.settings.development.AllowAppsOnExternalPreferenceController
- .SETTING_VALUE_ON;
-
+import static com.android.settings.development.AllowAppsOnExternalPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.AllowAppsOnExternalPreferenceController.SETTING_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -32,7 +27,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -41,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AllowAppsOnExternalPreferenceControllerTest {
@Mock
@@ -60,8 +52,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new AllowAppsOnExternalPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
index 4b6eece..32cc38b 100644
--- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
@@ -16,11 +16,8 @@
package com.android.settings.development;
-import static com.android.settings.development.AnimatorDurationScalePreferenceController
- .ANIMATOR_DURATION_SCALE_SELECTOR;
-import static com.android.settings.development.AnimatorDurationScalePreferenceController
- .DEFAULT_VALUE;
-
+import static com.android.settings.development.AnimatorDurationScalePreferenceController.ANIMATOR_DURATION_SCALE_SELECTOR;
+import static com.android.settings.development.AnimatorDurationScalePreferenceController.DEFAULT_VALUE;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -31,7 +28,6 @@
import android.view.IWindowManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,11 +36,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AnimatorDurationScalePreferenceControllerTest {
@Mock
@@ -72,10 +66,10 @@
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mListValues = mContext.getResources().getStringArray(
- R.array.animator_duration_scale_values);
- mListSummaries = mContext.getResources().getStringArray(
- R.array.animator_duration_scale_entries);
+ mListValues = mContext.getResources()
+ .getStringArray(R.array.animator_duration_scale_values);
+ mListSummaries = mContext.getResources()
+ .getStringArray(R.array.animator_duration_scale_entries);
mController = new AnimatorDurationScalePreferenceController(mContext);
ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -99,8 +93,8 @@
@Test
public void updateState_option5Set_shouldUpdatePreferenceToOption5() throws RemoteException {
- when(mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR)).thenReturn(
- Float.valueOf(mListValues[5]));
+ when(mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR))
+ .thenReturn(Float.valueOf(mListValues[5]));
mController.updateState(mPreference);
@@ -110,8 +104,8 @@
@Test
public void updateState_option3Set_shouldUpdatePreferenceToOption3() throws RemoteException {
- when(mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR)).thenReturn(
- Float.valueOf(mListValues[3]));
+ when(mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR))
+ .thenReturn(Float.valueOf(mListValues[3]));
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
index ce2e03e..eeb44f7 100644
--- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
@@ -16,13 +16,9 @@
package com.android.settings.development;
-import static com.android.settings.development.AppsNotRespondingPreferenceController
- .SETTING_VALUE_OFF;
-import static com.android.settings.development.AppsNotRespondingPreferenceController
- .SETTING_VALUE_ON;
-
+import static com.android.settings.development.AppsNotRespondingPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.AppsNotRespondingPreferenceController.SETTING_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -31,7 +27,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppsNotRespondingPreferenceControllerTest {
@Mock
@@ -59,8 +52,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new AppsNotRespondingPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java
index fc36577..5613440 100644
--- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,10 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BackgroundProcessLimitPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
index 02cf13f..86f2b68 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
@@ -16,22 +16,17 @@
package com.android.settings.development;
-
-import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController
- .BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY;
-
+import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController.BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.Before;
import org.junit.Test;
@@ -39,12 +34,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class BluetoothAbsoluteVolumePreferenceControllerTest {
@Mock
@@ -60,8 +51,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new BluetoothAbsoluteVolumePreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@@ -69,7 +60,7 @@
public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothDisableAbsoluteVolume() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
+ final boolean mode = SystemProperties.getBoolean(
BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false /* default */);
assertThat(mode).isTrue();
@@ -79,7 +70,7 @@
public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothDisableAbsoluteVolume() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
+ final boolean mode = SystemProperties.getBoolean(
BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false /* default */);
assertThat(mode).isFalse();
@@ -87,8 +78,7 @@
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY,
- Boolean.toString(true));
+ SystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -96,8 +86,7 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY,
- Boolean.toString(false));
+ SystemProperties.set(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -107,7 +96,7 @@
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
+ final boolean mode = SystemProperties.getBoolean(
BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY, false /* default */);
assertThat(mode).isFalse();
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java
index 7074c58..a016865 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,7 +27,6 @@
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -38,10 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothAudioBitsPerSamplePreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
index fd7b096..2407065 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,7 +27,6 @@
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -38,10 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothAudioChannelModePreferenceControllerTest {
@Mock
@@ -90,14 +86,13 @@
when(mPreference.findIndexOfValue(mListValues[0])).thenReturn(0);
mController.writeConfigurationValues(mListValues[0]);
- verify(mBluetoothA2dpConfigStore).setChannelMode(
- BluetoothCodecConfig.CHANNEL_MODE_NONE);
+ verify(mBluetoothA2dpConfigStore).setChannelMode(BluetoothCodecConfig.CHANNEL_MODE_NONE);
}
@Test
public void getCurrentA2dpSettingIndex_option2_shouldReturnSecondIndex() {
- when(mBluetoothCodecConfig.getChannelMode()).thenReturn(
- BluetoothCodecConfig.CHANNEL_MODE_STEREO);
+ when(mBluetoothCodecConfig.getChannelMode())
+ .thenReturn(BluetoothCodecConfig.CHANNEL_MODE_STEREO);
final int index = mController.getCurrentA2dpSettingIndex(mBluetoothCodecConfig);
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
index 43bf3ea..faf5019 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,7 +27,6 @@
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -38,10 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothAudioCodecPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java
index 1aff160..fcf650e 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,7 +27,6 @@
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -38,10 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothAudioQualityPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
index 3eab359..b09f37d 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,7 +27,6 @@
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -38,10 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothAudioSampleRatePreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
index 1df4339..c99d956 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
@@ -16,37 +16,28 @@
package com.android.settings.development;
-import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController
- .BLUETOOTH_AVRCP_VERSION_PROPERTY;
-
+import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController.BLUETOOTH_AVRCP_VERSION_PROPERTY;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.content.res.Resources;
import android.os.SystemProperties;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class BluetoothAvrcpVersionPreferenceControllerTest {
@Mock
@@ -70,20 +61,15 @@
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mListValues = mContext.getResources().getStringArray(
- R.array.bluetooth_avrcp_version_values);
- mListSummaries = mContext.getResources().getStringArray(R.array.bluetooth_avrcp_versions);
+ final Resources resources = mContext.getResources();
+ mListValues = resources.getStringArray(R.array.bluetooth_avrcp_version_values);
+ mListSummaries = resources.getStringArray(R.array.bluetooth_avrcp_versions);
mController = new BluetoothAvrcpVersionPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onPreferenceChange_setAvrcp13_shouldEnableAvrcp13() {
mController.onPreferenceChange(mPreference, mListValues[1]);
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java
index a2d1ca5..d529fc1 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothDelayReportsPreferenceControllerTest.java
@@ -16,22 +16,17 @@
package com.android.settings.development;
-
-import static com.android.settings.development.BluetoothDelayReportsPreferenceController
- .BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY;
-
+import static com.android.settings.development.BluetoothDelayReportsPreferenceController.BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.Before;
import org.junit.Test;
@@ -39,12 +34,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class BluetoothDelayReportsPreferenceControllerTest {
@Mock
@@ -60,8 +51,8 @@
mContext = RuntimeEnvironment.application;
mPreference = new SwitchPreference(mContext);
mController = spy(new BluetoothDelayReportsPreferenceController(mContext));
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@@ -69,7 +60,7 @@
public void onPreferenceChanged_settingEnabled_turnOnDelayReports() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
+ final boolean mode = SystemProperties.getBoolean(
BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);
assertThat(mode).isTrue();
@@ -79,7 +70,7 @@
public void onPreferenceChanged_settingDisabled_turnOffDelayReports() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
+ final boolean mode = SystemProperties.getBoolean(
BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);
assertThat(mode).isFalse();
@@ -87,7 +78,7 @@
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY,
+ SystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY,
Boolean.toString(true));
mController.updateState(mPreference);
@@ -96,7 +87,7 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY,
+ SystemProperties.set(BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY,
Boolean.toString(false));
mController.updateState(mPreference);
@@ -107,7 +98,7 @@
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
+ final boolean mode = SystemProperties.getBoolean(
BLUETOOTH_ENABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);
assertThat(mode).isFalse();
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java
index da7a415..7d73a4b 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java
@@ -16,11 +16,8 @@
package com.android.settings.development;
-import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController
- .BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY;
-
+import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController.BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,9 +25,7 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.Before;
import org.junit.Test;
@@ -38,12 +33,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowSystemProperties;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class BluetoothDeviceNoNamePreferenceControllerTest {
@Mock
@@ -59,8 +51,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new BluetoothDeviceNoNamePreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@@ -68,8 +60,8 @@
public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothDeviceNoName() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */);
+ final boolean mode = ShadowSystemProperties
+ .native_get_boolean(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */);
assertThat(mode).isTrue();
}
@@ -78,16 +70,16 @@
public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothDeviceNoName() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */);
+ final boolean mode = ShadowSystemProperties
+ .native_get_boolean(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, true /* default */);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
- Boolean.toString(true));
+ ShadowSystemProperties
+ .native_set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -95,8 +87,8 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
- Boolean.toString(false));
+ ShadowSystemProperties
+ .native_set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -106,8 +98,8 @@
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */);
+ final boolean mode = ShadowSystemProperties
+ .native_get_boolean(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, true /* default */);
assertThat(mode).isFalse();
verify(mPreference).setEnabled(false);
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java
index 817b222..f91bd44 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothInbandRingingPreferenceControllerTest.java
@@ -16,24 +16,19 @@
package com.android.settings.development;
-
-import static com.android.settings.development.BluetoothInbandRingingPreferenceController
- .BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY;
-
+import static com.android.settings.development.BluetoothInbandRingingPreferenceController.BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY;
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.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.Before;
import org.junit.Test;
@@ -41,12 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class BluetoothInbandRingingPreferenceControllerTest {
@Mock
@@ -83,8 +74,8 @@
public void onPreferenceChanged_settingEnabled_turnOnBluetoothSnoopLog() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
+ final boolean mode = SystemProperties
+ .getBoolean(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
assertThat(mode).isTrue();
}
@@ -93,16 +84,15 @@
public void onPreferenceChanged_settingDisabled_turnOffBluetoothSnoopLog() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
+ final boolean mode = SystemProperties
+ .getBoolean(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY,
- Boolean.toString(true));
+ SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -110,8 +100,7 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY,
- Boolean.toString(false));
+ SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -121,8 +110,8 @@
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
+ final boolean mode = SystemProperties
+ .getBoolean(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
assertThat(mode).isFalse();
verify(mPreference).setEnabled(false);
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
index cd56b78..811bafe 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
@@ -16,11 +16,8 @@
package com.android.settings.development;
-import static com.android.settings.development.BluetoothMaxConnectedAudioDevicesPreferenceController
- .MAX_CONNECTED_AUDIO_DEVICES_PROPERTY;
-
+import static com.android.settings.development.BluetoothMaxConnectedAudioDevicesPreferenceController.MAX_CONNECTED_AUDIO_DEVICES_PROPERTY;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
@@ -31,11 +28,8 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,148 +37,140 @@
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest {
- private static final int TEST_MAX_CONNECTED_AUDIO_DEVICES = 3;
- @Mock
- private PreferenceScreen mPreferenceScreen;
- @Spy
- private Context mSpyContext = RuntimeEnvironment.application;
- @Spy
- private Resources mSpyResources = RuntimeEnvironment.application.getResources();
+ private static final int TEST_MAX_CONNECTED_AUDIO_DEVICES = 3;
- private ListPreference mPreference;
- private BluetoothMaxConnectedAudioDevicesPreferenceController mController;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+ @Spy
+ private Context mSpyContext = RuntimeEnvironment.application;
+ @Spy
+ private Resources mSpyResources = RuntimeEnvironment.application.getResources();
- private CharSequence[] mListValues;
- private CharSequence[] mListEntries;
+ private ListPreference mPreference;
+ private BluetoothMaxConnectedAudioDevicesPreferenceController mController;
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- doReturn(mSpyResources).when(mSpyContext).getResources();
- // Get XML values without mock
- // Setup test list preference using XML values
- mPreference = new ListPreference(mSpyContext);
- mPreference.setEntries(R.array.bluetooth_max_connected_audio_devices);
- mPreference.setEntryValues(R.array.bluetooth_max_connected_audio_devices_values);
- // Stub default max connected audio devices to a test controlled value
- doReturn(TEST_MAX_CONNECTED_AUDIO_DEVICES).when(mSpyResources).getInteger(
- com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices);
- // Init the actual controller
- mController = new BluetoothMaxConnectedAudioDevicesPreferenceController(mSpyContext);
- // Construct preference in the controller via a mocked preference screen object
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
- mController.displayPreference(mPreferenceScreen);
- mListValues = mPreference.getEntryValues();
- mListEntries = mPreference.getEntries();
+ private CharSequence[] mListValues;
+ private CharSequence[] mListEntries;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ doReturn(mSpyResources).when(mSpyContext).getResources();
+ // Get XML values without mock
+ // Setup test list preference using XML values
+ mPreference = new ListPreference(mSpyContext);
+ mPreference.setEntries(R.array.bluetooth_max_connected_audio_devices);
+ mPreference.setEntryValues(R.array.bluetooth_max_connected_audio_devices_values);
+ // Stub default max connected audio devices to a test controlled value
+ doReturn(TEST_MAX_CONNECTED_AUDIO_DEVICES).when(mSpyResources).getInteger(
+ com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices);
+ // Init the actual controller
+ mController = new BluetoothMaxConnectedAudioDevicesPreferenceController(mSpyContext);
+ // Construct preference in the controller via a mocked preference screen object
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ mListValues = mPreference.getEntryValues();
+ mListEntries = mPreference.getEntries();
+ }
+
+ @Test
+ public void verifyResourceSizeAndRange() {
+ // Verify normal list entries and default preference entries have the same size
+ assertThat(mListEntries.length).isEqualTo(mListValues.length);
+ // Verify that list entries are formatted correctly
+ final String defaultEntry = String.format(mListEntries[0].toString(),
+ TEST_MAX_CONNECTED_AUDIO_DEVICES);
+ assertThat(mListEntries[0]).isEqualTo(defaultEntry);
+ // Update the preference
+ mController.updateState(mPreference);
+ // Verify default preference value, entry and summary
+ assertThat(mPreference.getValue()).isEqualTo(mListValues[0]);
+ assertThat(mPreference.getEntry()).isEqualTo(mListEntries[0]);
+ assertThat(mPreference.getSummary()).isEqualTo(mListEntries[0]);
+ // Verify that default system property is empty
+ assertThat(SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY)).isEmpty();
+ // Verify default property integer value
+ assertThat(SystemProperties.getInt(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY,
+ TEST_MAX_CONNECTED_AUDIO_DEVICES)).isEqualTo(TEST_MAX_CONNECTED_AUDIO_DEVICES);
+ }
+
+ @Test
+ public void onPreferenceChange_setNumberOfDevices() {
+ for (final CharSequence newValue : mListValues) {
+ // Change preference using a list value
+ mController.onPreferenceChange(mPreference, newValue);
+ // Verify that value is set on the preference
+ assertThat(mPreference.getValue()).isEqualTo(newValue);
+ int index = mPreference.findIndexOfValue(newValue.toString());
+ assertThat(mPreference.getEntry()).isEqualTo(mListEntries[index]);
+ // Verify that system property is set correctly after the change
+ final String currentValue = SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY);
+ assertThat(currentValue).isEqualTo(mListValues[index]);
}
+ }
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
+ @Test
+ public void updateState_NumberOfDevicesUpdated_shouldSetPreference() {
+ for (int i = 0; i < mListValues.length; ++i) {
+ final String propertyValue = mListValues[i].toString();
+ SystemProperties.set(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, propertyValue);
+ // Verify that value is set on the preference
+ mController.updateState(mPreference);
+ assertThat(mPreference.getValue()).isEqualTo(mListValues[i]);
+ assertThat(mPreference.getEntry()).isEqualTo(mListEntries[i]);
+ assertThat(mPreference.getSummary()).isEqualTo(mListEntries[i]);
+ // Verify that property value remain unchanged
+ assertThat(SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY))
+ .isEqualTo(propertyValue);
}
+ }
- @Test
- public void verifyResourceSizeAndRange() {
- // Verify normal list entries and default preference entries have the same size
- assertThat(mListEntries.length).isEqualTo(mListValues.length);
- // Verify that list entries are formatted correctly
- final String defaultEntry = String.format(mListEntries[0].toString(),
- TEST_MAX_CONNECTED_AUDIO_DEVICES);
- assertThat(mListEntries[0]).isEqualTo(defaultEntry);
- // Update the preference
- mController.updateState(mPreference);
- // Verify default preference value, entry and summary
- assertThat(mPreference.getValue()).isEqualTo(mListValues[0]);
- assertThat(mPreference.getEntry()).isEqualTo(mListEntries[0]);
- assertThat(mPreference.getSummary()).isEqualTo(mListEntries[0]);
- // Verify that default system property is empty
- assertThat(SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY)).isEmpty();
- // Verify default property integer value
- assertThat(SystemProperties.getInt(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY,
- TEST_MAX_CONNECTED_AUDIO_DEVICES)).isEqualTo(TEST_MAX_CONNECTED_AUDIO_DEVICES);
+ @Test
+ public void updateState_noValueSet_shouldSetDefaultTo1device() {
+ SystemProperties.set(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, "garbage");
+ mController.updateState(mPreference);
+
+ // Verify that preference is reset back to default and property is reset to default
+ assertThat(mPreference.getValue()).isEqualTo(mListValues[0]);
+ assertThat(mPreference.getEntry()).isEqualTo(mListEntries[0]);
+ assertThat(mPreference.getSummary()).isEqualTo(mListEntries[0]);
+ assertThat(SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY)).isEmpty();
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ // Verify that preference is reset back to default and property is reset to default
+ assertThat(mPreference.getValue()).isEqualTo(mListValues[0]);
+ assertThat(mPreference.getEntry()).isEqualTo(mListEntries[0]);
+ assertThat(mPreference.getSummary()).isEqualTo(mListEntries[0]);
+ assertThat(SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY)).isEmpty();
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+ for (int i = 0; i < mListValues.length; ++i) {
+ final String initialValue = mListValues[i].toString();
+ mController.onDeveloperOptionsSwitchDisabled();
+ assertThat(mPreference.isEnabled()).isFalse();
+
+ SystemProperties.set(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, initialValue);
+ mController.onDeveloperOptionsSwitchEnabled();
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ assertThat(mPreference.getValue()).isEqualTo(mListValues[i]);
+ assertThat(mPreference.getEntry()).isEqualTo(mListEntries[i]);
+ assertThat(mPreference.getSummary()).isEqualTo(mListEntries[i]);
+ // Verify that property value remain unchanged
+ assertThat(SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY))
+ .isEqualTo(initialValue);
}
-
- @Test
- public void onPreferenceChange_setNumberOfDevices() {
- for (final CharSequence newValue : mListValues) {
- // Change preference using a list value
- mController.onPreferenceChange(mPreference, newValue);
- // Verify that value is set on the preference
- assertThat(mPreference.getValue()).isEqualTo(newValue);
- int index = mPreference.findIndexOfValue(newValue.toString());
- assertThat(mPreference.getEntry()).isEqualTo(mListEntries[index]);
- // Verify that system property is set correctly after the change
- final String currentValue = SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY);
- assertThat(currentValue).isEqualTo(mListValues[index]);
- }
- }
-
- @Test
- public void updateState_NumberOfDevicesUpdated_shouldSetPreference() {
- for (int i = 0; i < mListValues.length; ++i) {
- final String propertyValue = mListValues[i].toString();
- SystemProperties.set(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, propertyValue);
- // Verify that value is set on the preference
- mController.updateState(mPreference);
- assertThat(mPreference.getValue()).isEqualTo(mListValues[i]);
- assertThat(mPreference.getEntry()).isEqualTo(mListEntries[i]);
- assertThat(mPreference.getSummary()).isEqualTo(mListEntries[i]);
- // Verify that property value remain unchanged
- assertThat(SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY))
- .isEqualTo(propertyValue);
- }
- }
-
- @Test
- public void updateState_noValueSet_shouldSetDefaultTo1device() {
- SystemProperties.set(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, "garbage");
- mController.updateState(mPreference);
-
- // Verify that preference is reset back to default and property is reset to default
- assertThat(mPreference.getValue()).isEqualTo(mListValues[0]);
- assertThat(mPreference.getEntry()).isEqualTo(mListEntries[0]);
- assertThat(mPreference.getSummary()).isEqualTo(mListEntries[0]);
- assertThat(SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY)).isEmpty();
- }
-
- @Test
- public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
- mController.onDeveloperOptionsSwitchDisabled();
-
- assertThat(mPreference.isEnabled()).isFalse();
- // Verify that preference is reset back to default and property is reset to default
- assertThat(mPreference.getValue()).isEqualTo(mListValues[0]);
- assertThat(mPreference.getEntry()).isEqualTo(mListEntries[0]);
- assertThat(mPreference.getSummary()).isEqualTo(mListEntries[0]);
- assertThat(SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY)).isEmpty();
- }
-
- @Test
- public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
- for (int i = 0; i < mListValues.length; ++i) {
- final String initialValue = mListValues[i].toString();
- mController.onDeveloperOptionsSwitchDisabled();
- assertThat(mPreference.isEnabled()).isFalse();
-
- SystemProperties.set(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, initialValue);
- mController.onDeveloperOptionsSwitchEnabled();
-
- assertThat(mPreference.isEnabled()).isTrue();
- assertThat(mPreference.getValue()).isEqualTo(mListValues[i]);
- assertThat(mPreference.getEntry()).isEqualTo(mListEntries[i]);
- assertThat(mPreference.getSummary()).isEqualTo(mListEntries[i]);
- // Verify that property value remain unchanged
- assertThat(SystemProperties.get(MAX_CONNECTED_AUDIO_DEVICES_PROPERTY))
- .isEqualTo(initialValue);
- }
- }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java
index 37ceaa2..06fa994 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java
@@ -16,33 +16,25 @@
package com.android.settings.development;
-import static com.android.settings.development.BluetoothSnoopLogPreferenceController
- .BLUETOOTH_BTSNOOP_ENABLE_PROPERTY;
-
+import static com.android.settings.development.BluetoothSnoopLogPreferenceController.BLUETOOTH_BTSNOOP_ENABLE_PROPERTY;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class BluetoothSnoopLogPreferenceControllerTest {
@Mock
@@ -57,8 +49,8 @@
public void setup() {
MockitoAnnotations.initMocks(this);
mController = new BluetoothSnoopLogPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@@ -66,8 +58,7 @@
public void onPreferenceChanged_turnOnBluetoothSnoopLog() {
mController.onPreferenceChange(null, true);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false);
+ final boolean mode = SystemProperties.getBoolean(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false);
assertThat(mode).isTrue();
}
@@ -76,16 +67,14 @@
public void onPreferenceChanged_turnOffBluetoothSnoopLog() {
mController.onPreferenceChange(null, false);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false);
+ final boolean mode = SystemProperties.getBoolean(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false);
assertThat(mode).isFalse();
}
@Test
public void updateState_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY,
- Boolean.toString(true));
+ SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -93,8 +82,7 @@
@Test
public void updateState_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY,
- Boolean.toString(false));
+ SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
index 9a94a63..9e0cc49 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
@@ -16,13 +16,9 @@
package com.android.settings.development;
-import static com.android.settings.development.BugReportInPowerPreferenceController
- .SETTING_VALUE_OFF;
-import static com.android.settings.development.BugReportInPowerPreferenceController
- .SETTING_VALUE_ON;
-
+import static com.android.settings.development.BugReportInPowerPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.BugReportInPowerPreferenceController.SETTING_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -34,7 +30,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -43,12 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BugReportInPowerPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
index 908c519..77bd6b8 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
@@ -17,14 +17,12 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,10 +30,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BugReportPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
index b4202ce..316d7c7 100644
--- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
@@ -17,36 +17,27 @@
package com.android.settings.development;
import static com.android.settings.development.CameraLaserSensorPreferenceController.ENG_BUILD;
-import static com.android.settings.development.CameraLaserSensorPreferenceController
- .USERDEBUG_BUILD;
+import static com.android.settings.development.CameraLaserSensorPreferenceController.USERDEBUG_BUILD;
import static com.android.settings.development.CameraLaserSensorPreferenceController.USER_BUILD;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
-import android.content.Context;
import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.RuntimeEnvironment;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class CameraLaserSensorPreferenceControllerTest {
@Mock
@@ -54,25 +45,17 @@
@Mock
private SwitchPreference mPreference;
- private Context mContext;
-
private CameraLaserSensorPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new CameraLaserSensorPreferenceController(mContext);
+ mController = new CameraLaserSensorPreferenceController(RuntimeEnvironment.application);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
mController.displayPreference(mScreen);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_withConfigNoShow_shouldReturnFalse() {
@@ -81,35 +64,30 @@
@Test
public void isAvailable_withUserdebugBuild_shouldReturnTrue() {
- SettingsShadowSystemProperties.set(
- CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+ SystemProperties.set(CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_withEngBuild_shouldReturnTrue() {
- SettingsShadowSystemProperties.set(
- CameraLaserSensorPreferenceController.BUILD_TYPE, ENG_BUILD);
+ SystemProperties.set(CameraLaserSensorPreferenceController.BUILD_TYPE, ENG_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_withUserBuild_shouldReturnTrue() {
- SettingsShadowSystemProperties.set(
- CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD);
+ SystemProperties.set(CameraLaserSensorPreferenceController.BUILD_TYPE, USER_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void updateState_cameraLaserSensorEnabled_shouldCheckedPreference() {
- SettingsShadowSystemProperties.set(
- CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
+ SystemProperties.set(CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceController.ENABLED));
- SettingsShadowSystemProperties.set(
- CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+ SystemProperties.set(CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mScreen);
@@ -118,10 +96,9 @@
@Test
public void updateState_cameraLaserSensorEnabled_shouldUncheckedPreference() {
- SettingsShadowSystemProperties.set(
- CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
+ SystemProperties.set(CameraLaserSensorPreferenceController.PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(CameraLaserSensorPreferenceController.DISABLED));
- SettingsShadowSystemProperties.set(
+ SystemProperties.set(
CameraLaserSensorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mScreen);
diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
index f7a763c..e1f763c 100644
--- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
@@ -16,11 +16,8 @@
package com.android.settings.development;
-import static com.android.settings.development.ClearAdbKeysPreferenceController
- .RO_ADB_SECURE_PROPERTY_KEY;
-
+import static com.android.settings.development.ClearAdbKeysPreferenceController.RO_ADB_SECURE_PROPERTY_KEY;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -35,9 +32,7 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After;
@@ -53,9 +48,7 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class, ShadowUtils.class})
+@Config(shadows = ShadowUtils.class)
public class ClearAdbKeysPreferenceControllerTest {
@Mock
@@ -67,15 +60,13 @@
@Mock
private DevelopmentSettingsDashboardFragment mFragment;
- private Context mContext;
-
private ClearAdbKeysPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = spy(new ClearAdbKeysPreferenceController(mContext, mFragment));
+ final Context context = RuntimeEnvironment.application;
+ mController = spy(new ClearAdbKeysPreferenceController(context, mFragment));
ReflectionHelpers.setField(mController, "mUsbManager", mUsbManager);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@@ -83,7 +74,6 @@
@After
public void tearDown() {
ShadowClearAdbKeysWarningDialog.resetDialog();
- SettingsShadowSystemProperties.clear();
ShadowUtils.reset();
}
@@ -112,9 +102,7 @@
}
@Test
- @Config(shadows = {
- ShadowClearAdbKeysWarningDialog.class
- })
+ @Config(shadows = ShadowClearAdbKeysWarningDialog.class)
public void handlePreferenceTreeClick_clearAdbKeysPreference_shouldShowWarningDialog() {
SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
doReturn(true).when(mController).isAdminUser();
@@ -182,14 +170,14 @@
@Implements(ClearAdbKeysWarningDialog.class)
public static class ShadowClearAdbKeysWarningDialog {
- public static boolean sIsShowing;
+ private static boolean sIsShowing;
@Implementation
public static void show(Fragment host) {
sIsShowing = true;
}
- public static void resetDialog() {
+ private static void resetDialog() {
sIsShowing = false;
}
}
diff --git a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
index 46c2e9a..9a02936 100644
--- a/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ConnectivityMonitorPreferenceControllerTest.java
@@ -17,11 +17,8 @@
package com.android.settings.development;
import static com.android.settings.development.ConnectivityMonitorPreferenceController.ENG_BUILD;
-import static com.android.settings.development.ConnectivityMonitorPreferenceController
- .USERDEBUG_BUILD;
-
+import static com.android.settings.development.ConnectivityMonitorPreferenceController.USERDEBUG_BUILD;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -30,9 +27,7 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.Before;
import org.junit.Test;
@@ -43,8 +38,6 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
- SettingsShadowSystemProperties.class)
public class ConnectivityMonitorPreferenceControllerTest {
private static final String USER_BUILD = "user";
@@ -60,7 +53,6 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- SettingsShadowSystemProperties.clear();
mContext = RuntimeEnvironment.application;
mController = new ConnectivityMonitorPreferenceController(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -69,24 +61,21 @@
@Test
public void isAvailable_trueShowFlagWithUserdebugBuild_shouldReturnTrue() {
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+ SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_trueShowFlagWithEngBuild_shouldReturnTrue() {
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD);
+ SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_trueShowFlagWithUserBuild_shouldReturnFalse() {
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD);
+ SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD);
assertThat(mController.isAvailable()).isFalse();
}
@@ -94,8 +83,7 @@
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_falseShowFlagWithUserdebugBuild_shouldReturnFalse() {
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+ SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
assertThat(mController.isAvailable()).isFalse();
}
@@ -103,8 +91,7 @@
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_falseShowFlagWithEngBuild_shouldReturnFalse() {
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD);
+ SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, ENG_BUILD);
assertThat(mController.isAvailable()).isFalse();
}
@@ -112,19 +99,16 @@
@Test
@Config(qualifiers = "mcc999")
public void isAvailable_falseShowFlagWithUserBuild_shouldReturnFalse() {
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD);
+ SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USER_BUILD);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void updateState_connectivityMonitorEnabled_shouldCheckedPreference() {
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+ SystemProperties.set(ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.ENABLED_STATUS);
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+ SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mPreference);
@@ -133,11 +117,9 @@
@Test
public void updateState_connectivityMonitorUserEnabled_shouldCheckedPreference() {
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+ SystemProperties.set(ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.USER_ENABLED_STATUS);
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+ SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mPreference);
@@ -146,11 +128,9 @@
@Test
public void updateState_connectivityMonitorDisabled_shouldUncheckedPreference() {
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+ SystemProperties.set(ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.DISABLED_STATUS);
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+ SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mPreference);
@@ -159,11 +139,9 @@
@Test
public void updateState_connectivityMonitorUserDisabled_shouldUncheckedPreference() {
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
+ SystemProperties.set(ConnectivityMonitorPreferenceController.PROPERTY_CONNECTIVITY_MONITOR,
ConnectivityMonitorPreferenceController.USER_DISABLED_STATUS);
- SettingsShadowSystemProperties.set(
- ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
+ SystemProperties.set(ConnectivityMonitorPreferenceController.BUILD_TYPE, USERDEBUG_BUILD);
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
index 5284e1a..c80e318 100644
--- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
@@ -16,23 +16,17 @@
package com.android.settings.development;
-import static com.android.settings.development.CoolColorTemperaturePreferenceController
- .COLOR_TEMPERATURE_PROPERTY;
-
+import static com.android.settings.development.CoolColorTemperaturePreferenceController.COLOR_TEMPERATURE_PROPERTY;
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.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.Before;
import org.junit.Test;
@@ -43,9 +37,6 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class CoolColorTemperaturePreferenceControllerTest {
private Context mContext;
@@ -60,16 +51,15 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new CoolColorTemperaturePreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@Test
public void onPreferenceChanged_turnOnCoolColorTemperature() {
mController.onPreferenceChange(null, true);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- COLOR_TEMPERATURE_PROPERTY, false);
+ final boolean mode = SystemProperties.getBoolean(COLOR_TEMPERATURE_PROPERTY, false);
assertThat(mode).isTrue();
}
@@ -77,16 +67,14 @@
@Test
public void onPreferenceChanged_turnOffCoolColorTemperature() {
mController.onPreferenceChange(null, false);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- COLOR_TEMPERATURE_PROPERTY, false);
+ final boolean mode = SystemProperties.getBoolean(COLOR_TEMPERATURE_PROPERTY, false);
assertThat(mode).isFalse();
}
@Test
public void updateState_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(COLOR_TEMPERATURE_PROPERTY,
- Boolean.toString(true));
+ SystemProperties.set(COLOR_TEMPERATURE_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -94,8 +82,7 @@
@Test
public void updateState_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(COLOR_TEMPERATURE_PROPERTY,
- Boolean.toString(false));
+ SystemProperties.set(COLOR_TEMPERATURE_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java
index 47b966a..b2a92db 100644
--- a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java
@@ -25,7 +25,6 @@
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,11 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION)
public class DarkUIPreferenceControllerTest {
private Context mContext;
@@ -55,8 +51,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new DarkUIPreferenceController(mContext, mUiModeManager);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
index faba049..de1753a 100644
--- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,23 +27,16 @@
import android.view.ThreadedRenderer;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class DebugGpuOverdrawPreferenceControllerTest {
@Mock
@@ -74,11 +66,6 @@
mController.displayPreference(mScreen);
}
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onPreferenceChange_noValueSet_shouldSetEmptyString() {
mController.onPreferenceChange(mPreference, null /* new value */);
diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
index cb90e6f..4d17a01 100644
--- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,23 +27,16 @@
import android.view.ThreadedRenderer;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class DebugNonRectClipOperationsPreferenceControllerTest {
@Mock
@@ -73,11 +65,6 @@
mController.displayPreference(mScreen);
}
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onPreferenceChange_noValueSet_shouldSetEmptyString() {
mController.onPreferenceChange(mPreference, null /* new value */);
diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java
index 3fd3e81..30abb95 100644
--- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,7 +25,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,10 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DebugViewAttributesPreferenceControllerTest {
@Mock
@@ -54,8 +50,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new DebugViewAttributesPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
index 640e9d5..7c49a06 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
@@ -24,15 +24,14 @@
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
@@ -44,39 +43,39 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowUserManager;
import org.robolectric.util.ReflectionHelpers;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- ShadowUserManager.class
-})
public class DevelopmentSettingsDashboardFragmentTest {
- private SwitchBar mSwitchBar;
private ToggleSwitch mSwitch;
private Context mContext;
+ private ShadowUserManager mShadowUserManager;
private DevelopmentSettingsDashboardFragment mDashboard;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mSwitchBar = new SwitchBar(mContext);
- mSwitch = mSwitchBar.getSwitch();
+ SwitchBar switchBar = new SwitchBar(mContext);
+ mSwitch = switchBar.getSwitch();
mDashboard = spy(new DevelopmentSettingsDashboardFragment());
- ReflectionHelpers.setField(mDashboard, "mSwitchBar", mSwitchBar);
- ShadowUserManager.getShadow().setIsAdminUser(true);
+ ReflectionHelpers.setField(mDashboard, "mSwitchBar", switchBar);
+ UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+ mShadowUserManager = Shadows.shadowOf(userManager);
+ mShadowUserManager.setIsAdminUser(true);
}
@After
public void tearDown() {
ShadowEnableDevelopmentSettingWarningDialog.reset();
- ShadowUserManager.getShadow().reset();
}
@Test
@@ -87,7 +86,7 @@
@Test
public void shouldLogAsFeatureFlagPage() {
assertThat(mDashboard.getMetricsCategory())
- .isEqualTo(MetricsProto.MetricsEvent.DEVELOPMENT);
+ .isEqualTo(MetricsProto.MetricsEvent.DEVELOPMENT);
}
@Test
@@ -101,10 +100,7 @@
}
@Test
- @Config(shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class
- })
+ @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public void searchIndex_pageDisabledBySetting_shouldAddAllKeysToNonIndexable() {
final Context appContext = RuntimeEnvironment.application;
DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, false);
@@ -117,14 +113,11 @@
}
@Test
- @Config(shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class
- })
+ @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public void searchIndex_pageDisabledForNonAdmin_shouldAddAllKeysToNonIndexable() {
final Context appContext = RuntimeEnvironment.application;
DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(appContext, true);
- ShadowUserManager.getShadow().setIsAdminUser(false);
+ mShadowUserManager.setIsAdminUser(false);
final List<String> nonIndexableKeys =
DevelopmentSettingsDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
@@ -152,9 +145,7 @@
}
@Test
- @Config(shadows = {
- ShadowEnableDevelopmentSettingWarningDialog.class
- })
+ @Config(shadows = ShadowEnableDevelopmentSettingWarningDialog.class)
public void onSwitchChanged_sameState_shouldDoNothing() {
when(mDashboard.getContext()).thenReturn(mContext);
Settings.Global.putInt(mContext.getContentResolver(),
@@ -165,9 +156,7 @@
}
@Test
- @Config(shadows = {
- ShadowEnableDevelopmentSettingWarningDialog.class
- })
+ @Config(shadows = ShadowEnableDevelopmentSettingWarningDialog.class)
public void onSwitchChanged_turnOn_shouldShowWarningDialog() {
when(mDashboard.getContext()).thenReturn(mContext);
Settings.Global.putInt(mContext.getContentResolver(),
@@ -178,9 +167,7 @@
}
@Test
- @Config(shadows = {
- ShadowEnableDevelopmentSettingWarningDialog.class
- })
+ @Config(shadows = ShadowEnableDevelopmentSettingWarningDialog.class)
public void onSwitchChanged_turnOff_shouldTurnOff() {
when(mDashboard.getContext()).thenReturn(mContext);
Settings.Global.putInt(mContext.getContentResolver(),
@@ -189,15 +176,14 @@
mDashboard.onSwitchChanged(mSwitch, false /* isChecked */);
assertThat(ShadowEnableDevelopmentSettingWarningDialog.mShown).isFalse();
- assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext))
- .isFalse();
+ assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isFalse();
}
@Test
public void onOemUnlockDialogConfirmed_shouldCallControllerOemConfirmed() {
final OemUnlockPreferenceController controller = mock(OemUnlockPreferenceController.class);
- doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
- OemUnlockPreferenceController.class);
+ doReturn(controller).when(mDashboard)
+ .getDevelopmentOptionsController(OemUnlockPreferenceController.class);
mDashboard.onOemUnlockDialogConfirmed();
verify(controller).onOemUnlockConfirmed();
}
@@ -205,8 +191,8 @@
@Test
public void onOemUnlockDialogConfirmed_shouldCallControllerOemDismissed() {
final OemUnlockPreferenceController controller = mock(OemUnlockPreferenceController.class);
- doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
- OemUnlockPreferenceController.class);
+ doReturn(controller).when(mDashboard)
+ .getDevelopmentOptionsController(OemUnlockPreferenceController.class);
mDashboard.onOemUnlockDialogDismissed();
verify(controller).onOemUnlockDismissed();
}
@@ -214,8 +200,8 @@
@Test
public void onAdbDialogConfirmed_shouldCallControllerDialogConfirmed() {
final AdbPreferenceController controller = mock(AdbPreferenceController.class);
- doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
- AdbPreferenceController.class);
+ doReturn(controller).when(mDashboard)
+ .getDevelopmentOptionsController(AdbPreferenceController.class);
mDashboard.onEnableAdbDialogConfirmed();
verify(controller).onAdbDialogConfirmed();
@@ -224,8 +210,8 @@
@Test
public void onAdbDialogDismissed_shouldCallControllerOemDismissed() {
final AdbPreferenceController controller = mock(AdbPreferenceController.class);
- doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
- AdbPreferenceController.class);
+ doReturn(controller).when(mDashboard)
+ .getDevelopmentOptionsController(AdbPreferenceController.class);
mDashboard.onEnableAdbDialogDismissed();
verify(controller).onAdbDialogDismissed();
@@ -233,10 +219,10 @@
@Test
public void onAdbClearKeysDialogConfirmed_shouldCallControllerDialogConfirmed() {
- final ClearAdbKeysPreferenceController controller = mock(
- ClearAdbKeysPreferenceController.class);
- doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
- ClearAdbKeysPreferenceController.class);
+ final ClearAdbKeysPreferenceController controller =
+ mock(ClearAdbKeysPreferenceController.class);
+ doReturn(controller).when(mDashboard)
+ .getDevelopmentOptionsController(ClearAdbKeysPreferenceController.class);
mDashboard.onAdbClearKeysDialogConfirmed();
verify(controller).onClearAdbKeysConfirmed();
@@ -244,10 +230,10 @@
@Test
public void onDisableLogPersistDialogConfirmed_shouldCallControllerDialogConfirmed() {
- final LogPersistPreferenceController controller = mock(
- LogPersistPreferenceController.class);
- doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
- LogPersistPreferenceController.class);
+ final LogPersistPreferenceController controller =
+ mock(LogPersistPreferenceController.class);
+ doReturn(controller).when(mDashboard)
+ .getDevelopmentOptionsController(LogPersistPreferenceController.class);
mDashboard.onDisableLogPersistDialogConfirmed();
verify(controller).onDisableLogPersistDialogConfirmed();
@@ -255,10 +241,10 @@
@Test
public void onDisableLogPersistDialogRejected_shouldCallControllerDialogRejected() {
- final LogPersistPreferenceController controller = mock(
- LogPersistPreferenceController.class);
- doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
- LogPersistPreferenceController.class);
+ final LogPersistPreferenceController controller =
+ mock(LogPersistPreferenceController.class);
+ doReturn(controller).when(mDashboard)
+ .getDevelopmentOptionsController(LogPersistPreferenceController.class);
mDashboard.onDisableLogPersistDialogRejected();
verify(controller).onDisableLogPersistDialogRejected();
@@ -274,8 +260,7 @@
}
@Implementation
- public static void show(
- DevelopmentSettingsDashboardFragment host) {
+ public static void show(DevelopmentSettingsDashboardFragment host) {
mShown = true;
}
}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
index 5927646..4801791 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
@@ -16,29 +16,28 @@
package com.android.settings.development;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowToast;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DevelopmentSettingsDisabledActivityTest {
@Test
public void launchActivity_shouldShowToast() {
Robolectric.setupActivity(DevelopmentSettingsDisabledActivity.class);
- assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
- RuntimeEnvironment.application.getString(R.string.dev_settings_disabled_warning));
+ final Context context = RuntimeEnvironment.application;
+ assertThat(ShadowToast.getTextOfLatestToast())
+ .isEqualTo(context.getString(R.string.dev_settings_disabled_warning));
}
}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
index 95fd0dd..9f89014 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
@@ -18,19 +18,18 @@
import static android.arch.lifecycle.Lifecycle.Event.ON_START;
import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.when;
+import android.app.Application;
import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
+import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.SwitchBar.OnSwitchChangeListener;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.After;
@@ -40,50 +39,45 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import java.util.ArrayList;
+import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowUtils.class,
- ShadowUserManager.class
- })
+@Config(shadows = ShadowUtils.class)
public class DevelopmentSwitchBarControllerTest {
@Mock
private DevelopmentSettingsDashboardFragment mSettings;
- private Context mContext;
private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private SwitchBar mSwitchBar;
- private DevelopmentSwitchBarController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- ShadowUserManager.getShadow().setIsAdminUser(true);
+ final Context context = RuntimeEnvironment.application;
+ UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+ Shadows.shadowOf(userManager).setIsAdminUser(true);
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
- mSwitchBar = new SwitchBar(mContext);
- when(mSettings.getContext()).thenReturn(mContext);
+ mSwitchBar = new SwitchBar(context);
+ when(mSettings.getContext()).thenReturn(context);
}
@After
public void tearDown() {
ShadowUtils.reset();
- ShadowUserManager.getShadow().reset();
}
@Test
public void runThroughLifecycle_v2_isMonkeyRun_shouldNotRegisterListener() {
ShadowUtils.setIsUserAMonkey(true);
- mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
+ new DevelopmentSwitchBarController(mSettings, mSwitchBar,
true /* isAvailable */, mLifecycle);
- final ArrayList<SwitchBar.OnSwitchChangeListener> listeners =
+ final List<SwitchBar.OnSwitchChangeListener> listeners =
ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners");
mLifecycle.handleLifecycleEvent(ON_START);
@@ -96,9 +90,9 @@
@Test
public void runThroughLifecycle_isNotMonkeyRun_shouldRegisterAndRemoveListener() {
ShadowUtils.setIsUserAMonkey(false);
- mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
+ new DevelopmentSwitchBarController(mSettings, mSwitchBar,
true /* isAvailable */, mLifecycle);
- final ArrayList<SwitchBar.OnSwitchChangeListener> listeners =
+ final List<OnSwitchChangeListener> listeners =
ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners");
mLifecycle.handleLifecycleEvent(ON_START);
@@ -112,9 +106,9 @@
public void runThroughLifecycle_v2_isNotMonkeyRun_shouldRegisterAndRemoveListener() {
when(mSettings.getContext()).thenReturn(RuntimeEnvironment.application);
ShadowUtils.setIsUserAMonkey(false);
- mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
+ new DevelopmentSwitchBarController(mSettings, mSwitchBar,
true /* isAvailable */, mLifecycle);
- final ArrayList<SwitchBar.OnSwitchChangeListener> listeners =
+ final List<SwitchBar.OnSwitchChangeListener> listeners =
ReflectionHelpers.getField(mSwitchBar, "mSwitchChangeListeners");
mLifecycle.handleLifecycleEvent(ON_START);
@@ -127,7 +121,7 @@
@Test
public void buildController_unavailable_shouldDisableSwitchBar() {
ShadowUtils.setIsUserAMonkey(false);
- mController = new DevelopmentSwitchBarController(mSettings, mSwitchBar,
+ new DevelopmentSwitchBarController(mSettings, mSwitchBar,
false /* isAvailable */, mLifecycle);
assertThat(mSwitchBar.isEnabled()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
index dfba782..cc5f65b 100644
--- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
@@ -16,12 +16,15 @@
package com.android.settings.development;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -30,15 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DisableAutomaticUpdatesPreferenceControllerTest {
@Mock
@@ -109,5 +105,4 @@
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
index de7b87a..73c976c 100644
--- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
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.eq;
@@ -32,7 +31,6 @@
import android.support.v7.preference.PreferenceScreen;
import android.view.DisplayCutout;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.OverlayManagerWrapper;
import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo;
@@ -42,38 +40,40 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.util.Arrays;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EmulateDisplayCutoutPreferenceControllerTest {
- static final OverlayInfo ONE_DISABLED = createFakeOverlay("emulation.one", false);
- static final OverlayInfo ONE_ENABLED = createFakeOverlay("emulation.one", true);
- static final OverlayInfo TWO_DISABLED = createFakeOverlay("emulation.two", false);
- static final OverlayInfo TWO_ENABLED = createFakeOverlay("emulation.two", true);
+ private static final OverlayInfo ONE_DISABLED = createFakeOverlay("emulation.one", false);
+ private static final OverlayInfo ONE_ENABLED = createFakeOverlay("emulation.one", true);
+ private static final OverlayInfo TWO_DISABLED = createFakeOverlay("emulation.two", false);
+ private static final OverlayInfo TWO_ENABLED = createFakeOverlay("emulation.two", true);
- @Mock Context mContext;
- @Mock OverlayManagerWrapper mOverlayManager;
- @Mock PackageManager mPackageManager;
- @Mock ListPreference mPreference;
- EmulateDisplayCutoutPreferenceController mController;
+ @Mock
+ private Context mContext;
+ @Mock
+ private OverlayManagerWrapper mOverlayManager;
+ @Mock
+ private PackageManager mPackageManager;
+ @Mock
+ private ListPreference mPreference;
+ private EmulateDisplayCutoutPreferenceController mController;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mockCurrentOverlays();
- when(mPackageManager.getApplicationInfo(any(), anyInt())).thenThrow(
- PackageManager.NameNotFoundException.class);
+ when(mPackageManager.getApplicationInfo(any(), anyInt()))
+ .thenThrow(PackageManager.NameNotFoundException.class);
mController = createController();
mController.setPreference(mPreference);
}
Object mockCurrentOverlays(OverlayInfo... overlays) {
return when(mOverlayManager.getOverlayInfosForTarget(eq("android"), anyInt()))
- .thenReturn(Arrays.<OverlayInfo>asList(overlays));
+ .thenReturn(Arrays.asList(overlays));
}
@Test
@@ -96,8 +96,8 @@
mController.onPreferenceChange(null, TWO_DISABLED.packageName);
- verify(mOverlayManager).setEnabledExclusiveInCategory(
- eq(TWO_DISABLED.packageName), anyInt());
+ verify(mOverlayManager)
+ .setEnabledExclusiveInCategory(eq(TWO_DISABLED.packageName), anyInt());
}
@Test
diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java
index c363fec..97ff30a 100644
--- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java
@@ -16,14 +16,9 @@
package com.android.settings.development;
-
-import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController
- .SETTING_VALUE_OFF;
-import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController
- .SETTING_VALUE_ON;
-
+import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController.SETTING_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -32,7 +27,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -41,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EnableGnssRawMeasFullTrackingPreferenceControllerTest {
@Mock
@@ -60,8 +52,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new EnableGnssRawMeasFullTrackingPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
index 5e96f3d..9fa0249 100644
--- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
@@ -16,14 +16,9 @@
package com.android.settings.development;
-
-import static com.android.settings.development.EnableGpuDebugLayersPreferenceController
- .SETTING_VALUE_OFF;
-import static com.android.settings.development.EnableGpuDebugLayersPreferenceController
- .SETTING_VALUE_ON;
-
+import static com.android.settings.development.EnableGpuDebugLayersPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.EnableGpuDebugLayersPreferenceController.SETTING_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -32,7 +27,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -41,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EnableGpuDebugLayersPreferenceControllerTest {
@Mock
@@ -60,8 +52,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new EnableGpuDebugLayersPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
index 1810b11..24caa0b 100644
--- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
@@ -16,11 +16,8 @@
package com.android.settings.development;
-import static com.android.settings.development.FileEncryptionPreferenceController
- .FILE_ENCRYPTION_PROPERTY_KEY;
-
+import static com.android.settings.development.FileEncryptionPreferenceController.FILE_ENCRYPTION_PROPERTY_KEY;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.never;
@@ -35,24 +32,17 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class FileEncryptionPreferenceControllerTest {
@Mock
@@ -70,13 +60,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new FileEncryptionPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
- }
-
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
}
@Test
@@ -126,9 +111,6 @@
mController.updateState(mPreference);
verify(mPreference).setEnabled(false);
- verify(mPreference).setSummary(
- mContext.getResources().getString(R.string.convert_to_file_encryption_done));
+ verify(mPreference).setSummary(mContext.getString(R.string.convert_to_file_encryption_done));
}
}
-
-
diff --git a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
index 64249a4..3c4f297 100644
--- a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
@@ -16,35 +16,26 @@
package com.android.settings.development;
-import static com.android.settings.development.ForceGpuRenderingPreferenceController
- .HARDWARE_UI_PROPERTY;
-
+import static com.android.settings.development.ForceGpuRenderingPreferenceController.HARDWARE_UI_PROPERTY;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class ForceGpuRenderingPreferenceControllerTest {
@Mock
@@ -60,22 +51,16 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new ForceGpuRenderingPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onPreferenceChanged_settingEnabled_turnOnForceGpuRendering() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(HARDWARE_UI_PROPERTY,
- false /* default */);
+ final boolean mode = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false /* default */);
assertThat(mode).isTrue();
}
@@ -84,15 +69,14 @@
public void onPreferenceChanged_settingDisabled_turnOffForceGpuRendering() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(HARDWARE_UI_PROPERTY,
- false /* default */);
+ final boolean mode = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false /* default */);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(true));
+ SystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -100,7 +84,7 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(false));
+ SystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -110,8 +94,7 @@
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
- final boolean mode = SettingsShadowSystemProperties.getBoolean(HARDWARE_UI_PROPERTY,
- false /* default */);
+ final boolean mode = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false /* default */);
assertThat(mode).isFalse();
verify(mPreference).setEnabled(false);
diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
index f48e809..5b9c2a9 100644
--- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
@@ -17,31 +17,24 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class ForceMSAAPreferenceControllerTest {
@Mock
@@ -57,22 +50,17 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new ForceMSAAPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onPreferenceChanged_settingEnabled_turnOnForceMsaa() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
+ final boolean mode = SystemProperties
+ .getBoolean(ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
assertThat(mode).isTrue();
}
@@ -81,16 +69,15 @@
public void onPreferenceChanged_settingDisabled_turnOffForceMsaa() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
+ final boolean mode = SystemProperties
+ .getBoolean(ForceMSAAPreferenceController.MSAA_PROPERTY, false /* default */);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY,
- Boolean.toString(true));
+ SystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -98,8 +85,7 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY,
- Boolean.toString(false));
+ SystemProperties.set(ForceMSAAPreferenceController.MSAA_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
index 212f9c4..66f065b 100644
--- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
@@ -16,13 +16,10 @@
package com.android.settings.development;
-import static com.android.settings.development.FreeformWindowsPreferenceController
- .SETTING_VALUE_OFF;
+import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_OFF;
import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_ON;
import static com.android.settings.development.FreeformWindowsPreferenceController.USER_BUILD_TYPE;
-
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.verify;
@@ -33,7 +30,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -42,10 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FreeformWindowsPreferenceControllerTest {
private static final String ENG_BUILD_TYPE = "eng";
diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
index c8a95a8..81d346c 100644
--- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
@@ -17,32 +17,25 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
import android.view.ThreadedRenderer;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class GpuViewUpdatesPreferenceControllerTest {
@Mock
@@ -63,17 +56,12 @@
mController.displayPreference(mPreferenceScreen);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onPreferenceChanged_settingEnabled_turnOnGpuViewUpdates() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
+ final boolean mode = SystemProperties
+ .getBoolean(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
assertThat(mode).isTrue();
}
@@ -82,16 +70,15 @@
public void onPreferenceChanged_settingDisabled_turnOffGpuViewUpdates() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
+ final boolean mode = SystemProperties
+ .getBoolean(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false /* default */);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
- Boolean.toString(true));
+ SystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -99,8 +86,8 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
- Boolean.toString(false));
+ SystemProperties
+ .set(ThreadedRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
index 6d3b9b7..02edd77 100644
--- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
@@ -17,32 +17,24 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.Context;
+import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
import android.view.ThreadedRenderer;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class HardwareLayersUpdatesPreferenceControllerTest {
@Mock
@@ -50,30 +42,23 @@
@Mock
private PreferenceScreen mPreferenceScreen;
- private Context mContext;
private HardwareLayersUpdatesPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new HardwareLayersUpdatesPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ mController = new HardwareLayersUpdatesPreferenceController(RuntimeEnvironment.application);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onPreferenceChanged_settingEnabled_turnOnHardwareLayersUpdates() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);
+ final boolean mode = SystemProperties
+ .getBoolean(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);
assertThat(mode).isTrue();
}
@@ -82,16 +67,16 @@
public void onPreferenceChanged_settingDisabled_turnOffHardwareLayersUpdates() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);
+ final boolean mode = SystemProperties
+ .getBoolean(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false /* default */);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
- Boolean.toString(true));
+ SystemProperties
+ .set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -99,8 +84,8 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
- Boolean.toString(false));
+ SystemProperties
+ .set(ThreadedRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
index 80382f0..42c6814 100644
--- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
@@ -16,9 +16,7 @@
package com.android.settings.development;
-import static com.android.settings.development.HardwareOverlaysPreferenceController
- .SURFACE_FLINGER_READ_CODE;
-
+import static com.android.settings.development.HardwareOverlaysPreferenceController.SURFACE_FLINGER_READ_CODE;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
@@ -35,7 +33,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowParcel;
@@ -48,7 +45,6 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HardwareOverlaysPreferenceControllerTest {
@Mock
@@ -90,8 +86,8 @@
@Config(shadows = {ShadowParcel.class})
public void updateState_settingEnabled_shouldCheckPreference() throws RemoteException {
ShadowParcel.sReadIntResult = 1;
- doReturn(true).when(mSurfaceFlinger).transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(),
- eq(0 /* flags */));
+ doReturn(true).when(mSurfaceFlinger)
+ .transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(), eq(0 /* flags */));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -101,8 +97,8 @@
@Config(shadows = {ShadowParcel.class})
public void updateState_settingDisabled_shouldUnCheckPreference() throws RemoteException {
ShadowParcel.sReadIntResult = 0;
- doReturn(true).when(mSurfaceFlinger).transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(),
- eq(0 /* flags */));
+ doReturn(true).when(mSurfaceFlinger)
+ .transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(), eq(0 /* flags */));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
index 486318a..e0fb7a4 100644
--- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
@@ -16,11 +16,8 @@
package com.android.settings.development;
-import static com.android.settings.development.HdcpCheckingPreferenceController
- .HDCP_CHECKING_PROPERTY;
-
+import static com.android.settings.development.HdcpCheckingPreferenceController.HDCP_CHECKING_PROPERTY;
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.verify;
@@ -32,23 +29,16 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class HdcpCheckingPreferenceControllerTest {
private static final String USER_DEBUG = "userdebug";
@@ -80,12 +70,6 @@
mController = new HdcpCheckingPreferenceController(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
-
- }
-
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
index a880d71..1637b63 100644
--- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.android.settings.development.KeepActivitiesPreferenceController.SETTING_VALUE_OFF;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -30,7 +29,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -39,10 +37,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class KeepActivitiesPreferenceControllerTest {
private static final int SETTING_VALUE_ON = 1;
@@ -63,8 +59,8 @@
mContext = RuntimeEnvironment.application;
mController = spy(new KeepActivitiesPreferenceController(mContext));
doReturn(mActivityManager).when(mController).getActivityManager();
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java
index c698313..bf1c6a5 100644
--- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java
@@ -15,7 +15,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -24,11 +23,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LocalBackupPasswordPreferenceControllerTest {
@Mock
@@ -49,8 +46,8 @@
mContext = RuntimeEnvironment.application;
mController = spy(new LocalBackupPasswordPreferenceController(mContext));
ReflectionHelpers.setField(mController, "mUserManager", mUserManager);
- when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java
index bd33319..629faf5 100644
--- a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java
@@ -16,9 +16,7 @@
package com.android.settings.development;
-import static com.android.settings.development.LocalTerminalPreferenceController
- .TERMINAL_APP_PACKAGE;
-
+import static com.android.settings.development.LocalTerminalPreferenceController.TERMINAL_APP_PACKAGE;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -31,7 +29,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -40,10 +37,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LocalTerminalPreferenceControllerTest {
@Mock
@@ -67,8 +62,8 @@
mController = spy(new LocalTerminalPreferenceController(mContext));
doReturn(true).when(mController).isAvailable();
doReturn(mPackageManagerWrapper).when(mController).getPackageManagerWrapper();
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
index bc386b1..9a84363 100644
--- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
@@ -26,24 +26,17 @@
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class LogPersistPreferenceControllerTest {
@Mock
@@ -70,11 +63,6 @@
mController.displayPreference(mScreen);
}
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onDeveloperOptionsSwitchDisabled_shouldResetLogOption() {
mController.onDeveloperOptionsSwitchDisabled();
diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
index a1a1581..8642fca 100644
--- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
@@ -23,24 +23,17 @@
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settingslib.R;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class LogdSizePreferenceControllerTest {
@Mock
@@ -74,11 +67,6 @@
mController.displayPreference(mScreen);
}
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onDeveloperOptionsSwitchDisabled_shouldDisableAndResetPreferenceToDefault() {
mController.onDeveloperOptionsSwitchDisabled();
diff --git a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java
index d68f276..bf90bf0 100644
--- a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java
@@ -23,14 +23,11 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.applications.ProcStatsData;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowThreadUtils;
import org.junit.Before;
import org.junit.Test;
@@ -38,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MemoryUsagePreferenceControllerTest {
@Mock
@@ -53,14 +48,12 @@
@Mock
private ProcStatsData.MemInfo mMemInfo;
- private Context mContext;
private MemoryUsagePreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = spy(new MemoryUsagePreferenceController(mContext));
+ mController = spy(new MemoryUsagePreferenceController(RuntimeEnvironment.application));
doReturn(mProcStatsData).when(mController).getProcStatsData();
doNothing().when(mController).setDuration();
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -69,9 +62,6 @@
}
@Test
- @Config(shadows = {
- ShadowThreadUtils.class
- })
public void updateState_shouldUpdatePreferenceSummary() {
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
index 483aedd..8dbd5bf 100644
--- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,7 +25,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,10 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MobileDataAlwaysOnPreferenceControllerTest {
@Mock
@@ -54,8 +50,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new MobileDataAlwaysOnPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
index 54c855f..e94e99f 100644
--- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
@@ -1,10 +1,7 @@
package com.android.settings.development;
-import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
- .REQUEST_MOCK_LOCATION_APP;
-
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_MOCK_LOCATION_APP;
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.anyString;
@@ -23,7 +20,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -33,13 +29,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MockLocationAppPreferenceControllerTest {
@Mock
@@ -84,19 +78,16 @@
mController.updateState(mPreference);
- verify(mPreference).setSummary(
- mContext.getResources().getString(R.string.mock_location_app_set, appName));
+ verify(mPreference).setSummary(mContext.getString(R.string.mock_location_app_set, appName));
}
@Test
public void updateState_noAppSelected_shouldSetSummaryToDefault() {
- when(mAppOpsManager.getPackagesForOps(any())).thenReturn(
- Collections.emptyList());
+ when(mAppOpsManager.getPackagesForOps(any())).thenReturn(Collections.emptyList());
mController.updateState(mPreference);
- verify(mPreference).setSummary(
- mContext.getResources().getString(R.string.mock_location_app_not_set));
+ verify(mPreference).setSummary(mContext.getString(R.string.mock_location_app_not_set));
}
@Test
@@ -106,16 +97,16 @@
final String newAppName = "bar";
final Intent intent = new Intent();
intent.setAction(newAppName);
- when(mAppOpsManager.getPackagesForOps(any())).thenReturn(
- Collections.singletonList(mPackageOps));
+ when(mAppOpsManager.getPackagesForOps(any()))
+ .thenReturn(Collections.singletonList(mPackageOps));
when(mPackageOps.getOps()).thenReturn(Collections.singletonList(mOpEntry));
when(mOpEntry.getMode()).thenReturn(AppOpsManager.MODE_ALLOWED);
when(mPackageOps.getPackageName()).thenReturn(prevAppName);
when(mPackageManager.getApplicationInfo(anyString(),
eq(PackageManager.MATCH_DISABLED_COMPONENTS))).thenReturn(mApplicationInfo);
- final boolean handled = mController.onActivityResult(REQUEST_MOCK_LOCATION_APP,
- Activity.RESULT_OK, intent);
+ final boolean handled =
+ mController.onActivityResult(REQUEST_MOCK_LOCATION_APP, Activity.RESULT_OK, intent);
assertThat(handled).isTrue();
verify(mAppOpsManager).setMode(anyInt(), anyInt(), eq(newAppName),
diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
index e7a67a9..417b8d8 100644
--- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
@@ -17,7 +17,6 @@
*/
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.verify;
@@ -28,7 +27,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,11 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotificationChannelWarningsPreferenceControllerTest {
@Mock
@@ -49,7 +44,6 @@
@Mock
private PreferenceScreen mScreen;
-
private Context mContext;
private NotificationChannelWarningsPreferenceController mController;
diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
index a9ff56f..7b3d3c3 100644
--- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
@@ -16,8 +16,7 @@
package com.android.settings.development;
-import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
- .REQUEST_CODE_ENABLE_OEM_UNLOCK;
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_ENABLE_OEM_UNLOCK;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -35,7 +34,6 @@
import android.support.v7.preference.PreferenceScreen;
import android.telephony.TelephonyManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -45,10 +43,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class OemUnlockPreferenceControllerTest {
@Mock
@@ -79,10 +75,10 @@
when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
when(mContext.getResources()).thenReturn(mResources);
mController = new OemUnlockPreferenceController(mContext, mActivity, mFragment);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
- when(mFragment.getChildFragmentManager()).thenReturn(
- mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
+ when(mFragment.getChildFragmentManager())
+ .thenReturn(mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
mController.displayPreference(mPreferenceScreen);
}
@@ -172,8 +168,7 @@
@Test
public void onActivityResult_shouldReturnFalse() {
- final boolean result = mController.onActivityResult(123454,
- 1434, null);
+ final boolean result = mController.onActivityResult(123454, 1434, null);
assertThat(result).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java
index 8a7198d..ca68764 100644
--- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java
@@ -18,9 +18,7 @@
import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-
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.verify;
@@ -32,7 +30,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -41,10 +38,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PictureColorModePreferenceControllerTest {
@Mock
@@ -66,8 +61,8 @@
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
mController = new PictureColorModePreferenceController(mContext, mLifecycle);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
when(mContext.getResources()).thenReturn(mResources);
when(mResources.getIntArray(R.array.color_mode_ids)).thenReturn(new int[0]);
mController.displayPreference(mPreferenceScreen);
diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
index 5222d19..2c8ee71 100644
--- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,21 +25,16 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PointerLocationPreferenceControllerTest {
@Mock
@@ -61,11 +55,6 @@
mController.displayPreference(mScreen);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void updateState_pointerLocationEnabled_shouldCheckedPreference() {
Settings.System.putInt(mContext.getContentResolver(),
diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
index 67009df..77cedca 100644
--- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,23 +27,16 @@
import android.view.ThreadedRenderer;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class ProfileGpuRenderingPreferenceControllerTest {
@Mock
@@ -73,17 +65,11 @@
mController.displayPreference(mScreen);
}
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onPreferenceChange_noValueSet_shouldSetEmptyString() {
mController.onPreferenceChange(mPreference, null /* new value */);
- String mode = SystemProperties.get(
- ThreadedRenderer.PROFILE_PROPERTY);
+ String mode = SystemProperties.get(ThreadedRenderer.PROFILE_PROPERTY);
assertThat(mode).isEqualTo("");
}
@@ -91,15 +77,13 @@
public void onPreferenceChange_option1Selected_shouldSetOption1() {
mController.onPreferenceChange(mPreference, mListValues[1]);
- String mode = SystemProperties.get(
- ThreadedRenderer.PROFILE_PROPERTY);
+ String mode = SystemProperties.get(ThreadedRenderer.PROFILE_PROPERTY);
assertThat(mode).isEqualTo(mListValues[1]);
}
@Test
public void updateState_option1Set_shouldUpdatePreferenceToOption1() {
- SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY,
- mListValues[1]);
+ SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY, mListValues[1]);
mController.updateState(mPreference);
@@ -109,8 +93,7 @@
@Test
public void updateState_option2Set_shouldUpdatePreferenceToOption2() {
- SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY,
- mListValues[2]);
+ SystemProperties.set(ThreadedRenderer.PROFILE_PROPERTY, mListValues[2]);
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
index a849b7b..c78500d 100644
--- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
@@ -17,7 +17,6 @@
*/
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,7 +25,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,11 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ResizableActivityPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
index bb26fb5..db80080 100644
--- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -28,7 +27,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RtlLayoutPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
index 91a0b3c..c7cf74f 100644
--- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
@@ -17,17 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.content.res.Resources;
import android.provider.Settings;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SecondaryDisplayPreferenceControllerTest {
@Mock
@@ -70,10 +67,9 @@
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mListValues = mContext.getResources().getStringArray(
- R.array.overlay_display_devices_values);
- mListSummaries = mContext.getResources().getStringArray(
- R.array.overlay_display_devices_entries);
+ final Resources resources = mContext.getResources();
+ mListValues = resources.getStringArray(R.array.overlay_display_devices_values);
+ mListSummaries = resources.getStringArray(R.array.overlay_display_devices_entries);
mController = new SecondaryDisplayPreferenceController(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
index 8ede652..59e82a6 100644
--- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
@@ -16,17 +16,15 @@
package com.android.settings.development;
-import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
- .REQUEST_CODE_DEBUG_APP;
-
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP;
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.verify;
import static org.mockito.Mockito.when;
import android.app.Activity;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
@@ -34,7 +32,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -44,11 +41,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SelectDebugAppPreferenceControllerTest {
@Mock
@@ -68,10 +63,10 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = spy(new SelectDebugAppPreferenceController(mContext, mFragment));
- ReflectionHelpers.setField(mController, "mPackageManager" /* field name */,
- mPackageManagerWrapper);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ ReflectionHelpers
+ .setField(mController, "mPackageManager" /* field name */, mPackageManagerWrapper);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@@ -89,23 +84,21 @@
@Test
public void updateState_foobarAppSelected_shouldUpdateSummaryWithDebugAppLabel() {
final String debugApp = "foobar";
- Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
- debugApp);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.Global.putString(contentResolver, Settings.Global.DEBUG_APP, debugApp);
mController.updateState(mPreference);
- verify(mPreference).setSummary(
- mContext.getResources().getString(R.string.debug_app_set, debugApp));
+ verify(mPreference).setSummary(mContext.getString(R.string.debug_app_set, debugApp));
}
@Test
public void updateState_noAppSelected_shouldUpdateSummaryWithNoAppSelected() {
final String debugApp = null;
- Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
- debugApp);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.Global.putString(contentResolver, Settings.Global.DEBUG_APP, debugApp);
mController.updateState(mPreference);
- verify(mPreference).setSummary(
- mContext.getResources().getString(R.string.debug_app_not_set));
+ verify(mPreference).setSummary(mContext.getString(R.string.debug_app_not_set));
}
@Test
@@ -113,12 +106,11 @@
Intent activityResultIntent = new Intent(mContext, AppPicker.class);
final String appLabel = "foobar";
activityResultIntent.setAction(appLabel);
- final boolean result = mController.onActivityResult(REQUEST_CODE_DEBUG_APP,
- Activity.RESULT_OK, activityResultIntent);
+ final boolean result = mController
+ .onActivityResult(REQUEST_CODE_DEBUG_APP, Activity.RESULT_OK, activityResultIntent);
assertThat(result).isTrue();
- verify(mPreference).setSummary(
- mContext.getResources().getString(R.string.debug_app_set, appLabel));
+ verify(mPreference).setSummary(mContext.getString(R.string.debug_app_set, appLabel));
}
@Test
@@ -132,7 +124,6 @@
mController.onDeveloperOptionsSwitchDisabled();
verify(mPreference).setEnabled(false);
- verify(mPreference).setSummary(
- mContext.getResources().getString(R.string.debug_app_not_set));
+ verify(mPreference).setSummary(mContext.getString(R.string.debug_app_not_set));
}
}
diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java
index 0a189cb..2bc7c80 100644
--- a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -27,7 +26,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,11 +34,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ShortcutManagerThrottlingPreferenceControllerTest {
@Mock
@@ -59,8 +55,8 @@
mContext = RuntimeEnvironment.application;
mController = new ShortcutManagerThrottlingPreferenceController(mContext);
ReflectionHelpers.setField(mController, "mShortcutService", mShortcutService);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
index 6779511..01d3259 100644
--- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
@@ -16,14 +16,9 @@
package com.android.settings.development;
-import static com.android.settings.development.ShowFirstCrashDialogPreferenceController
- .SETTING_VALUE_OFF;
-import static com.android.settings.development.ShowFirstCrashDialogPreferenceController
- .SETTING_VALUE_ON;
-
+import static com.android.settings.development.ShowFirstCrashDialogPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.ShowFirstCrashDialogPreferenceController.SETTING_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -31,7 +26,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,10 +34,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ShowFirstCrashDialogPreferenceControllerTest {
@Mock
@@ -59,8 +51,8 @@
mContext = RuntimeEnvironment.application;
mPreference = new SwitchPreference(mContext);
mController = new ShowFirstCrashDialogPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
index bfe72c6..2237195 100644
--- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
@@ -17,32 +17,24 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.Context;
+import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
import android.view.View;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class ShowLayoutBoundsPreferenceControllerTest {
@Mock
@@ -50,30 +42,23 @@
@Mock
private PreferenceScreen mPreferenceScreen;
- private Context mContext;
private ShowLayoutBoundsPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new ShowLayoutBoundsPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ mController = new ShowLayoutBoundsPreferenceController(RuntimeEnvironment.application);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onPreferenceChanged_settingEnabled_turnOnShowLayoutBounds() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+ final boolean mode =
+ SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false /* default */);
assertThat(mode).isTrue();
}
@@ -82,16 +67,15 @@
public void onPreferenceChanged_settingDisabled_turnOffShowLayoutBounds() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+ final boolean mode =
+ SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false /* default */);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- SettingsShadowSystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
- Boolean.toString(true));
+ SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -99,8 +83,7 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- SettingsShadowSystemProperties.set(View.DEBUG_LAYOUT_PROPERTY,
- Boolean.toString(false));
+ SystemProperties.set(View.DEBUG_LAYOUT_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -110,8 +93,8 @@
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
- final boolean mode = SettingsShadowSystemProperties.getBoolean(
- View.DEBUG_LAYOUT_PROPERTY, false /* default */);
+ final boolean mode =
+ SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false /* default */);
assertThat(mode).isFalse();
verify(mPreference).setEnabled(false);
diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
index c1c110e..8b1984e 100644
--- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
@@ -16,9 +16,7 @@
package com.android.settings.development;
-import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController
- .SURFACE_FLINGER_READ_CODE;
-
+import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController.SURFACE_FLINGER_READ_CODE;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
@@ -35,7 +33,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowParcel;
@@ -48,7 +45,6 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ShowSurfaceUpdatesPreferenceControllerTest {
@Mock
@@ -87,11 +83,11 @@
}
@Test
- @Config(shadows = {ShadowParcel.class})
+ @Config(shadows = ShadowParcel.class)
public void updateState_settingEnabled_shouldCheckPreference() throws RemoteException {
ShadowParcel.sReadIntResult = 1;
- doReturn(true).when(mSurfaceFlinger).transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(),
- eq(0 /* flags */));
+ doReturn(true).when(mSurfaceFlinger)
+ .transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(), eq(0 /* flags */));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -101,8 +97,8 @@
@Config(shadows = {ShadowParcel.class})
public void updateState_settingDisabled_shouldUnCheckPreference() throws RemoteException {
ShadowParcel.sReadIntResult = 0;
- doReturn(true).when(mSurfaceFlinger).transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(),
- eq(0 /* flags */));
+ doReturn(true).when(mSurfaceFlinger)
+ .transact(eq(SURFACE_FLINGER_READ_CODE), any(), any(), eq(0 /* flags */));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
index 3db3cba..2f8a9a2 100644
--- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,21 +25,16 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ShowTapsPreferenceControllerTest {
@Mock
@@ -61,11 +55,6 @@
mController.displayPreference(mScreen);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void updateState_showTapsEnabled_shouldCheckedPreference() {
Settings.System.putInt(mContext.getContentResolver(),
diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
index 21b70f5..9db3688 100644
--- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
@@ -16,13 +16,9 @@
package com.android.settings.development;
-import static com.android.settings.development.SimulateColorSpacePreferenceController
- .SETTING_VALUE_OFF;
-import static com.android.settings.development.SimulateColorSpacePreferenceController
- .SETTING_VALUE_ON;
-
+import static com.android.settings.development.SimulateColorSpacePreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.SimulateColorSpacePreferenceController.SETTING_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -34,7 +30,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -43,10 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SimulateColorSpacePreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java
index 9cdbf25..487dbd3 100644
--- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -29,7 +28,6 @@
import android.provider.Settings;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -42,10 +40,8 @@
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StayAwakePreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
index d21161c..b6535f3 100644
--- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
@@ -17,11 +17,9 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.Context;
import android.os.RemoteException;
import android.os.StrictMode;
import android.os.SystemProperties;
@@ -29,24 +27,17 @@
import android.support.v7.preference.PreferenceScreen;
import android.view.IWindowManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class})
public class StrictModePreferenceControllerTest {
@Mock
@@ -56,24 +47,17 @@
@Mock
private SwitchPreference mPreference;
- private Context mContext;
private StrictModePreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new StrictModePreferenceController(mContext);
+ mController = new StrictModePreferenceController(RuntimeEnvironment.application);
ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void onPreferenceChange_settingEnabled_shouldTurnOnStrictMode() throws RemoteException {
mController.onPreferenceChange(mPreference, true /* new value */);
diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
index 26e1fcb..4bdf72a 100644
--- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,7 +25,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,10 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TetheringHardwareAccelPreferenceControllerTest {
@Mock
@@ -54,8 +50,8 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new TetheringHardwareAccelPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java
index ebff811..1c8c270 100644
--- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java
@@ -16,22 +16,19 @@
package com.android.settings.development;
-import static com.android.settings.development.TransitionAnimationScalePreferenceController
- .DEFAULT_VALUE;
-import static com.android.settings.development.TransitionAnimationScalePreferenceController
- .TRANSITION_ANIMATION_SCALE_SELECTOR;
-
+import static com.android.settings.development.TransitionAnimationScalePreferenceController.DEFAULT_VALUE;
+import static com.android.settings.development.TransitionAnimationScalePreferenceController.TRANSITION_ANIMATION_SCALE_SELECTOR;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.content.res.Resources;
import android.os.RemoteException;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
import android.view.IWindowManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,11 +37,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TransitionAnimationScalePreferenceControllerTest {
@Mock
@@ -72,10 +67,9 @@
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mListValues = mContext.getResources().getStringArray(
- R.array.transition_animation_scale_values);
- mListSummaries = mContext.getResources().getStringArray(
- R.array.transition_animation_scale_entries);
+ final Resources resources = mContext.getResources();
+ mListValues = resources.getStringArray(R.array.transition_animation_scale_values);
+ mListSummaries = resources.getStringArray(R.array.transition_animation_scale_entries);
mController = new TransitionAnimationScalePreferenceController(mContext);
ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -86,22 +80,22 @@
public void onPreferenceChange_noValueSet_shouldSetDefault() throws RemoteException {
mController.onPreferenceChange(mPreference, null /* new value */);
- verify(mWindowManager).setAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR,
- DEFAULT_VALUE);
+ verify(mWindowManager)
+ .setAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR, DEFAULT_VALUE);
}
@Test
public void onPreferenceChange_option5Selected_shouldSetOption5() throws RemoteException {
mController.onPreferenceChange(mPreference, mListValues[5]);
- verify(mWindowManager).setAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR,
- Float.valueOf(mListValues[5]));
+ verify(mWindowManager)
+ .setAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR, Float.valueOf(mListValues[5]));
}
@Test
public void updateState_option5Set_shouldUpdatePreferenceToOption5() throws RemoteException {
- when(mWindowManager.getAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR)).thenReturn(
- Float.valueOf(mListValues[5]));
+ when(mWindowManager.getAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR))
+ .thenReturn(Float.valueOf(mListValues[5]));
mController.updateState(mPreference);
@@ -111,8 +105,8 @@
@Test
public void updateState_option3Set_shouldUpdatePreferenceToOption3() throws RemoteException {
- when(mWindowManager.getAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR)).thenReturn(
- Float.valueOf(mListValues[3]));
+ when(mWindowManager.getAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR))
+ .thenReturn(Float.valueOf(mListValues[3]));
mController.updateState(mPreference);
@@ -124,8 +118,8 @@
public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() throws RemoteException {
mController.onDeveloperOptionsSwitchDisabled();
- verify(mWindowManager).setAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR,
- DEFAULT_VALUE);
+ verify(mWindowManager)
+ .setAnimationScale(TRANSITION_ANIMATION_SCALE_SELECTOR, DEFAULT_VALUE);
verify(mPreference).setEnabled(false);
}
}
diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
index 2df917d..c3c90b5 100644
--- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,7 +25,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,10 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UsbAudioRoutingPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
index 2fdd935..6cc3f9d 100644
--- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.development;
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;
@@ -32,7 +31,6 @@
import android.provider.Settings.Global;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -44,14 +42,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.Collections;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VerifyAppsOverUsbPreferenceControllerTest {
@Mock
@@ -84,8 +80,8 @@
mContext = RuntimeEnvironment.application;
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
mController = new VerifyAppsOverUsbPreferenceController(mContext);
- ReflectionHelpers.setField(
- mController, "mRestrictedLockUtils", mRestrictedLockUtilsDelegate);
+ ReflectionHelpers
+ .setField(mController, "mRestrictedLockUtils", mRestrictedLockUtilsDelegate);
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
mController.displayPreference(mScreen);
}
@@ -93,14 +89,14 @@
private void setupVerifyBroadcastReceivers(boolean nonEmpty) {
final List<ResolveInfo> resolveInfos = nonEmpty
? Collections.singletonList(mock(ResolveInfo.class))
- : Collections.<ResolveInfo>emptyList();
+ : Collections.emptyList();
when(mPackageManager.queryBroadcastReceivers((Intent) any(), anyInt()))
.thenReturn(resolveInfos);
}
private void setupEnforcedAdmin(EnforcedAdmin result) {
- when(mRestrictedLockUtilsDelegate.checkIfRestrictionEnforced(
- (Context) any(), anyString(), anyInt())).thenReturn(result);
+ when(mRestrictedLockUtilsDelegate
+ .checkIfRestrictionEnforced(any(), anyString(), anyInt())).thenReturn(result);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
index 1896ba6..d394b3f 100644
--- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
@@ -16,14 +16,10 @@
package com.android.settings.development;
-import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
- .REQUEST_CODE_DEBUG_APP;
-import static com.android.settings.development.WaitForDebuggerPreferenceController
- .SETTING_VALUE_OFF;
+import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP;
+import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_OFF;
import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_ON;
-
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.verify;
@@ -31,6 +27,7 @@
import android.app.Activity;
import android.app.IActivityManager;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.os.RemoteException;
@@ -38,7 +35,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -47,10 +43,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WaitForDebuggerPreferenceControllerTest {
@Mock
@@ -61,16 +55,18 @@
private IActivityManager mIActivityManager;
private Context mContext;
+ private ContentResolver mContentResolver;
private WaitForDebuggerPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
+ mContentResolver = mContext.getContentResolver();
mController = spy(new WaitForDebuggerPreferenceController(mContext));
doReturn(mIActivityManager).when(mController).getActivityManagerService();
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@@ -78,34 +74,31 @@
public void onPreferenceChange_settingEnabledFoobarApp_waitForDebuggerShouldBeOn()
throws RemoteException {
final String debugApp = "foobar";
- Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
- debugApp);
+ Settings.Global.putString(mContentResolver, Settings.Global.DEBUG_APP, debugApp);
mController.onPreferenceChange(mPreference, true /* newValue */);
- verify(mIActivityManager).setDebugApp(debugApp,
- true /* waitForDebugger */, true /* persistent */);
+ verify(mIActivityManager)
+ .setDebugApp(debugApp, true /* waitForDebugger */, true /* persistent */);
}
@Test
public void onPreferenceChange_settingDisabledFoobarApp_waitForDebuggerShouldBeOff()
throws RemoteException {
final String debugApp = "foobar";
- Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
- debugApp);
+ Settings.Global.putString(mContentResolver, Settings.Global.DEBUG_APP, debugApp);
mController.onPreferenceChange(mPreference, false /* newValue */);
- verify(mIActivityManager).setDebugApp(debugApp,
- false /* waitForDebugger */, true /* persistent */);
+ verify(mIActivityManager)
+ .setDebugApp(debugApp, false /* waitForDebugger */, true /* persistent */);
}
@Test
public void updateState_settingEnabledNullDebugApp_preferenceShouldBeCheckedAndDisabled() {
final String debugApp = null;
- Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
- debugApp);
- Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
- SETTING_VALUE_ON);
+ Settings.Global.putString(mContentResolver, Settings.Global.DEBUG_APP, debugApp);
+ Settings.Global
+ .putInt(mContentResolver, Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_ON);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -115,10 +108,9 @@
@Test
public void updateState_settingEnabledFoobarApp_preferenceShouldBeCheckedAndDisabled() {
final String debugApp = "foobar";
- Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
- debugApp);
- Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
- SETTING_VALUE_ON);
+ Settings.Global.putString(mContentResolver, Settings.Global.DEBUG_APP, debugApp);
+ Settings.Global
+ .putInt(mContentResolver, Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_ON);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -128,10 +120,9 @@
@Test
public void updateState_settingDisabledNullDebugApp_preferenceShouldNotBeCheckedAndDisabled() {
final String debugApp = null;
- Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
- debugApp);
- Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
- SETTING_VALUE_OFF);
+ Settings.Global.putString(mContentResolver, Settings.Global.DEBUG_APP, debugApp);
+ Settings.Global
+ .putInt(mContentResolver, Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -141,10 +132,9 @@
@Test
public void updateState_settingDisableFoobarApp_preferenceShouldNotBeCheckedAndEnabled() {
final String debugApp = "foobar";
- Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEBUG_APP,
- debugApp);
- Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
- SETTING_VALUE_OFF);
+ Settings.Global.putString(mContentResolver, Settings.Global.DEBUG_APP, debugApp);
+ Settings.Global
+ .putInt(mContentResolver, Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -154,10 +144,10 @@
@Test
public void onActivityResult_requestCodeAndSettingEnabled_waitForDebuggerShouldBeChecked() {
Intent onActivityResultIntent = new Intent(mContext, AppPicker.class);
- Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
- SETTING_VALUE_ON);
- boolean result = mController.onActivityResult(REQUEST_CODE_DEBUG_APP, Activity.RESULT_OK,
- onActivityResultIntent);
+ Settings.Global
+ .putInt(mContentResolver, Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_ON);
+ boolean result = mController
+ .onActivityResult(REQUEST_CODE_DEBUG_APP, Activity.RESULT_OK, onActivityResultIntent);
assertThat(result).isTrue();
verify(mPreference).setChecked(true);
@@ -166,10 +156,10 @@
@Test
public void onActivityResult_requestCodeAndSettingDisabled_waitForDebuggerShouldNotBeChecked() {
Intent onActivityResultIntent = new Intent(mContext, AppPicker.class);
- Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER,
- SETTING_VALUE_OFF);
- boolean result = mController.onActivityResult(REQUEST_CODE_DEBUG_APP, Activity.RESULT_OK,
- onActivityResultIntent);
+ Settings.Global
+ .putInt(mContentResolver, Settings.Global.WAIT_FOR_DEBUGGER, SETTING_VALUE_OFF);
+ boolean result = mController
+ .onActivityResult(REQUEST_CODE_DEBUG_APP, Activity.RESULT_OK, onActivityResultIntent);
assertThat(result).isTrue();
verify(mPreference).setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
index 0158b13..fe26589 100644
--- a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
@@ -21,12 +21,10 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.webview.WebViewUpdateServiceWrapper;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -38,11 +36,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WebViewAppPreferenceControllerTest {
@Mock
@@ -56,37 +52,33 @@
@Mock
private DefaultAppInfo mAppInfo;
- private Context mContext;
private WebViewAppPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = spy(new WebViewAppPreferenceController(mContext));
+ mController = spy(new WebViewAppPreferenceController(RuntimeEnvironment.application));
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
- ReflectionHelpers.setField(mController, "mWebViewUpdateServiceWrapper",
- mWebViewUpdateServiceWrapper);
+ ReflectionHelpers
+ .setField(mController, "mWebViewUpdateServiceWrapper", mWebViewUpdateServiceWrapper);
doReturn(mAppInfo).when(mController).getDefaultAppInfo();
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@Test
public void updateState_hasAppLabel_shouldSetAppLabelAndIcon() {
- final String appLabel = "SomeRandomAppLabel!!!";
- when(mAppInfo.loadLabel()).thenReturn(appLabel);
+ when(mAppInfo.loadLabel()).thenReturn("SomeRandomAppLabel!!!");
mController.updateState(mPreference);
- verify(mPreference).setSummary(appLabel);
+ verify(mPreference).setSummary("SomeRandomAppLabel!!!");
}
@Test
public void updateState_noAppLabel_shouldSetAppDefaultLabelAndNullIcon() {
- final String appLabel = null;
- when(mAppInfo.loadLabel()).thenReturn(appLabel);
+ when(mAppInfo.loadLabel()).thenReturn(null);
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
index 390f261..cbd2e8d 100644
--- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
@@ -16,13 +16,9 @@
package com.android.settings.development;
-import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController
- .SETTING_VALUE_OFF;
-import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController
- .SETTING_VALUE_ON;
-
+import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController.SETTING_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -30,7 +26,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,11 +33,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiConnectedMacRandomizationPreferenceControllerTest {
@Mock
@@ -58,8 +52,8 @@
mContext = RuntimeEnvironment.application;
mController = new WifiConnectedMacRandomizationPreferenceController(mContext);
mPreference = new SwitchPreference(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
index d14fb1e..e60b98a 100644
--- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,7 +25,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,10 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiDisplayCertificationPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
index 4b71767..e03f0a9 100644
--- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
@@ -24,7 +24,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,10 +31,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiVerboseLoggingPreferenceControllerTest {
@Mock
private Context mContext;
@@ -53,8 +50,8 @@
MockitoAnnotations.initMocks(this);
when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
mController = new WifiVerboseLoggingPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mPreference);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@@ -94,8 +91,8 @@
public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsSwitchDisabled();
- verify(mWifiManager).enableVerboseLogging(
- WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);
+ verify(mWifiManager)
+ .enableVerboseLogging(WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false);
}
diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
index ba35e04..aad9e40 100644
--- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
@@ -16,22 +16,19 @@
package com.android.settings.development;
-import static com.android.settings.development.WindowAnimationScalePreferenceController
- .DEFAULT_VALUE;
-import static com.android.settings.development.WindowAnimationScalePreferenceController
- .WINDOW_ANIMATION_SCALE_SELECTOR;
-
+import static com.android.settings.development.WindowAnimationScalePreferenceController.DEFAULT_VALUE;
+import static com.android.settings.development.WindowAnimationScalePreferenceController.WINDOW_ANIMATION_SCALE_SELECTOR;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.content.res.Resources;
import android.os.RemoteException;
import android.support.v7.preference.ListPreference;
import android.support.v7.preference.PreferenceScreen;
import android.view.IWindowManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,11 +37,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WindowAnimationScalePreferenceControllerTest {
@Mock
@@ -72,9 +67,9 @@
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mListValues = mContext.getResources().getStringArray(R.array.window_animation_scale_values);
- mListSummaries = mContext.getResources().getStringArray(
- R.array.window_animation_scale_entries);
+ final Resources resources = mContext.getResources();
+ mListValues = resources.getStringArray(R.array.window_animation_scale_values);
+ mListSummaries = resources.getStringArray(R.array.window_animation_scale_entries);
mController = new WindowAnimationScalePreferenceController(mContext);
ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -98,8 +93,8 @@
@Test
public void updateState_option5Set_shouldUpdatePreferenceToOption5() throws RemoteException {
- when(mWindowManager.getAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR)).thenReturn(
- Float.valueOf(mListValues[5]));
+ when(mWindowManager.getAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR))
+ .thenReturn(Float.valueOf(mListValues[5]));
mController.updateState(mPreference);
@@ -109,8 +104,8 @@
@Test
public void updateState_option3Set_shouldUpdatePreferenceToOption3() throws RemoteException {
- when(mWindowManager.getAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR)).thenReturn(
- Float.valueOf(mListValues[3]));
+ when(mWindowManager.getAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR))
+ .thenReturn(Float.valueOf(mListValues[3]));
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
index 8c38d22..2d69b6a 100644
--- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
@@ -17,9 +17,7 @@
package com.android.settings.development.featureflags;
import static android.arch.lifecycle.Lifecycle.Event.ON_START;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
@@ -29,7 +27,6 @@
import android.content.Context;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -39,10 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FeatureFlagPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java
index 11099b1..9f05ec4 100644
--- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceTest.java
@@ -20,17 +20,14 @@
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FeatureFlagPreferenceTest {
private static final String KEY = "feature_key";
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java
index 0839a02..c50f58a 100644
--- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagsDashboardTest.java
@@ -20,16 +20,13 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FeatureFlagsDashboardTest {
private FeatureFlagsDashboard mDashboard;
diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
index e107344..7165d32 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.development.qstile;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -37,7 +36,6 @@
import com.android.internal.statusbar.IStatusBarService;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -48,12 +46,10 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DevelopmentTilePreferenceControllerTest {
private static final String SERVICE_INFO_NAME = "TestName";
@@ -133,11 +129,10 @@
return preference;
}
- public static class FakeServiceInfo extends ServiceInfo {
+ private static class FakeServiceInfo extends ServiceInfo {
public String loadLabel(PackageManager mgr) {
return "hi";
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
index 92f5c22..9e0644d 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
@@ -16,13 +16,9 @@
package com.android.settings.development.qstile;
-import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace
- .SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE;
-import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace
- .SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE;
-
+import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace.SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE;
+import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace.SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -36,9 +32,8 @@
import android.os.RemoteException;
import android.widget.Toast;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowParcel;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowParcel;
import com.android.settings.wrapper.IWindowManagerWrapper;
import org.junit.After;
@@ -51,8 +46,8 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WinscopeTraceTest {
+
@Mock
private IWindowManagerWrapper mWindowManager;
@Mock
@@ -77,7 +72,7 @@
}
@Test
- @Config(shadows = {ShadowParcel.class})
+ @Config(shadows = ShadowParcel.class)
public void wmReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
// Assume Surface Trace is disabled.
ShadowParcel.sReadBoolResult = false;
@@ -86,7 +81,7 @@
}
@Test
- @Config(shadows = {ShadowParcel.class})
+ @Config(shadows = ShadowParcel.class)
public void sfReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
// Assume Window Trace is disabled.
doReturn(false).when(mWindowManager).isWindowTraceEnabled();
@@ -99,7 +94,7 @@
}
@Test
- @Config(shadows = {ShadowParcel.class})
+ @Config(shadows = ShadowParcel.class)
public void sfAndWmReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
ShadowParcel.sReadBoolResult = true;
doReturn(true).when(mWindowManager).isWindowTraceEnabled();
@@ -118,7 +113,7 @@
}
@Test
- @Config(shadows = {ShadowParcel.class})
+ @Config(shadows = ShadowParcel.class)
public void wmThrowsRemoteExAndSfReturnsTraceDisabled_shouldReturnDisabled()
throws RemoteException {
ShadowParcel.sReadBoolResult = false;
@@ -144,7 +139,7 @@
}
@Test
- @Config(shadows = {ShadowParcel.class})
+ @Config(shadows = ShadowParcel.class)
public void setIsEnableTrue_shouldEnableLayerTrace() throws RemoteException {
mWinscopeTrace.setIsEnabled(true);
assertThat(ShadowParcel.sWriteIntResult).isEqualTo(1);
@@ -155,7 +150,7 @@
}
@Test
- @Config(shadows = {ShadowParcel.class})
+ @Config(shadows = ShadowParcel.class)
public void setIsEnableFalse_shouldDisableWindowTrace() throws RemoteException {
mWinscopeTrace.setIsEnabled(false);
verify(mWindowManager).stopWindowTrace();
@@ -164,7 +159,7 @@
}
@Test
- @Config(shadows = {ShadowParcel.class})
+ @Config(shadows = ShadowParcel.class)
public void setIsEnableFalse_shouldDisableLayerTrace() throws RemoteException {
mWinscopeTrace.setIsEnabled(false);
assertThat(ShadowParcel.sWriteIntResult).isEqualTo(0);
@@ -176,7 +171,7 @@
}
@Test
- public void setIsEnableFalse_shouldShowToast() throws RemoteException {
+ public void setIsEnableFalse_shouldShowToast() {
mWinscopeTrace.setIsEnabled(false);
verify(mToast).show();
}
@@ -196,7 +191,7 @@
* Verify is surface flinger is not available not calls are made to it.
*/
@Test
- public void setIsEnableAndSfUnavailable_shouldFailGracefully() throws RemoteException {
+ public void setIsEnableAndSfUnavailable_shouldFailGracefully() {
ReflectionHelpers.setField(mWinscopeTrace, "mSurfaceFlinger", null);
mWinscopeTrace.setIsEnabled(true);
verifyNoMoreInteractions(mSurfaceFlinger);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java
index 521800b..b1073ac 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java
@@ -17,14 +17,12 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import android.accounts.Account;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,11 +32,10 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BrandedAccountPreferenceControllerTest {
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private BrandedAccountPreferenceController mController;
@@ -58,9 +55,8 @@
@Test
public void isAvailable_onWhenAccountIsAvailable() {
- when(fakeFeatureFactory.mAccountFeatureProvider.getAccounts(any(Context.class))).thenReturn(
- new Account[]
- {new Account("fake@account.foo", "fake.reallyfake")});
+ when(fakeFeatureFactory.mAccountFeatureProvider.getAccounts(any(Context.class)))
+ .thenReturn(new Account[] {new Account("fake@account.foo", "fake.reallyfake")});
mController = new BrandedAccountPreferenceController(mContext);
assertThat(mController.isAvailable()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index 17122ae..37b85ea 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -31,6 +31,7 @@
import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.os.Build;
+import android.os.Process;
import android.os.UserManager;
import android.provider.Settings;
import android.support.v7.preference.Preference;
@@ -38,12 +39,10 @@
import android.text.BidiFormatter;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.search.DatabaseIndexingManager;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
@@ -55,28 +54,25 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowUserManager;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowUtils.class,
- ShadowUserManager.class,
- })
+@Config(shadows = ShadowUtils.class)
public class BuildNumberPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Activity mActivity;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Fragment mFragment;
@Mock(answer = RETURNS_DEEP_STUBS)
private PreferenceScreen mScreen;
- @Mock
- private UserManager mUserManager;
+ private ShadowUserManager mShadowUserManager;
+
+ private Context mContext;
private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
private FakeFeatureFactory mFactory;
@@ -86,22 +82,26 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- ShadowUserManager.getShadow().setIsAdminUser(true);
+ mContext = RuntimeEnvironment.application;
+ final UserManager userManager =
+ (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+ mShadowUserManager = Shadows.shadowOf(userManager);
+ mShadowUserManager.setIsAdminUser(true);
mFactory = FakeFeatureFactory.setupForTest();
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
- when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- mController = new BuildNumberPreferenceController(
- mContext, mActivity, mFragment, mLifecycle);
+ mController =
+ new BuildNumberPreferenceController(mContext, mActivity, mFragment, mLifecycle);
- mPreference = new Preference(RuntimeEnvironment.application);
+ mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
+ DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mContext, false);
}
@After
public void tearDown() {
ShadowUtils.reset();
- ShadowUserManager.getShadow().reset();
+ mShadowUserManager.setIsAdminUser(false);
}
@Test
@@ -120,22 +120,19 @@
@Test
public void handlePrefTreeClick_notAdminUser_doNothing() {
- when(mUserManager.isAdminUser()).thenReturn(false);
+ mShadowUserManager.setIsAdminUser(false);
assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
}
@Test
public void handlePrefTreeClick_deviceNotProvisioned_doNothing() {
- when(mUserManager.isAdminUser()).thenReturn(true);
final Context context = RuntimeEnvironment.application;
- Settings.Global.putInt(context.getContentResolver(),
- Settings.Global.DEVICE_PROVISIONED, 0);
+ Settings.Global.putInt(context.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0);
- mController = new BuildNumberPreferenceController(
- context, mActivity, mFragment, mLifecycle);
+ mController =
+ new BuildNumberPreferenceController(context, mActivity, mFragment, mLifecycle);
ReflectionHelpers.setField(mController, "mContext", context);
- ReflectionHelpers.setField(mController, "mUm", mUserManager);
assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
verify(mFactory.metricsFeatureProvider).action(
@@ -146,11 +143,10 @@
@Test
public void handlePrefTreeClick_isMonkeyRun_doNothing() {
final Context context = spy(RuntimeEnvironment.application);
- Settings.Global.putInt(context.getContentResolver(),
- Settings.Global.DEVICE_PROVISIONED, 1);
+ Settings.Global.putInt(context.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
ShadowUtils.setIsUserAMonkey(true);
- mController = new BuildNumberPreferenceController(
- context, mActivity, mFragment, mLifecycle);
+ mController =
+ new BuildNumberPreferenceController(context, mActivity, mFragment, mLifecycle);
assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
}
@@ -158,15 +154,13 @@
@Test
public void handlePrefTreeClick_userHasRestriction_doNothing() {
final Context context = spy(RuntimeEnvironment.application);
- Settings.Global.putInt(context.getContentResolver(),
- Settings.Global.DEVICE_PROVISIONED, 1);
+ Settings.Global.putInt(context.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
- when(mUserManager.isAdminUser()).thenReturn(true);
- when(mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES))
- .thenReturn(true);
+ mShadowUserManager.setUserRestriction(Process.myUserHandle(),
+ UserManager.DISALLOW_DEBUGGING_FEATURES, true);
- mController = new BuildNumberPreferenceController(
- mContext, mActivity, mFragment, mLifecycle);
+ mController =
+ new BuildNumberPreferenceController(mContext, mActivity, mFragment, mLifecycle);
ReflectionHelpers.setField(mController, "mContext", context);
assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
@@ -183,8 +177,7 @@
null);
assertThat(activityResultHandled).isFalse();
- assertThat(DevelopmentSettingsEnabler
- .isDevelopmentSettingsEnabled(RuntimeEnvironment.application)).isFalse();
+ assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isFalse();
}
@Test
@@ -195,19 +188,16 @@
null);
assertThat(activityResultHandled).isTrue();
- assertThat(DevelopmentSettingsEnabler
- .isDevelopmentSettingsEnabled(RuntimeEnvironment.application)).isFalse();
+ assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isFalse();
}
@Test
public void onActivityResult_confirmPasswordRequestCompleted_enableDevPref() {
- final Context context = RuntimeEnvironment.application;
-
when(mFactory.searchFeatureProvider.getIndexingManager(any(Context.class)))
.thenReturn(mock(DatabaseIndexingManager.class));
- mController = new BuildNumberPreferenceController(
- context, mActivity, mFragment, mLifecycle);
+ mController =
+ new BuildNumberPreferenceController(mContext, mActivity, mFragment, mLifecycle);
final boolean activityResultHandled = mController.onActivityResult(
BuildNumberPreferenceController.REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF,
@@ -215,8 +205,6 @@
null);
assertThat(activityResultHandled).isTrue();
- assertThat(DevelopmentSettingsEnabler
- .isDevelopmentSettingsEnabled(RuntimeEnvironment.application)).isTrue();
+ assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isTrue();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java
index 7555d8e..5bac790 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java
@@ -34,13 +34,11 @@
import android.telephony.TelephonyManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -58,11 +56,7 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowUtils.class, ShadowConnectivityManager.class, ShadowUserManager.class}
-)
+@Config(shadows = {ShadowUtils.class, ShadowConnectivityManager.class, ShadowUserManager.class})
public class DeviceInfoSettingsTest {
@Mock
@@ -91,22 +85,19 @@
doNothing().when(mSettings).onCreatePreferences(any(), any());
doReturn(mScreen).when(mSettings).getPreferenceScreen();
- ShadowApplication.getInstance().setSystemService(Context.TELEPHONY_SERVICE,
- mTelephonyManager);
+ ShadowApplication.getInstance()
+ .setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
}
@Test
- @Config(shadows = {
- SettingsShadowSystemProperties.class
- })
public void getPrefXml_shouldReturnDeviceInfoXml() {
assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings);
}
@Test
public void getSummary_shouldReturnDeviceModel() {
- final SummaryLoader.SummaryProvider mProvider = DeviceInfoSettings.SUMMARY_PROVIDER_FACTORY
- .createSummaryProvider(null, mSummaryLoader);
+ final SummaryLoader.SummaryProvider mProvider =
+ DeviceInfoSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(null, mSummaryLoader);
mProvider.setListening(true);
@@ -116,8 +107,8 @@
@Test
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = RuntimeEnvironment.application;
- final List<String> niks = DeviceInfoSettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(context);
+ final List<String> niks =
+ DeviceInfoSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(context);
final int xmlId = (new DeviceInfoSettings()).getPreferenceScreenResId();
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
@@ -126,8 +117,7 @@
}
@Test
- @Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class,
- SettingsShadowSystemProperties.class})
+ @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public void onCreate_fromSearch_shouldNotOverrideInitialExpandedCount() {
final Bundle args = new Bundle();
args.putString(EXTRA_FRAGMENT_ARG_KEY, "search_key");
@@ -139,8 +129,7 @@
}
@Test
- @Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class,
- SettingsShadowSystemProperties.class})
+ @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public void onCreate_singleSim_shouldAddSingleSimCount() {
doReturn(1).when(mTelephonyManager).getPhoneCount();
@@ -151,8 +140,7 @@
}
@Test
- @Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class,
- SettingsShadowSystemProperties.class})
+ @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public void onCreate_dualeSim_shouldAddDualSimCount() {
doReturn(2).when(mTelephonyManager).getPhoneCount();
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
index 47bcf1c..460af10 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
@@ -15,11 +15,8 @@
*/
package com.android.settings.deviceinfo;
-
import static com.android.settings.deviceinfo.DeviceModelPreferenceController.getDeviceModel;
-
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.verify;
@@ -31,7 +28,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -44,7 +40,6 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DeviceModelPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -54,7 +49,6 @@
@Mock
private PreferenceScreen mPreferenceScreen;
-
private Context mContext;
private DeviceModelPreferenceController mController;
@@ -64,7 +58,7 @@
mContext = RuntimeEnvironment.application;
mController = new DeviceModelPreferenceController(mContext, mFragment);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mPreference);
+ .thenReturn(mPreference);
when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
}
@@ -83,14 +77,12 @@
public void displayPref_shouldSetSummary() {
mController.displayPreference(mPreferenceScreen);
- verify(mPreference).setSummary(mContext.getResources().getString(R.string.model_summary,
- getDeviceModel()));
+ verify(mPreference).setSummary(mContext.getString(R.string.model_summary, getDeviceModel()));
}
@Test
public void clickPreference_shouldLaunchHardwareInfoDialog() {
- assertThat(mController.handlePreferenceTreeClick(mPreference))
- .isTrue();
+ assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
verify(mFragment).getFragmentManager();
verify(mFragment.getFragmentManager().beginTransaction())
.add(any(HardwareInfoDialogFragment.class), eq(HardwareInfoDialogFragment.TAG));
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
index 4ff79ca..5d5fb76 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
@@ -17,10 +17,8 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -31,7 +29,6 @@
import android.provider.Settings;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.ValidatedEditTextPreference;
import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
@@ -44,12 +41,9 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DeviceNamePreferenceControllerTest {
private static final String TESTING_STRING = "Testing";
@@ -90,8 +84,8 @@
@Test
public void constructor_deviceNameLoadedIfSet() {
- Settings.Global.putString(mContext.getContentResolver(), Settings.Global.DEVICE_NAME,
- "Test");
+ Settings.Global
+ .putString(mContext.getContentResolver(), Settings.Global.DEVICE_NAME, "Test");
mController = new DeviceNamePreferenceController(mContext);
mController.setLocalBluetoothManager(mBluetoothManager);
assertThat(mController.getSummary()).isEqualTo("Test");
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
index 951d8c7..3266f8a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
@@ -15,14 +15,15 @@
*/
package com.android.settings.deviceinfo;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.SystemProperties;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.Before;
import org.junit.Test;
@@ -30,13 +31,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FccEquipmentIdPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -52,7 +48,7 @@
MockitoAnnotations.initMocks(this);
mController = new FccEquipmentIdPreferenceController(mContext);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mPreference);
+ .thenReturn(mPreference);
}
@Test
@@ -61,9 +57,8 @@
}
@Test
- @Config(shadows = SettingsShadowSystemProperties.class)
public void isAvailable_configNonEmpty_shouldReturnTrue() {
- SettingsShadowSystemProperties.set("ro.ril.fccid", "fcc_equipment");
+ SystemProperties.set("ro.ril.fccid", "fcc_equipment");
assertThat(mController.isAvailable()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
index dfc1a0c..45cfb28 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
@@ -15,11 +15,14 @@
*/
package com.android.settings.deviceinfo;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
import android.app.Fragment;
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -27,33 +30,25 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FeedbackPreferenceControllerTest {
+
@Mock
private Fragment mFragment;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FeedbackPreferenceController mController;
- public FeedbackPreferenceControllerTest() {
- }
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- this.mController = new FeedbackPreferenceController(this.mFragment, this.mContext);
+ mController = new FeedbackPreferenceController(mFragment, mContext);
}
@Test
public void isAvailable_noReporterPackage_shouldReturnFalse() {
- when(this.mContext.getResources().getString(anyInt())).thenReturn("");
- assertThat(Boolean.valueOf(this.mController.isAvailable())).isFalse();
+ when(mContext.getResources().getString(anyInt())).thenReturn("");
+ assertThat(mController.isAvailable()).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
index 15461cc2..be2dea2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
@@ -28,17 +28,14 @@
import android.view.View;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HardwareInfoDialogFragmentTest {
private Activity mActivity;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
index 10e4958..33d7e0c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/KernelVersionPreferenceControllerTest.java
@@ -15,22 +15,19 @@
*/
package com.android.settings.deviceinfo;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class KernelVersionPreferenceControllerTest {
@Mock
@@ -47,5 +44,4 @@
public void alwaysAvailable() {
assertThat(mController.isAvailable()).isTrue();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
index 6151ca0..c269f71 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
@@ -16,10 +16,13 @@
package com.android.settings.deviceinfo;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -27,14 +30,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ManualPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -49,18 +46,15 @@
@Test
public void isAvailable_configTurnedOff_shouldReturnFalse() {
- when(mContext.getResources().getBoolean(anyInt()))
- .thenReturn(false);
+ when(mContext.getResources().getBoolean(anyInt())).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isAvailable_configTurnedOn_shouldReturnTrue() {
- when(mContext.getResources().getBoolean(anyInt()))
- .thenReturn(true);
+ when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java
index 8b21b74..3989a60 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java
@@ -17,7 +17,6 @@
package com.android.settings.deviceinfo;
import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -35,11 +34,9 @@
import android.util.ArrayMap;
import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -59,12 +56,9 @@
import java.util.Map;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowConnectivityManager.class, ShadowUserManager.class}
-)
+@Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class})
public class MyDeviceInfoFragmentTest {
+
@Mock
private Activity mActivity;
@Mock
@@ -90,13 +84,12 @@
doReturn(mScreen).when(mSettings).getPreferenceScreen();
when(mSettings.getPreferenceScreen()).thenReturn(mScreen);
- ShadowApplication.getInstance().setSystemService(Context.TELEPHONY_SERVICE,
- mTelephonyManager);
+ ShadowApplication.getInstance()
+ .setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
}
@Test
- @Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class,
- SettingsShadowSystemProperties.class})
+ @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public void onCreate_fromSearch_shouldNotOverrideInitialExpandedCount() {
final Bundle args = new Bundle();
args.putString(EXTRA_FRAGMENT_ARG_KEY, "search_key");
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
index 0b83359..39a639b 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
@@ -18,7 +18,6 @@
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -32,7 +31,6 @@
import android.telephony.TelephonyManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -41,11 +39,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PhoneNumberPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
index 6363317..5f250dd 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,7 +28,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -39,12 +37,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PrivateVolumeOptionMenuControllerTest {
+
@Mock
private MenuItem mMigrateMenuItem;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -108,8 +105,9 @@
mController.onPrepareOptionsMenu(mMenu);
assertThat(mController.onOptionsItemSelected(mMigrateMenuItem)).isTrue();
- assertThat(ShadowApplication.getInstance()
- .getNextStartedActivity().getComponent().getClassName())
+ ShadowApplication shadowApplication = ShadowApplication.getInstance();
+ assertThat(shadowApplication).isNotNull();
+ assertThat(shadowApplication.getNextStartedActivity().getComponent().getClassName())
.isEqualTo(StorageWizardMigrateConfirm.class.getName());
}
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
index 4ea33ee..d9dd0fb 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
@@ -15,6 +15,11 @@
*/
package com.android.settings.deviceinfo;
+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.when;
+
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -23,7 +28,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -31,18 +35,11 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
-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.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RegulatoryInfoPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
index b1296e5..f2f1972 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
@@ -17,7 +17,6 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
@@ -27,35 +26,27 @@
import static org.mockito.Mockito.when;
import android.app.Activity;
-import android.os.storage.StorageManager;
import android.provider.SearchIndexableResource;
+import android.support.v7.widget.RecyclerView;
import android.util.SparseArray;
import android.view.View;
import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper;
import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.deviceinfo.PrivateStorageInfo;
import com.android.settingslib.drawer.CategoryKey;
-import android.support.v7.widget.RecyclerView;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StorageDashboardFragmentTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private StorageManager mStorageManager;
private StorageDashboardFragment mFragment;
@@ -204,9 +195,8 @@
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
- StorageDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- ShadowApplication.getInstance().getApplicationContext(),
- true /* enabled */);
+ StorageDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+ .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
index 5b34c7d..bec0f7d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
@@ -16,7 +16,6 @@
package com.android.settings.deviceinfo;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
-
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
@@ -26,17 +25,15 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StorageItemPreferenceTest {
+
private Context mContext;
private StorageItemPreference mPreference;
@@ -48,27 +45,26 @@
@Test
public void testBeforeLoad() {
- assertThat(mPreference.getSummary()).isEqualTo(
- mContext.getString(R.string.memory_calculating_size));
+ assertThat(mPreference.getSummary())
+ .isEqualTo(mContext.getString(R.string.memory_calculating_size));
}
@Test
public void testAfterLoad() {
mPreference.setStorageSize(MEGABYTE_IN_BYTES * 10, MEGABYTE_IN_BYTES * 100);
- assertThat(((String) mPreference.getSummary())).isEqualTo("0.01 GB");
+ assertThat(mPreference.getSummary()).isEqualTo("0.01 GB");
}
@Test
public void testProgressBarPercentageSet() {
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
LayoutInflater.from(mContext).inflate(R.layout.storage_item, null));
- final ProgressBar progressBar =
- (ProgressBar) holder.itemView.findViewById(android.R.id.progress);
+ final ProgressBar progressBar = holder.itemView.findViewById(android.R.id.progress);
mPreference.onBindViewHolder(holder);
mPreference.setStorageSize(MEGABYTE_IN_BYTES, MEGABYTE_IN_BYTES * 10);
+ assertThat(progressBar).isNotNull();
assertThat(progressBar.getProgress()).isEqualTo(10);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
index b0f464c..440a6f5 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
@@ -16,17 +16,15 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import android.util.SparseArray;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.StorageStatsSource;
import org.junit.Test;
@@ -34,11 +32,10 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StorageProfileFragmentTest {
+
@Captor
private ArgumentCaptor<SparseArray<StorageAsyncLoader.AppsStorageResult>> mCaptor;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
index 5e95a61..0c9f313 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
@@ -16,7 +16,6 @@
package com.android.settings.deviceinfo;
-
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
@@ -30,9 +29,8 @@
import android.text.format.Formatter;
import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
import org.junit.Before;
@@ -41,14 +39,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StorageSettingsTest {
@Mock
@@ -58,14 +54,11 @@
private List<VolumeInfo> mVolumes;
- private StorageSettings mSettings;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mVolumes = new ArrayList<>();
mVolumes.add(mock(VolumeInfo.class, RETURNS_DEEP_STUBS));
- mSettings = new StorageSettings();
when(mStorageManagerVolumeProvider.getVolumes()).thenReturn(mVolumes);
}
@@ -77,15 +70,15 @@
final VolumeInfo volumeInfo = mVolumes.get(0);
when(volumeInfo.isMountedReadable()).thenReturn(true);
when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
- when(mStorageManagerVolumeProvider.getTotalBytes(
- nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
- .thenReturn(500L);
- when(mStorageManagerVolumeProvider.getFreeBytes(
- nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
- .thenReturn(0L);
+ when(mStorageManagerVolumeProvider
+ .getTotalBytes(nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
+ .thenReturn(500L);
+ when(mStorageManagerVolumeProvider
+ .getFreeBytes(nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
+ .thenReturn(0L);
- ReflectionHelpers.setField(
- provider, "mStorageManagerVolumeProvider", mStorageManagerVolumeProvider);
+ ReflectionHelpers
+ .setField(provider, "mStorageManagerVolumeProvider", mStorageManagerVolumeProvider);
ReflectionHelpers.setField(provider, "mContext", RuntimeEnvironment.application);
provider.setListening(true);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java
index 55594c2..f50c725 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java
@@ -16,13 +16,9 @@
package com.android.settings.deviceinfo.firmwareversion;
-import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
- .BASEBAND_PROPERTY;
-import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
- .BASEBAND_VERSION_LABEL_ID;
-import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
- .BASEBAND_VERSION_VALUE_ID;
-
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_PROPERTY;
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_VALUE_ID;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.shadow.api.Shadow.extract;
@@ -31,12 +27,9 @@
import android.net.ConnectivityManager;
import android.os.SystemProperties;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -46,9 +39,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowConnectivityManager.class, SettingsShadowSystemProperties.class})
+@Config(shadows = ShadowConnectivityManager.class)
public class BasebandVersionDialogControllerTest {
@Mock
@@ -65,11 +56,6 @@
mController = new BasebandVersionDialogController(mDialog);
}
- @After
- public void teardown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void initialize_wifiOnly_shouldRemoveSettingFromDialog() {
ShadowConnectivityManager connectivityManager =
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java
index 54e7e86..2db2e6f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java
@@ -16,15 +16,12 @@
package com.android.settings.deviceinfo.firmwareversion;
-import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController
- .BUILD_NUMBER_VALUE_ID;
-
+import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController.BUILD_NUMBER_VALUE_ID;
import static org.mockito.Mockito.verify;
import android.os.Build;
import android.text.BidiFormatter;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,10 +29,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BuildNumberDialogControllerTest {
@Mock
@@ -53,7 +48,7 @@
public void initialize_shouldUpdateBuildNumberToDialog() {
mController.initialize();
- verify(mDialog).setText(BUILD_NUMBER_VALUE_ID,
- BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
+ verify(mDialog)
+ .setText(BUILD_NUMBER_VALUE_ID, BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
}
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java
index a416662..6b4da5b 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java
@@ -16,11 +16,8 @@
package com.android.settings.deviceinfo.firmwareversion;
-import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController
- .FIRMWARE_VERSION_LABEL_ID;
-import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController
- .FIRMWARE_VERSION_VALUE_ID;
-
+import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_VALUE_ID;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doNothing;
@@ -34,7 +31,6 @@
import android.os.UserManager;
import android.view.View;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -43,11 +39,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FirmwareVersionDialogControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
index b3440f4..a9451fb 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.deviceinfo.firmwareversion;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -30,7 +29,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,10 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FirmwareVersionPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
index 493cb84..f47c07e 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
@@ -16,15 +16,12 @@
package com.android.settings.deviceinfo.firmwareversion;
-import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController
- .KERNEL_VERSION_VALUE_ID;
-
+import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController.KERNEL_VERSION_VALUE_ID;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.DeviceInfoUtils;
@@ -34,10 +31,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class KernelVersionDialogControllerTest {
@Mock
@@ -58,7 +53,7 @@
public void initialize_shouldUpdateKernelVersionToDialog() {
mController.initialize();
- verify(mDialog).setText(KERNEL_VERSION_VALUE_ID,
- DeviceInfoUtils.getFormattedKernelVersion(mContext));
+ verify(mDialog)
+ .setText(KERNEL_VERSION_VALUE_ID, DeviceInfoUtils.getFormattedKernelVersion(mContext));
}
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java
index 387450b..6b26fc1 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java
@@ -16,11 +16,8 @@
package com.android.settings.deviceinfo.firmwareversion;
-import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController
- .SECURITY_PATCH_LABEL_ID;
-import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController
- .SECURITY_PATCH_VALUE_ID;
-
+import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_VALUE_ID;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -33,7 +30,6 @@
import android.os.Build;
import android.view.View;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -43,13 +39,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SecurityPatchLevelDialogControllerTest {
@Mock
@@ -93,8 +87,8 @@
@Test
public void onClick_noActivityIntent_shouldDoNothing() {
- when(mPackageManager.queryIntentActivities(any(), anyInt())).thenReturn(
- Collections.emptyList());
+ when(mPackageManager.queryIntentActivities(any(), anyInt()))
+ .thenReturn(Collections.emptyList());
mController = new SecurityPatchLevelDialogController(mDialog);
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
@@ -105,8 +99,8 @@
@Test
public void onClick_activityIntentFound_shouldStartActivity() {
- when(mPackageManager.queryIntentActivities(any(), anyInt())).thenReturn(
- Collections.singletonList(null));
+ when(mPackageManager.queryIntentActivities(any(), anyInt()))
+ .thenReturn(Collections.singletonList(null));
mController = new SecurityPatchLevelDialogController(mDialog);
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
index 03ee9f8..658a60a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
@@ -23,7 +23,6 @@
import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MEID_NUMBER_VALUE;
import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MIN_NUMBER_VALUE;
import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_PRL_VERSION_VALUE;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -36,7 +35,6 @@
import android.telephony.SubscriptionInfo;
import android.telephony.TelephonyManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -45,11 +43,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ImeiInfoDialogControllerTest {
private static final String PRL_VERSION = "some_prl_version";
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
index 610ccfd..5904046 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
@@ -18,7 +18,6 @@
import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
import static android.telephony.TelephonyManager.PHONE_TYPE_GSM;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -35,7 +34,6 @@
import android.telephony.TelephonyManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -45,11 +43,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ImeiInfoPreferenceControllerTest {
@Mock
@@ -157,8 +153,8 @@
@Test
public void handlePreferenceTreeClick_shouldStartDialogFragment() {
- when(mFragment.getChildFragmentManager()).thenReturn(
- mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
+ when(mFragment.getChildFragmentManager())
+ .thenReturn(mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
when(mPreference.getTitle()).thenReturn("SomeTitle");
mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index b10de63..1b2c36f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -16,30 +16,18 @@
package com.android.settings.deviceinfo.simstatus;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .CELLULAR_NETWORK_TYPE_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELLULAR_NETWORK_TYPE_VALUE_ID;
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.EID_INFO_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .ICCID_INFO_LABEL_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .ICCID_INFO_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .NETWORK_PROVIDER_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .OPERATOR_INFO_LABEL_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .OPERATOR_INFO_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .PHONE_NUMBER_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .ROAMING_INFO_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .SERVICE_STATE_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .SIGNAL_STRENGTH_LABEL_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
- .SIGNAL_STRENGTH_VALUE_ID;
-
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.NETWORK_PROVIDER_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.PHONE_NUMBER_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ROAMING_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SERVICE_STATE_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_VALUE_ID;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -50,6 +38,7 @@
import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
+import android.content.pm.PackageInfo;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.PhoneStateListener;
@@ -59,7 +48,6 @@
import android.telephony.TelephonyManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.EuiccManagerWrapper;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -70,11 +58,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
+import org.robolectric.Shadows;
+import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SimStatusDialogControllerTest {
@Mock
@@ -108,8 +96,7 @@
when(mDialog.getContext()).thenReturn(mContext);
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
- mController = spy(
- new SimStatusDialogController(mDialog, mLifecycle, 0 /* phone id */));
+ mController = spy(new SimStatusDialogController(mDialog, mLifecycle, 0 /* phone id */));
mEuiccManager = spy(new EuiccManagerWrapper(mContext));
doReturn(mServiceState).when(mController).getCurrentServiceState();
doReturn(0).when(mController).getDbm(any());
@@ -123,6 +110,12 @@
ReflectionHelpers.setField(mController, "mSubscriptionInfo", mSubscriptionInfo);
ReflectionHelpers.setField(mController, "mEuiccManager", mEuiccManager);
when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mPersistableBundle);
+
+ final ShadowPackageManager shadowPackageManager =
+ Shadows.shadowOf(RuntimeEnvironment.application.getPackageManager());
+ final PackageInfo sysUIPackageInfo = new PackageInfo();
+ sysUIPackageInfo.packageName = "com.android.systemui";
+ shadowPackageManager.addPackage(sysUIPackageInfo);
}
@Test
@@ -161,8 +154,7 @@
mController.initialize();
- final String inServiceText = mContext.getResources().getString(
- R.string.radioInfo_service_in);
+ final String inServiceText = mContext.getString(R.string.radioInfo_service_in);
verify(mDialog).setText(SERVICE_STATE_VALUE_ID, inServiceText);
}
@@ -170,13 +162,11 @@
public void initialize_updateDataStateWithPowerOff_shouldUpdateSettingAndResetSignalStrength() {
when(mServiceState.getState()).thenReturn(ServiceState.STATE_POWER_OFF);
when(mPersistableBundle.getBoolean(
- CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(
- true);
+ CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
mController.initialize();
- final String offServiceText = mContext.getResources().getString(
- R.string.radioInfo_service_off);
+ final String offServiceText = mContext.getString(R.string.radioInfo_service_off);
verify(mDialog).setText(SERVICE_STATE_VALUE_ID, offServiceText);
verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, "0");
}
@@ -188,13 +178,12 @@
doReturn(signalDbm).when(mController).getDbm(mSignalStrength);
doReturn(signalAsu).when(mController).getAsuLevel(mSignalStrength);
when(mPersistableBundle.getBoolean(
- CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(
- true);
+ CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
mController.initialize();
- final String signalStrengthString = mContext.getResources().getString(
- R.string.sim_signal_strength, signalDbm, signalAsu);
+ final String signalStrengthString =
+ mContext.getString(R.string.sim_signal_strength, signalDbm, signalAsu);
verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
}
@@ -215,8 +204,7 @@
mController.initialize();
- final String roamingOnString = mContext.getResources().getString(
- R.string.radioInfo_roaming_in);
+ final String roamingOnString = mContext.getString(R.string.radioInfo_roaming_in);
verify(mDialog).setText(ROAMING_INFO_VALUE_ID, roamingOnString);
}
@@ -226,16 +214,14 @@
mController.initialize();
- final String roamingOffString = mContext.getResources().getString(
- R.string.radioInfo_roaming_not);
+ final String roamingOffString = mContext.getString(R.string.radioInfo_roaming_not);
verify(mDialog).setText(ROAMING_INFO_VALUE_ID, roamingOffString);
}
@Test
public void initialize_doNotShowIccid_shouldRemoveIccidSetting() {
when(mPersistableBundle.getBoolean(
- CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL)).thenReturn(
- false);
+ CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL)).thenReturn(false);
mController.initialize();
@@ -246,8 +232,8 @@
@Test
public void initialize_doNotShowSignalStrength_shouldRemoveSignalStrengthSetting() {
when(mPersistableBundle.getBoolean(
- CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(
- false);
+ CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL))
+ .thenReturn(false);
mController.initialize();
@@ -271,8 +257,7 @@
public void initialize_showIccid_shouldSetIccidToSetting() {
final String iccid = "12351351231241";
when(mPersistableBundle.getBoolean(
- CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL)).thenReturn(
- true);
+ CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL)).thenReturn(true);
doReturn(iccid).when(mController).getSimSerialNumber(anyInt());
mController.initialize();
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
index 1419304..964ac89 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
@@ -32,7 +32,6 @@
import android.telephony.TelephonyManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -42,11 +41,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SimStatusPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
index 9c56611..79a658a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.deviceinfo.storage;
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.mock;
@@ -30,22 +29,20 @@
import android.app.FragmentTransaction;
import android.content.ContentResolver;
import android.content.Context;
+import android.os.SystemProperties;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.os.RoSystemProperties;
-import com.android.settings.TestConfig;
import com.android.settings.deletionhelper.ActivationWarningFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -53,16 +50,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {SettingsShadowSystemProperties.class}
-)
public class AutomaticStorageManagementSwitchPreferenceControllerTest {
@Mock
@@ -76,25 +66,19 @@
private Context mContext;
private AutomaticStorageManagementSwitchPreferenceController mController;
- private MetricsFeatureProvider mMetricsFeature;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application.getApplicationContext();
final FeatureFactory factory = FeatureFactory.getFactory(mContext);
- mMetricsFeature = factory.getMetricsFeatureProvider();
+ final MetricsFeatureProvider metricsFeature = factory.getMetricsFeatureProvider();
mController = new AutomaticStorageManagementSwitchPreferenceController(
- mContext, mMetricsFeature, mFragmentManager);
+ mContext, metricsFeature, mFragmentManager);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void isAvailable_shouldReturnTrue_forHighRamDevice() {
assertThat(mController.isAvailable()).isTrue();
@@ -155,7 +139,7 @@
public void togglingOnShouldTriggerWarningFragment() {
final FragmentTransaction transaction = mock(FragmentTransaction.class);
when(mFragmentManager.beginTransaction()).thenReturn(transaction);
- SettingsShadowSystemProperties.set(
+ SystemProperties.set(
AutomaticStorageManagementSwitchPreferenceController
.STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, "false");
@@ -179,8 +163,8 @@
public void togglingOnShouldNotTriggerWarningFragmentIfEnabledByDefault() {
final FragmentTransaction transaction = mock(FragmentTransaction.class);
when(mFragmentManager.beginTransaction()).thenReturn(transaction);
- SettingsShadowSystemProperties.set(
- AutomaticStorageManagementSwitchPreferenceController
+ SystemProperties.set(
+ AutomaticStorageManagementSwitchPreferenceController
.STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, "true");
mController.onSwitchToggled(true);
@@ -192,7 +176,7 @@
public void togglingOnShouldTriggerWarningFragmentIfEnabledByDefaultAndDisabledByPolicy() {
final FragmentTransaction transaction = mock(FragmentTransaction.class);
when(mFragmentManager.beginTransaction()).thenReturn(transaction);
- SettingsShadowSystemProperties.set(
+ SystemProperties.set(
AutomaticStorageManagementSwitchPreferenceController
.STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY,
"true");
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
index 68fff54..9f56388 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
@@ -32,14 +32,13 @@
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TOTAL_BYTES_KEY;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.USER_ID_KEY;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.VIDEO_APPS_SIZE_KEY;
-
+import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.SharedPreferences;
import android.util.SparseArray;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.deviceinfo.PrivateStorageInfo;
@@ -50,13 +49,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class CachedStorageValuesHelperTest {
+
private Context mContext;
@Mock private CachedStorageValuesHelper.Clock mMockClock;
@@ -66,7 +62,7 @@
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mSharedPreferences = mContext.getSharedPreferences(SHARED_PREFERENCES_NAME, 0);
mCachedValuesHelper = new CachedStorageValuesHelper(mContext, 0);
mCachedValuesHelper.mClock = mMockClock;
@@ -262,15 +258,15 @@
public void cacheResult_succeeds() throws Exception {
when(mMockClock.getCurrentTime()).thenReturn(10000L);
final StorageStatsSource.ExternalStorageStats externalStats =
- new StorageStatsSource.ExternalStorageStats(22222l, 2l, 20L, 200L, 2000L);
+ new StorageStatsSource.ExternalStorageStats(22222L, 2L, 20L, 200L, 2000L);
final StorageAsyncLoader.AppsStorageResult result =
new StorageAsyncLoader.AppsStorageResult();
result.gamesSize = 1L;
- result.musicAppsSize = 10l;
+ result.musicAppsSize = 10L;
result.videoAppsSize = 100L;
result.photosAppsSize = 1000L;
result.otherAppsSize = 10000L;
- result.cacheSize = 100000l;
+ result.cacheSize = 100000L;
result.externalStats = externalStats;
final PrivateStorageInfo info = new PrivateStorageInfo(1000L, 6000L);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
index 800097d..49f0312 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -17,9 +17,7 @@
package com.android.settings.deviceinfo.storage;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -34,7 +32,6 @@
import android.util.SparseArray;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.wrapper.UserManagerWrapper;
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -47,14 +44,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SecondaryUserControllerTest {
+
private static final String TEST_NAME = "Fred";
private static final String TARGET_PREFERENCE_GROUP_KEY = "pref_secondary_users";
@Mock
@@ -82,7 +78,7 @@
}
@Test
- public void controllerAddsSecondaryUser() throws Exception {
+ public void controllerAddsSecondaryUser() {
mPrimaryUser.name = TEST_NAME;
mController.displayPreference(mScreen);
@@ -93,7 +89,7 @@
}
@Test
- public void controllerUpdatesSummaryOfNewPreference() throws Exception {
+ public void controllerUpdatesSummaryOfNewPreference() {
mPrimaryUser.name = TEST_NAME;
mController.displayPreference(mScreen);
mController.setSize(MEGABYTE_IN_BYTES * 10);
@@ -106,7 +102,7 @@
}
@Test
- public void noSecondaryUserAddedIfNoneExist() throws Exception {
+ public void noSecondaryUserAddedIfNoneExist() {
final ArrayList<UserInfo> userInfos = new ArrayList<>();
userInfos.add(mPrimaryUser);
when(mUserManager.getPrimaryUser()).thenReturn(mPrimaryUser);
@@ -120,7 +116,7 @@
}
@Test
- public void secondaryUserAddedIfHasDistinctId() throws Exception {
+ public void secondaryUserAddedIfHasDistinctId() {
final ArrayList<UserInfo> userInfos = new ArrayList<>();
final UserInfo secondaryUser = new UserInfo();
secondaryUser.id = 10;
@@ -137,7 +133,7 @@
}
@Test
- public void profilesOfPrimaryUserAreNotIgnored() throws Exception {
+ public void profilesOfPrimaryUserAreNotIgnored() {
final ArrayList<UserInfo> userInfos = new ArrayList<>();
final UserInfo secondaryUser = new UserInfo();
secondaryUser.id = mPrimaryUser.id;
@@ -155,7 +151,7 @@
}
@Test
- public void controllerUpdatesPreferenceOnAcceptingResult() throws Exception {
+ public void controllerUpdatesPreferenceOnAcceptingResult() {
mPrimaryUser.name = TEST_NAME;
mPrimaryUser.id = 10;
mController.displayPreference(mScreen);
@@ -179,7 +175,7 @@
}
@Test
- public void dontAddPrimaryProfileAsASecondaryProfile() throws Exception {
+ public void dontAddPrimaryProfileAsASecondaryProfile() {
final ArrayList<UserInfo> userInfos = new ArrayList<>();
// The primary UserInfo may be a different object with a different name... but represent the
// same user!
@@ -198,7 +194,7 @@
}
@Test
- public void iconCallbackChangesPreferenceIcon() throws Exception {
+ public void iconCallbackChangesPreferenceIcon() {
final SparseArray<Drawable> icons = new SparseArray<>();
final UserIconDrawable drawable = mock(UserIconDrawable.class);
when(drawable.mutate()).thenReturn(drawable);
@@ -216,7 +212,7 @@
}
@Test
- public void setIcon_doesntNpeOnNullPreference() throws Exception {
+ public void setIcon_doesntNpeOnNullPreference() {
final SparseArray<Drawable> icons = new SparseArray<>();
final UserIconDrawable drawable = mock(UserIconDrawable.class);
mPrimaryUser.name = TEST_NAME;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index 2da756f..b651c8e 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -15,10 +15,8 @@
*/
package com.android.settings.deviceinfo.storage;
-
import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ID;
-import static com.android.settings.applications.manageapplications.ManageApplications
- .EXTRA_WORK_ONLY;
+import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ONLY;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.nullable;
@@ -41,14 +39,12 @@
import android.support.v7.preference.PreferenceScreen;
import android.util.SparseArray;
import android.view.LayoutInflater;
-import android.view.View;
import android.widget.LinearLayout;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
-import com.android.settings.TestConfig;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.deviceinfo.PrivateVolumeSettings;
import com.android.settings.deviceinfo.StorageItemPreference;
@@ -67,11 +63,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StorageItemPreferenceControllerTest {
+
private Context mContext;
private VolumeInfo mVolume;
@Mock
@@ -108,8 +103,7 @@
// Inflate the preference and the widget.
final LayoutInflater inflater = LayoutInflater.from(mContext);
- final View view = inflater.inflate(
- mPreference.getLayoutResource(), new LinearLayout(mContext), false);
+ inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext), false);
}
@After
@@ -119,8 +113,8 @@
@Test
public void testUpdateStateWithInitialState() {
- assertThat(mPreference.getSummary().toString()).isEqualTo(
- mContext.getString(R.string.memory_calculating_size));
+ assertThat(mPreference.getSummary().toString())
+ .isEqualTo(mContext.getString(R.string.memory_calculating_size));
}
@Test
@@ -129,8 +123,7 @@
mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
- verify(mActivity).startActivityAsUser(argumentCaptor.capture(),
- nullable(UserHandle.class));
+ verify(mActivity).startActivityAsUser(argumentCaptor.capture(), nullable(UserHandle.class));
final Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
@@ -147,17 +140,17 @@
mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
- verify(mFragment.getActivity()).startActivityAsUser(argumentCaptor.capture(),
- nullable(UserHandle.class));
+ verify(mFragment.getActivity())
+ .startActivityAsUser(argumentCaptor.capture(), nullable(UserHandle.class));
final Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
- assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
- ManageApplications.class.getName());
+ assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(ManageApplications.class.getName());
assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS).getInt(
- ManageApplications.EXTRA_STORAGE_TYPE, 0)).isEqualTo(
- ManageApplications.STORAGE_TYPE_MUSIC);
+ ManageApplications.EXTRA_STORAGE_TYPE, 0))
+ .isEqualTo(ManageApplications.STORAGE_TYPE_MUSIC);
}
@Test
@@ -180,10 +173,10 @@
final Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
- assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
- ManageApplications.class.getName());
+ assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(ManageApplications.class.getName());
assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
- .isEqualTo(R.string.apps_storage);
+ .isEqualTo(R.string.apps_storage);
}
@Test
@@ -235,8 +228,8 @@
Intent browseIntent = mVolume.buildBrowseIntent();
assertThat(intent.getAction()).isEqualTo(browseIntent.getAction());
assertThat(intent.getData()).isEqualTo(browseIntent.getData());
- verify(mMetricsFeatureProvider, times(1)).action(
- nullable(Context.class), eq(MetricsEvent.STORAGE_FILES));
+ verify(mMetricsFeatureProvider, times(1))
+ .action(nullable(Context.class), eq(MetricsEvent.STORAGE_FILES));
}
@Test
@@ -251,10 +244,10 @@
Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
- assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
- ManageApplications.class.getName());
+ assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(ManageApplications.class.getName());
assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
- .isEqualTo(R.string.game_storage_settings);
+ .isEqualTo(R.string.game_storage_settings);
}
@Test
@@ -269,10 +262,10 @@
Intent intent = argumentCaptor.getValue();
assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MAIN);
assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
- assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
- ManageApplications.class.getName());
+ assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(ManageApplications.class.getName());
assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
- .isEqualTo(R.string.storage_movies_tv);
+ .isEqualTo(R.string.storage_movies_tv);
}
@Test
@@ -280,8 +273,8 @@
mPreference.setKey("pref_system");
assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
- verify(mFragment.getFragmentManager().beginTransaction()).add(
- nullable(PrivateVolumeSettings.SystemInfoFragment.class), nullable(String.class));
+ verify(mFragment.getFragmentManager().beginTransaction())
+ .add(nullable(PrivateVolumeSettings.SystemInfoFragment.class), nullable(String.class));
}
@Test
@@ -294,24 +287,25 @@
final StorageItemPreference system = new StorageItemPreference(mContext);
final StorageItemPreference files = new StorageItemPreference(mContext);
final PreferenceScreen screen = mock(PreferenceScreen.class);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.PHOTO_KEY))).thenReturn(image);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.MOVIES_KEY))).thenReturn(movies);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.OTHER_APPS_KEY))).thenReturn(apps);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.SYSTEM_KEY))).thenReturn(system);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.FILES_KEY))).thenReturn(files);
+ when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY)))
+ .thenReturn(games);
+ when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
+ .thenReturn(audio);
+ when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
+ .thenReturn(image);
+ when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
+ .thenReturn(files);
+ when(screen.findPreference(eq(StorageItemPreferenceController.MOVIES_KEY)))
+ .thenReturn(movies);
+ when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
+ .thenReturn(system);
+ when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
+ .thenReturn(apps);
mController.displayPreference(screen);
mController.setUsedSize(MEGABYTE_IN_BYTES * 970); // There should 870MB attributed.
- final StorageAsyncLoader.AppsStorageResult result = new StorageAsyncLoader.AppsStorageResult();
+ final StorageAsyncLoader.AppsStorageResult result =
+ new StorageAsyncLoader.AppsStorageResult();
result.gamesSize = MEGABYTE_IN_BYTES * 80;
result.videoAppsSize = MEGABYTE_IN_BYTES * 160;
result.musicAppsSize = MEGABYTE_IN_BYTES * 40;
@@ -352,20 +346,20 @@
final StorageItemPreference files = spy(new StorageItemPreference(mContext));
files.setIcon(R.drawable.ic_folder_vd_theme_24);
final PreferenceScreen screen = mock(PreferenceScreen.class);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.MOVIES_KEY))).thenReturn(video);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.PHOTO_KEY))).thenReturn(image);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.OTHER_APPS_KEY))).thenReturn(apps);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.SYSTEM_KEY))).thenReturn(system);
- when(screen.findPreference(
- eq(StorageItemPreferenceController.FILES_KEY))).thenReturn(files);
+ when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY)))
+ .thenReturn(games);
+ when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
+ .thenReturn(audio);
+ when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
+ .thenReturn(image);
+ when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
+ .thenReturn(files);
+ when(screen.findPreference(eq(StorageItemPreferenceController.MOVIES_KEY)))
+ .thenReturn(video);
+ when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
+ .thenReturn(system);
+ when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
+ .thenReturn(apps);
mController.displayPreference(screen);
mController.setUserId(new UserHandle(10));
@@ -388,17 +382,18 @@
final StorageItemPreference system = new StorageItemPreference(mContext);
final StorageItemPreference files = new StorageItemPreference(mContext);
final PreferenceScreen screen = mock(PreferenceScreen.class);
+ when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY)))
+ .thenReturn(games);
when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
- .thenReturn(audio);
+ .thenReturn(audio);
when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
- .thenReturn(image);
- when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
- when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
- .thenReturn(apps);
- when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
- .thenReturn(system);
+ .thenReturn(image);
when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
- .thenReturn(files);
+ .thenReturn(files);
+ when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
+ .thenReturn(system);
+ when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
+ .thenReturn(apps);
when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
when(mVolume.isMountedReadable()).thenReturn(true);
@@ -417,17 +412,18 @@
final StorageItemPreference system = new StorageItemPreference(mContext);
final StorageItemPreference files = new StorageItemPreference(mContext);
final PreferenceScreen screen = mock(PreferenceScreen.class);
+ when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY)))
+ .thenReturn(games);
when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
- .thenReturn(audio);
+ .thenReturn(audio);
when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
- .thenReturn(image);
- when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
- when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
- .thenReturn(apps);
- when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
- .thenReturn(system);
+ .thenReturn(image);
when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
- .thenReturn(files);
+ .thenReturn(files);
+ when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
+ .thenReturn(system);
+ when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
+ .thenReturn(apps);
when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
when(mVolume.isMountedReadable()).thenReturn(false);
@@ -446,17 +442,18 @@
final StorageItemPreference system = new StorageItemPreference(mContext);
final StorageItemPreference files = new StorageItemPreference(mContext);
final PreferenceScreen screen = mock(PreferenceScreen.class);
+ when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY)))
+ .thenReturn(games);
when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
- .thenReturn(audio);
+ .thenReturn(audio);
when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
- .thenReturn(image);
- when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
- when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
- .thenReturn(apps);
- when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
- .thenReturn(system);
+ .thenReturn(image);
when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
- .thenReturn(files);
+ .thenReturn(files);
+ when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
+ .thenReturn(system);
+ when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
+ .thenReturn(apps);
when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(null);
@@ -474,17 +471,18 @@
final StorageItemPreference system = new StorageItemPreference(mContext);
final StorageItemPreference files = new StorageItemPreference(mContext);
final PreferenceScreen screen = mock(PreferenceScreen.class);
+ when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY)))
+ .thenReturn(games);
when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
- .thenReturn(audio);
+ .thenReturn(audio);
when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
- .thenReturn(image);
- when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
- when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
- .thenReturn(apps);
- when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
- .thenReturn(system);
+ .thenReturn(image);
when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
- .thenReturn(files);
+ .thenReturn(files);
+ when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
+ .thenReturn(system);
+ when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
+ .thenReturn(apps);
when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
when(mVolume.isMountedReadable()).thenReturn(true);
@@ -506,17 +504,18 @@
final StorageItemPreference system = new StorageItemPreference(mContext);
final StorageItemPreference files = new StorageItemPreference(mContext);
final PreferenceScreen screen = mock(PreferenceScreen.class);
+ when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY)))
+ .thenReturn(games);
when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
- .thenReturn(audio);
+ .thenReturn(audio);
when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
- .thenReturn(image);
- when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
- when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
- .thenReturn(apps);
- when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
- .thenReturn(system);
+ .thenReturn(image);
when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
- .thenReturn(files);
+ .thenReturn(files);
+ when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
+ .thenReturn(system);
+ when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
+ .thenReturn(apps);
// This will hide it initially.
mController.displayPreference(screen);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
index e251be0..af38b0d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
@@ -37,7 +37,6 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -55,12 +54,12 @@
import java.io.File;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class
- })
+@Config(shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowResources.SettingsShadowTheme.class
+})
public class StorageSummaryDonutPreferenceControllerTest {
+
private Context mContext;
private StorageSummaryDonutPreferenceController mController;
private StorageSummaryDonutPreference mPreference;
@@ -80,8 +79,7 @@
LayoutInflater inflater = LayoutInflater.from(mContext);
final View view =
- inflater.inflate(
- mPreference.getLayoutResource(), new LinearLayout(mContext), false);
+ inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext), false);
mHolder = PreferenceViewHolder.createInstanceForTests(view);
}
@@ -97,12 +95,12 @@
mController.updateBytes(0, 32 * GIGABYTE);
mController.updateState(mPreference);
- final Formatter.BytesResult usedSpaceResults = Formatter.formatBytes(
- mContext.getResources(), usedSpace, 0 /* flags */);
- assertThat(mPreference.getTitle().toString()).isEqualTo(
- usedSpaceResults.value + " " + usedSpaceResults.units);
- assertThat(mPreference.getSummary().toString()).isEqualTo(
- "Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
+ final Formatter.BytesResult usedSpaceResults =
+ Formatter.formatBytes(mContext.getResources(), usedSpace, 0 /* flags */);
+ assertThat(mPreference.getTitle().toString())
+ .isEqualTo(usedSpaceResults.value + " " + usedSpaceResults.units);
+ assertThat(mPreference.getSummary().toString())
+ .isEqualTo("Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
}
@Test
@@ -112,12 +110,12 @@
mController.updateBytes(KILOBYTE, totalSpace);
mController.updateState(mPreference);
- final Formatter.BytesResult usedSpaceResults = Formatter.formatBytes(
- mContext.getResources(), usedSpace, 0 /* flags */);
- assertThat(mPreference.getTitle().toString()).isEqualTo(
- usedSpaceResults.value + " " + usedSpaceResults.units);
- assertThat(mPreference.getSummary().toString()).isEqualTo(
- "Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
+ final Formatter.BytesResult usedSpaceResults =
+ Formatter.formatBytes(mContext.getResources(), usedSpace, 0 /* flags */);
+ assertThat(mPreference.getTitle().toString())
+ .isEqualTo(usedSpaceResults.value + " " + usedSpaceResults.units);
+ assertThat(mPreference.getSummary().toString())
+ .isEqualTo("Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
}
@Test
@@ -136,12 +134,12 @@
mController.updateSizes(svp, volume);
mController.updateState(mPreference);
- final Formatter.BytesResult usedSpaceResults = Formatter.formatBytes(
- mContext.getResources(), usedSpace, 0 /* flags */);
- assertThat(mPreference.getTitle().toString()).isEqualTo(
- usedSpaceResults.value + " " + usedSpaceResults.units);
- assertThat(mPreference.getSummary().toString()).isEqualTo(
- "Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
+ final Formatter.BytesResult usedSpaceResults =
+ Formatter.formatBytes(mContext.getResources(), usedSpace, 0 /* flags */);
+ assertThat(mPreference.getTitle().toString())
+ .isEqualTo(usedSpaceResults.value + " " + usedSpaceResults.units);
+ assertThat(mPreference.getSummary().toString())
+ .isEqualTo("Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
}
@Test
@@ -151,7 +149,7 @@
mPreference.onClick(button);
- verify(mMetricsFeatureProvider, times(1)).action(
- any(Context.class), eq(MetricsEvent.STORAGE_FREE_UP_SPACE_NOW));
+ verify(mMetricsFeatureProvider, times(1))
+ .action(any(Context.class), eq(MetricsEvent.STORAGE_FREE_UP_SPACE_NOW));
}
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
index 5276df9..84456ec 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
@@ -16,9 +16,8 @@
package com.android.settings.deviceinfo.storage;
-import static com.google.common.truth.Truth.assertThat;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
-
+import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -33,10 +32,9 @@
import android.util.SparseArray;
import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.SubSettings;
-import com.android.settings.TestConfig;
import com.android.settings.deviceinfo.StorageProfileFragment;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.UserManagerWrapper;
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.drawable.UserIconDrawable;
@@ -48,11 +46,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UserProfileControllerTest {
+
private static final String TEST_NAME = "Fred";
@Mock
@@ -98,8 +95,8 @@
final Intent intent = intentCaptor.getValue();
assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
- assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
- StorageProfileFragment.class.getName());
+ assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(StorageProfileFragment.class.getName());
}
@Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
index 3f9ccaf..7a19fdefa 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
@@ -6,13 +6,16 @@
import android.os.storage.VolumeInfo;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.deviceinfo.PrivateStorageInfo;
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
+import org.junit.runner.RunWith;
+@RunWith(SettingsRobolectricTestRunner.class)
public class VolumeSizesLoaderTest {
@Test
public void getVolumeSize_getsValidSizes() throws Exception {
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index db99472..d06ea2a 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -31,7 +30,6 @@
import android.support.v14.preference.SwitchPreference;
import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.TestConfig;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,26 +40,30 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowSecureSettings.class})
+@Config(shadows = ShadowSecureSettings.class)
public class AmbientDisplayAlwaysOnPreferenceControllerTest {
@Mock
- private Context mContext;
- @Mock
private AmbientDisplayConfiguration mConfig;
@Mock
private SwitchPreference mSwitchPreference;
+ private Context mContext;
+
+ private ContentResolver mContentResolver;
+
private AmbientDisplayAlwaysOnPreferenceController mController;
private boolean mCallbackInvoked;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mContentResolver = mContext.getContentResolver();
mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, mConfig,
() -> {
mCallbackInvoked = true;
@@ -69,9 +71,8 @@
}
@Test
- public void updateState_enabled() throws Exception {
- when(mConfig.alwaysOnEnabled(anyInt()))
- .thenReturn(true);
+ public void updateState_enabled() {
+ when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(true);
mController.updateState(mSwitchPreference);
@@ -79,9 +80,8 @@
}
@Test
- public void updateState_disabled() throws Exception {
- when(mConfig.alwaysOnEnabled(anyInt()))
- .thenReturn(false);
+ public void updateState_disabled() {
+ when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
mController.updateState(mSwitchPreference);
@@ -89,30 +89,30 @@
}
@Test
- public void onPreferenceChange_callback() throws Exception {
+ public void onPreferenceChange_callback() {
assertThat(mCallbackInvoked).isFalse();
mController.onPreferenceChange(mSwitchPreference, true);
assertThat(mCallbackInvoked).isTrue();
}
@Test
- public void onPreferenceChange_enable() throws Exception {
+ public void onPreferenceChange_enable() {
mController.onPreferenceChange(mSwitchPreference, true);
- assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ALWAYS_ON, -1))
- .isEqualTo(1);
+ assertThat(Settings.Secure.getInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, -1))
+ .isEqualTo(1);
}
@Test
- public void onPreferenceChange_disable() throws Exception {
+ public void onPreferenceChange_disable() {
mController.onPreferenceChange(mSwitchPreference, false);
- assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ALWAYS_ON, -1))
- .isEqualTo(0);
+ assertThat(Settings.Secure.getInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, -1))
+ .isEqualTo(0);
}
@Test
- public void isAvailable_available() throws Exception {
+ public void isAvailable_available() {
mController = spy(mController);
doReturn(true).when(mController).alwaysOnAvailableForUser(any());
@@ -120,11 +120,10 @@
}
@Test
- public void isAvailable_unavailable() throws Exception {
+ public void isAvailable_unavailable() {
mController = spy(mController);
doReturn(false).when(mController).alwaysOnAvailableForUser(any());
-
assertThat(mController.isAvailable()).isFalse();
}
@@ -132,33 +131,30 @@
public void testPreferenceController_ProperResultPayloadType() {
mController = spy(mController);
doReturn(false).when(mController).alwaysOnAvailableForUser(any());
+
assertThat(mController.getResultPayload()).isInstanceOf(InlineSwitchPayload.class);
}
@Test
- @Config(shadows = ShadowSecureSettings.class)
public void testSetValue_updatesCorrectly() {
mController = spy(mController);
doReturn(false).when(mController).alwaysOnAvailableForUser(any());
final int newValue = 1;
- final ContentResolver resolver = mContext.getContentResolver();
- Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 0 /* value */);
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, 0 /* value */);
((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
- final int updatedValue = Settings.Secure.getInt(resolver,
- Settings.Secure.DOZE_ALWAYS_ON, 1 /* default */);
+ final int updatedValue = Settings.Secure.
+ getInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, 1 /* default */);
assertThat(updatedValue).isEqualTo(newValue);
}
@Test
- @Config(shadows = ShadowSecureSettings.class)
public void testGetValue_correctValueReturned() {
mController = spy(mController);
doReturn(false).when(mController).alwaysOnAvailableForUser(any());
final int currentValue = 1;
- final ContentResolver resolver = mContext.getContentResolver();
- Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, currentValue);
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, currentValue);
final int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
index c003f17..543d535 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
@@ -31,7 +31,6 @@
import android.support.v14.preference.SwitchPreference;
import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.TestConfig;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -43,31 +42,38 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowSecureSettings.class})
+@Config(shadows = ShadowSecureSettings.class)
public class AmbientDisplayNotificationsPreferenceControllerTest {
- @Mock Context mContext;
- @Mock AmbientDisplayConfiguration mConfig;
- @Mock SwitchPreference mSwitchPreference;
- @Mock MetricsFeatureProvider mMetricsFeatureProvider;
+ @Mock
+ private AmbientDisplayConfiguration mConfig;
+ @Mock
+ private SwitchPreference mSwitchPreference;
+ @Mock
+ private MetricsFeatureProvider mMetricsFeatureProvider;
- AmbientDisplayNotificationsPreferenceController mController;
+ private Context mContext;
+
+ private ContentResolver mContentResolver;
+
+ private AmbientDisplayNotificationsPreferenceController mController;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mContentResolver = mContext.getContentResolver();
mController = new AmbientDisplayNotificationsPreferenceController(mContext, mConfig,
mMetricsFeatureProvider);
}
@Test
- public void updateState_enabled() throws Exception {
- when(mConfig.pulseOnNotificationEnabled(anyInt()))
- .thenReturn(true);
+ public void updateState_enabled() {
+ when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(true);
mController.updateState(mSwitchPreference);
@@ -75,9 +81,8 @@
}
@Test
- public void updateState_disabled() throws Exception {
- when(mConfig.pulseOnNotificationEnabled(anyInt()))
- .thenReturn(false);
+ public void updateState_disabled() {
+ when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
mController.updateState(mSwitchPreference);
@@ -85,39 +90,37 @@
}
@Test
- public void onPreferenceChange_enable() throws Exception {
+ public void onPreferenceChange_enable() {
mController.onPreferenceChange(mSwitchPreference, true);
- assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ENABLED, -1))
- .isEqualTo(1);
+ assertThat(Settings.Secure.getInt(mContentResolver, Settings.Secure.DOZE_ENABLED, -1))
+ .isEqualTo(1);
}
@Test
- public void onPreferenceChange_disable() throws Exception {
+ public void onPreferenceChange_disable() {
mController.onPreferenceChange(mSwitchPreference, false);
- assertThat(Settings.Secure.getInt(null, Settings.Secure.DOZE_ENABLED, -1))
- .isEqualTo(0);
+ assertThat(Settings.Secure.getInt(mContentResolver, Settings.Secure.DOZE_ENABLED, -1))
+ .isEqualTo(0);
}
@Test
- public void isAvailable_available() throws Exception {
- when(mConfig.pulseOnNotificationAvailable())
- .thenReturn(true);
+ public void isAvailable_available() {
+ when(mConfig.pulseOnNotificationAvailable()).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
- public void isAvailable_unavailable() throws Exception {
- when(mConfig.pulseOnNotificationAvailable())
- .thenReturn(false);
+ public void isAvailable_unavailable() {
+ when(mConfig.pulseOnNotificationAvailable()).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
- public void handlePreferenceTreeClick_reportsEventForItsPreference() throws Exception {
+ public void handlePreferenceTreeClick_reportsEventForItsPreference() {
when(mSwitchPreference.getKey()).thenReturn(
AmbientDisplayNotificationsPreferenceController.KEY_AMBIENT_DISPLAY_NOTIFICATIONS);
@@ -127,7 +130,7 @@
}
@Test
- public void handlePreferenceTreeClick_doesntReportEventForOtherPreferences() throws Exception {
+ public void handlePreferenceTreeClick_doesntReportEventForOtherPreferences() {
when(mSwitchPreference.getKey()).thenReturn("some_other_key");
mController.handlePreferenceTreeClick(mSwitchPreference);
@@ -141,24 +144,21 @@
}
@Test
- @Config(shadows = ShadowSecureSettings.class)
public void testSetValue_updatesCorrectly() {
int newValue = 1;
- ContentResolver resolver = mContext.getContentResolver();
- Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ENABLED, 0);
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.DOZE_ENABLED, 0);
((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
- int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.DOZE_ENABLED, 1);
+ int updatedValue =
+ Settings.Secure.getInt(mContentResolver, Settings.Secure.DOZE_ENABLED, 1);
assertThat(updatedValue).isEqualTo(newValue);
}
@Test
- @Config(shadows = ShadowSecureSettings.class)
public void testGetValue_correctValueReturned() {
int currentValue = 1;
- ContentResolver resolver = mContext.getContentResolver();
- Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ENABLED, currentValue);
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.DOZE_ENABLED, currentValue);
int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
index 2933517..e9e497a 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,7 +27,6 @@
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.Before;
@@ -39,36 +37,38 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowSecureSettings.class})
+@Config(shadows = ShadowSecureSettings.class)
public class AmbientDisplayPreferenceControllerTest {
- @Mock Context mContext;
- @Mock AmbientDisplayConfiguration mConfig;
- @Mock Preference mPreference;
+ @Mock
+ private Context mContext;
+ @Mock
+ private AmbientDisplayConfiguration mConfig;
+ @Mock
+ private Preference mPreference;
- AmbientDisplayPreferenceController mController;
+ private AmbientDisplayPreferenceController mController;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
mController = new AmbientDisplayPreferenceController(mContext, mConfig, "key");
}
@Test
- public void isAvailable_available() throws Exception {
+ public void isAvailable_available() {
when(mConfig.available()).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
- public void isAvailable_unavailable() throws Exception {
+ public void isAvailable_unavailable() {
when(mConfig.available()).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
- public void updateState_alwaysOn() throws Exception {
+ public void updateState_alwaysOn() {
when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(true);
mController.updateState(mPreference);
@@ -77,7 +77,7 @@
}
@Test
- public void updateState_notifications() throws Exception {
+ public void updateState_notifications() {
when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(true);
@@ -87,7 +87,7 @@
}
@Test
- public void updateState_gestures() throws Exception {
+ public void updateState_gestures() {
when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
when(mConfig.enabled(anyInt())).thenReturn(true);
@@ -98,7 +98,7 @@
}
@Test
- public void updateState_off() throws Exception {
+ public void updateState_off() {
when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
when(mConfig.pulseOnDoubleTapEnabled(anyInt())).thenReturn(false);
@@ -110,8 +110,7 @@
}
@Test
- public void getPreferenceKey() throws Exception {
+ public void getPreferenceKey() {
assertThat(mController.getPreferenceKey()).isEqualTo("key");
}
-
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
index f7ed825..ac3435d 100644
--- a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
+++ b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
@@ -17,7 +17,6 @@
package com.android.settings.display;
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;
@@ -30,7 +29,6 @@
import android.graphics.drawable.Drawable;
import android.util.IconDrawableFactory;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -39,10 +37,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppGridViewTest {
@Mock
@@ -70,10 +66,10 @@
@Test
public void appEntry_shouldLoadIcon() {
- when(mPackageManager.loadUnbadgedItemIcon(mActivityInfo, mApplicationInfo)).thenReturn(
- mIcon);
- final AppGridView.ActivityEntry activityEntry = new AppGridView.ActivityEntry(
- mInfo, "label", mIconFactory);
+ when(mPackageManager.loadUnbadgedItemIcon(mActivityInfo, mApplicationInfo))
+ .thenReturn(mIcon);
+ final AppGridView.ActivityEntry activityEntry =
+ new AppGridView.ActivityEntry(mInfo, "label", mIconFactory);
assertThat(activityEntry.label).isEqualTo("label");
assertThat(activityEntry.getIcon()).isNotNull();
@@ -81,12 +77,12 @@
@Test
public void appEntry_compare_shouldCompareIgnoreCase() {
- final AppGridView.ActivityEntry entry1 = new AppGridView.ActivityEntry(
- mInfo, "label", mIconFactory);
- final AppGridView.ActivityEntry entry2 = new AppGridView.ActivityEntry(
- mInfo, "LABEL", mIconFactory);
- final AppGridView.ActivityEntry entry3 = new AppGridView.ActivityEntry(
- mInfo, "label2", mIconFactory);
+ final AppGridView.ActivityEntry entry1 =
+ new AppGridView.ActivityEntry(mInfo, "label", mIconFactory);
+ final AppGridView.ActivityEntry entry2 =
+ new AppGridView.ActivityEntry(mInfo, "LABEL", mIconFactory);
+ final AppGridView.ActivityEntry entry3 =
+ new AppGridView.ActivityEntry(mInfo, "label2", mIconFactory);
assertThat(entry1.compareTo(entry2)).isEqualTo(0);
assertThat(entry1.compareTo(entry3)).isNotEqualTo(0);
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
index 36f754b..5bd7711 100644
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
@@ -19,36 +19,35 @@
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
-
import static com.google.common.truth.Truth.assertThat;
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AutoBrightnessPreferenceControllerTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+
+ private static final String PREFERENCE_KEY = "auto_brightness";
+
private Context mContext;
private AutoBrightnessPreferenceController mController;
- private final String PREFERENCE_KEY = "auto_brightness";
+ private ContentResolver mContentResolver;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mContentResolver = mContext.getContentResolver();
mController = new AutoBrightnessPreferenceController(mContext, PREFERENCE_KEY);
}
@@ -56,8 +55,8 @@
public void testOnPreferenceChange_TurnOnAuto_ReturnAuto() {
mController.onPreferenceChange(null, true);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
- SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_MANUAL);
+ final int mode = Settings.System.getInt(mContentResolver, SCREEN_BRIGHTNESS_MODE,
+ SCREEN_BRIGHTNESS_MODE_MANUAL);
assertThat(mode).isEqualTo(SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
}
@@ -65,19 +64,19 @@
public void testOnPreferenceChange_TurnOffAuto_ReturnManual() {
mController.onPreferenceChange(null, false);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
- SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
+ final int mode = Settings.System.getInt(mContentResolver, SCREEN_BRIGHTNESS_MODE,
+ SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
assertThat(mode).isEqualTo(SCREEN_BRIGHTNESS_MODE_MANUAL);
}
@Test
public void testSetValue_updatesCorrectly() {
boolean newValue = true;
- ContentResolver resolver = mContext.getContentResolver();
- Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_MANUAL);
+ Settings.System.putInt(mContentResolver, SCREEN_BRIGHTNESS_MODE,
+ SCREEN_BRIGHTNESS_MODE_MANUAL);
mController.setChecked(newValue);
- boolean updatedValue = Settings.System.getInt(resolver, SCREEN_BRIGHTNESS_MODE, -1)
+ boolean updatedValue = Settings.System.getInt(mContentResolver, SCREEN_BRIGHTNESS_MODE, -1)
!= SCREEN_BRIGHTNESS_MODE_MANUAL;
assertThat(updatedValue).isEqualTo(newValue);
@@ -85,8 +84,8 @@
@Test
public void testGetValue_correctValueReturned() {
- ContentResolver resolver = mContext.getContentResolver();
- Settings.System.putInt(resolver, SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
+ Settings.System.putInt(mContentResolver, SCREEN_BRIGHTNESS_MODE,
+ SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
int newValue = mController.isChecked() ?
SCREEN_BRIGHTNESS_MODE_AUTOMATIC
diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
index affb40b..4795826 100644
--- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
@@ -29,7 +29,6 @@
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSystemSettings;
@@ -46,11 +45,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = ShadowSystemSettings.class
-)
+@Config(shadows = ShadowSystemSettings.class)
public class AutoRotatePreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
index 73c5374..673abb0 100644
--- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
@@ -21,24 +21,23 @@
import android.content.Context;
import android.provider.Settings;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryPercentagePreferenceControllerTest {
- @Mock private Context mContext;
+
+ private Context mContext;
private BatteryPercentagePreferenceController mController;
@Before
public void setup() {
- MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
mController = new BatteryPercentagePreferenceController(mContext);
}
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
index f1cf79e..a91d2d8 100644
--- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.reset;
@@ -31,7 +30,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.PowerManagerWrapper;
@@ -41,17 +39,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowContentResolver;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BrightnessLevelPreferenceControllerTest {
- @Mock
- private Context mContext;
- @Mock
- private ContentResolver mContentResolver;
+
@Mock
private PowerManagerWrapper mPowerManager;
@Mock
@@ -59,12 +52,17 @@
@Mock
private Preference mPreference;
+ private Context mContext;
+
+ private ContentResolver mContentResolver;
+
private BrightnessLevelPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- when(mContext.getContentResolver()).thenReturn(mContentResolver);
+ mContext = RuntimeEnvironment.application;
+ mContentResolver = mContext.getContentResolver();
when(mPowerManager.getMinimumScreenBrightnessSetting()).thenReturn(0);
when(mPowerManager.getMaximumScreenBrightnessSetting()).thenReturn(100);
when(mPowerManager.getMinimumScreenBrightnessForVrSetting()).thenReturn(0);
@@ -72,7 +70,6 @@
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
mController = spy(new BrightnessLevelPreferenceController(mContext, null, mPowerManager));
doReturn(false).when(mController).isInVrMode();
-
}
@Test
@@ -82,10 +79,9 @@
@Test
public void onStart_shouldRegisterObserver() {
- Context context = RuntimeEnvironment.application;
BrightnessLevelPreferenceController controller =
- new BrightnessLevelPreferenceController(context, null, mPowerManager);
- ShadowContentResolver shadowContentResolver = Shadow.extract(context.getContentResolver());
+ new BrightnessLevelPreferenceController(mContext, null, mPowerManager);
+ ShadowContentResolver shadowContentResolver = Shadow.extract(mContentResolver);
controller.onStart();
@@ -99,10 +95,9 @@
@Test
public void onStop_shouldUnregisterObserver() {
- Context context = RuntimeEnvironment.application;
BrightnessLevelPreferenceController controller =
- new BrightnessLevelPreferenceController(context, null, mPowerManager);
- ShadowContentResolver shadowContentResolver = Shadow.extract(context.getContentResolver());
+ new BrightnessLevelPreferenceController(mContext, null, mPowerManager);
+ ShadowContentResolver shadowContentResolver = Shadow.extract(mContext.getContentResolver());
controller.displayPreference(mScreen);
controller.onStart();
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
index 567b200..7600627 100644
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
@@ -17,8 +17,8 @@
package com.android.settings.display;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -26,7 +26,6 @@
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,10 +34,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ColorModePreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
index 1ed691b..4352e1c 100644
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
@@ -16,7 +16,6 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.spy;
@@ -30,12 +29,9 @@
import com.android.internal.app.ColorDisplayController;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.applications.LayoutPreference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
+import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
import org.junit.Before;
@@ -46,13 +42,11 @@
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ColorModePreferenceFragmentTest {
private ColorModePreferenceFragment mFragment;
@@ -63,7 +57,6 @@
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- SettingsShadowSystemProperties.clear();
mFragment = spy(new ColorModePreferenceFragment());
ReflectionHelpers.setField(mFragment, "mController", mController);
@@ -89,51 +82,45 @@
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void getKey_natural() {
- Mockito.when(mController.getColorMode()).thenReturn(
- ColorDisplayController.COLOR_MODE_NATURAL);
+ Mockito.when(mController.getColorMode())
+ .thenReturn(ColorDisplayController.COLOR_MODE_NATURAL);
assertThat(mFragment.getDefaultKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void getKey_boosted() {
- Mockito.when(mController.getColorMode()).thenReturn(
- ColorDisplayController.COLOR_MODE_BOOSTED);
+ Mockito.when(mController.getColorMode())
+ .thenReturn(ColorDisplayController.COLOR_MODE_BOOSTED);
assertThat(mFragment.getDefaultKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void getKey_saturated() {
- Mockito.when(mController.getColorMode()).thenReturn(
- ColorDisplayController.COLOR_MODE_SATURATED);
+ Mockito.when(mController.getColorMode())
+ .thenReturn(ColorDisplayController.COLOR_MODE_SATURATED);
assertThat(mFragment.getDefaultKey())
.isEqualTo(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void setKey_natural() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_NATURAL);
verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_NATURAL);
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void setKey_boosted() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_BOOSTED);
verify(mController).setColorMode(ColorDisplayController.COLOR_MODE_BOOSTED);
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void setKey_saturated() {
mFragment.setDefaultKey(ColorModePreferenceFragment.KEY_COLOR_MODE_SATURATED);
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java
index 62f2c67..8df4a31 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java
@@ -17,38 +17,26 @@
import static com.google.common.truth.Truth.assertThat;
-import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NightDisplaySettingsTest {
- private Context mContext;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- }
-
@Test
public void testNightDisplayIndexing_containsResource() {
List<SearchIndexableResource> resources =
- NightDisplaySettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext,
- true /* enabled */);
+ NightDisplaySettings.SEARCH_INDEX_DATA_PROVIDER
+ .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */);
List<Integer> indexedXml = new ArrayList<>();
for (SearchIndexableResource resource : resources) {
diff --git a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java
index 23b43d6..ead9c6f 100644
--- a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java
@@ -16,13 +16,15 @@
package com.android.settings.display;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -30,13 +32,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ShowOperatorNamePreferenceControllerTest {
private static final String KEY_SHOW_OPERATOR_NAME = "show_operator_name";
@@ -57,15 +54,15 @@
@Test
public void testIsAvailable_configIsTrue_ReturnTrue() {
- when(mContext.getResources().getBoolean(R.bool.config_showOperatorNameInStatusBar))
- .thenReturn(true);
+ when(mContext.getResources()
+ .getBoolean(R.bool.config_showOperatorNameInStatusBar)).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void testIsAvailable_configIsFalse_ReturnFalse() {
- when(mContext.getResources().getBoolean(R.bool.config_showOperatorNameInStatusBar))
- .thenReturn(false);
+ when(mContext.getResources()
+ .getBoolean(R.bool.config_showOperatorNameInStatusBar)).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@@ -73,8 +70,8 @@
public void testOnPreferenceChange_TurnOn_ReturnOn() {
mController.onPreferenceChange(mPreference, true);
- final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
- KEY_SHOW_OPERATOR_NAME, 0);
+ final int mode =
+ Settings.Secure.getInt(mContext.getContentResolver(), KEY_SHOW_OPERATOR_NAME, 0);
assertThat(mode).isEqualTo(1);
}
@@ -82,8 +79,8 @@
public void testOnPreferenceChange_TurnOff_ReturnOff() {
mController.onPreferenceChange(mPreference, false);
- final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
- KEY_SHOW_OPERATOR_NAME, 1);
+ final int mode =
+ Settings.Secure.getInt(mContext.getContentResolver(), KEY_SHOW_OPERATOR_NAME, 1);
assertThat(mode).isEqualTo(0);
}
}
diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
index c8f648f..6a059b3 100644
--- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -32,7 +32,6 @@
import android.support.v7.preference.ListPreference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.OverlayManagerWrapper;
@@ -44,10 +43,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ThemePreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -70,8 +67,8 @@
when(mContext.getString(R.string.default_theme))
.thenReturn(RuntimeEnvironment.application.getString(R.string.default_theme));
- mController = spy(new ThemePreferenceController(mContext,
- mock(OverlayManagerWrapper.class)));
+ mController =
+ spy(new ThemePreferenceController(mContext, mock(OverlayManagerWrapper.class)));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
index d4af8b8..0362b5b 100644
--- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
@@ -17,12 +17,9 @@
package com.android.settings.display;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
import static com.google.common.truth.Truth.assertThat;
-
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -34,7 +31,6 @@
import android.os.UserManager;
import android.provider.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.TimeoutListPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManagerWrapper;
@@ -54,10 +50,12 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowDevicePolicyManagerWrapper.class})
+@Config(shadows = ShadowDevicePolicyManagerWrapper.class)
public class TimeoutPreferenceControllerTest {
+
private static final int TIMEOUT = 30;
+ private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
+
private Context mContext;
@Mock
private TimeoutListPreference mPreference;
@@ -65,7 +63,6 @@
private UserManager mUserManager;
private TimeoutPreferenceController mController;
- private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
@Before
public void setUp() {
@@ -126,8 +123,8 @@
ArgumentCaptor<Long> longCaptor = ArgumentCaptor.forClass(Long.class);
ArgumentCaptor<EnforcedAdmin> adminCaptor = ArgumentCaptor.forClass(EnforcedAdmin.class);
- verify(mPreference, times(2)).removeUnusableTimeouts(
- longCaptor.capture(), adminCaptor.capture());
+ verify(mPreference, times(2))
+ .removeUnusableTimeouts(longCaptor.capture(), adminCaptor.capture());
assertEquals(0, (long)longCaptor.getValue());
assertTrue(adminCaptor.getValue() != null);
}
diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
index 191a8fb..963bb14 100644
--- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
+++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
@@ -26,7 +26,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.Before;
@@ -39,7 +38,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VrDisplayPreferencePickerTest {
private VrDisplayPreferencePicker mPicker;
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
index 1419ad5..89ca00a 100644
--- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -29,7 +28,6 @@
import android.content.pm.ResolveInfo;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,13 +35,11 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WallpaperPreferenceControllerTest {
private static final String WALLPAPER_PACKAGE = "TestPkg";
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
index 68a5dc4..103cb53 100644
--- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
@@ -26,7 +26,6 @@
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.dream.DreamBackend;
@@ -38,15 +37,13 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class CurrentDreamPickerTest {
+
private static String COMPONENT_KEY = "mocked_component_name_string";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -85,7 +82,7 @@
mockInfo.componentName = mockName;
when(mockName.flattenToString()).thenReturn(COMPONENT_KEY);
- when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mockInfo)));
+ when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mockInfo));
mPicker.setDefaultKey(COMPONENT_KEY);
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
index e3493a1..4419940 100644
--- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
@@ -16,15 +16,19 @@
package com.android.settings.dream;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.ComponentName;
import android.content.Context;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.widget.GearPreference;
import com.android.settingslib.dream.DreamBackend;
import com.android.settingslib.dream.DreamBackend.DreamInfo;
-import java.util.ArrayList;
-import java.util.Arrays;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,18 +36,13 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class CurrentDreamPreferenceControllerTest {
- private static String TAG = "CurrentDreamPreferenceControllerTest";
private CurrentDreamPreferenceController mController;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -70,7 +69,7 @@
@Test
public void isEnabledIfDreamsAvailable() {
- when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
+ when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mDreamInfo));
assertThat(mController.isAvailable()).isTrue();
}
@@ -80,7 +79,7 @@
mDreamInfo.settingsComponentName = mock(ComponentName.class);
mDreamInfo.isActive = true;
- when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
+ when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mDreamInfo));
GearPreference mockPref = mock(GearPreference.class);
ArgumentCaptor<GearPreference.OnGearClickListener> captor =
@@ -97,7 +96,7 @@
mDreamInfo.settingsComponentName = null;
mDreamInfo.isActive = true;
- when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(Arrays.asList(mDreamInfo)));
+ when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mDreamInfo));
GearPreference mockPref = mock(GearPreference.class);
ArgumentCaptor<GearPreference.OnGearClickListener> captor =
diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
index 73526e5..07f4a9d 100644
--- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
@@ -16,25 +16,26 @@
package com.android.settings.dream;
-import android.content.Context;
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settingslib.dream.DreamBackend;
-import com.android.settingslib.dream.DreamBackend.WhenToDream;
-import java.util.Arrays;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.dream.DreamBackend;
+import com.android.settingslib.dream.DreamBackend.WhenToDream;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.List;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DreamSettingsTest {
+
private static final List<String> KEYS = Arrays.asList(
DreamSettings.WHILE_CHARGING_ONLY,
DreamSettings.WHILE_DOCKED_ONLY,
@@ -59,8 +60,7 @@
@Test
public void getSettingFromPrefKey() {
for (int i = 0; i < KEYS.size(); i++) {
- assertThat(DreamSettings.getSettingFromPrefKey(KEYS.get(i)))
- .isEqualTo(SETTINGS[i]);
+ assertThat(DreamSettings.getSettingFromPrefKey(KEYS.get(i))).isEqualTo(SETTINGS[i]);
}
// Default case
assertThat(DreamSettings.getSettingFromPrefKey("garbage value"))
@@ -70,8 +70,7 @@
@Test
public void getKeyFromSetting() {
for (int i = 0; i < SETTINGS.length; i++) {
- assertThat(DreamSettings.getKeyFromSetting(SETTINGS[i]))
- .isEqualTo(KEYS.get(i));
+ assertThat(DreamSettings.getKeyFromSetting(SETTINGS[i])).isEqualTo(KEYS.get(i));
}
// Default
assertThat(DreamSettings.getKeyFromSetting(-1))
diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
index 444591a..ebf6b8b 100644
--- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
@@ -16,15 +16,20 @@
package com.android.settings.dream;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.support.v7.preference.PreferenceScreen;
import android.view.View.OnClickListener;
import android.widget.Button;
+
import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.dream.DreamBackend;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,16 +37,11 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StartNowPreferenceControllerTest {
+
private StartNowPreferenceController mController;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@@ -54,7 +54,6 @@
@Mock
private DreamBackend mBackend;
-
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
index 51a486f..cf7c659 100644
--- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
@@ -24,7 +24,6 @@
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.dream.DreamBackend;
@@ -35,12 +34,11 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WhenToDreamPickerTest {
+
private WhenToDreamPicker mPicker;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private DreamBackend mBackend;
@@ -82,28 +80,28 @@
@Test
public void setDreamWhileCharging() {
- String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_CHARGING);
+ final String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_CHARGING);
mPicker.setDefaultKey(key);
verify(mBackend).setWhenToDream(DreamBackend.WHILE_CHARGING);
}
@Test
public void setDreamWhileDocked() {
- String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_DOCKED);
+ final String key = DreamSettings.getKeyFromSetting(DreamBackend.WHILE_DOCKED);
mPicker.setDefaultKey(key);
verify(mBackend).setWhenToDream(DreamBackend.WHILE_DOCKED);
}
@Test
public void setDreamWhileChargingOrDocked() {
- String key = DreamSettings.getKeyFromSetting(DreamBackend.EITHER);
+ final String key = DreamSettings.getKeyFromSetting(DreamBackend.EITHER);
mPicker.setDefaultKey(key);
verify(mBackend).setWhenToDream(DreamBackend.EITHER);
}
@Test
public void setDreamNever() {
- String key = DreamSettings.getKeyFromSetting(DreamBackend.NEVER);
+ final String key = DreamSettings.getKeyFromSetting(DreamBackend.NEVER);
mPicker.setDefaultKey(key);
verify(mBackend).setWhenToDream(DreamBackend.NEVER);
}
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
index 2acf82b..9c7008e 100644
--- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
@@ -16,36 +16,34 @@
package com.android.settings.dream;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.support.v7.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.dream.DreamBackend;
import com.android.settingslib.dream.DreamBackend.WhenToDream;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WhenToDreamPreferenceControllerTest {
+
private WhenToDreamPreferenceController mController;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
private DreamBackend mBackend;
-
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
index 111e503..26bc7878 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java
@@ -16,24 +16,18 @@
package com.android.settings.enterprise;
+import static com.google.common.truth.Truth.assertThat;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
import java.util.Date;
-import static com.google.common.truth.Truth.assertThat;
-
-/**
- * Tests for {@link AdminActionPreferenceControllerBase}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AdminActionPreferenceControllerBaseTest extends
- AdminActionPreferenceControllerTestBase {
+public class AdminActionPreferenceControllerBaseTest
+ extends AdminActionPreferenceControllerTestBase {
private Date mDate;
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
index 1154aa7..82ec40e 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java
@@ -19,18 +19,12 @@
import android.Manifest;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link AdminGrantedCameraPermissionPreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AdminGrantedCameraPermissionPreferenceControllerTest extends
- AdminGrantedPermissionsPreferenceControllerTestBase {
+public class AdminGrantedCameraPermissionPreferenceControllerTest
+ extends AdminGrantedPermissionsPreferenceControllerTestBase {
public AdminGrantedCameraPermissionPreferenceControllerTest() {
super("enterprise_privacy_number_camera_access_packages",
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
index 1c30da1..8f30e92 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java
@@ -18,19 +18,13 @@
import android.Manifest;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link AdminGrantedLocationPermissionsPreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AdminGrantedLocationPermissionsPreferenceControllerTest extends
- AdminGrantedPermissionsPreferenceControllerTestBase {
+public class AdminGrantedLocationPermissionsPreferenceControllerTest
+ extends AdminGrantedPermissionsPreferenceControllerTestBase {
public AdminGrantedLocationPermissionsPreferenceControllerTest() {
super("enterprise_privacy_number_location_access_packages",
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
index 624022b..1acbfdc 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java
@@ -18,19 +18,13 @@
import android.Manifest;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link AdminGrantedMicrophonePermissionPreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AdminGrantedMicrophonePermissionPreferenceControllerTest extends
- AdminGrantedPermissionsPreferenceControllerTestBase {
+public class AdminGrantedMicrophonePermissionPreferenceControllerTest
+ extends AdminGrantedPermissionsPreferenceControllerTestBase {
public AdminGrantedMicrophonePermissionPreferenceControllerTest() {
super("enterprise_privacy_number_microphone_access_packages",
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
index a5d1d1a..854ccc8 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java
@@ -16,19 +16,13 @@
package com.android.settings.enterprise;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link AdminGrantedPermissionsPreferenceControllerBase}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AdminGrantedPermissionsPreferenceControllerBaseTest extends
- AdminGrantedPermissionsPreferenceControllerTestBase {
+public class AdminGrantedPermissionsPreferenceControllerBaseTest
+ extends AdminGrantedPermissionsPreferenceControllerTestBase {
public AdminGrantedPermissionsPreferenceControllerBaseTest() {
super("some.key", new String[] {"some.permission"});
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index 03dc9f1..c04c870 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -41,8 +41,9 @@
* Common base for testing subclasses of {@link AdminGrantedPermissionsPreferenceControllerBase}.
*/
public abstract class AdminGrantedPermissionsPreferenceControllerTestBase {
- protected final String mKey;
- protected final String[] mPermissions;
+
+ private final String mKey;
+ final String[] mPermissions;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
protected Context mContext;
@@ -50,7 +51,7 @@
protected AdminGrantedPermissionsPreferenceControllerBase mController;
- public AdminGrantedPermissionsPreferenceControllerTestBase(String key, String[] permissions) {
+ AdminGrantedPermissionsPreferenceControllerTestBase(String key, String[] permissions) {
mKey = key;
mPermissions = permissions;
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
index 73e0fca..a20da9d 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
@@ -23,7 +23,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,13 +32,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link AlwaysOnVpnCurrentUserPreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class AlwaysOnVpnCurrentUserPreferenceControllerTest {
private static final String VPN_SET_DEVICE = "VPN set";
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
index 6b59f8f..5455e85 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
@@ -22,7 +22,6 @@
import android.content.Context;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,14 +31,9 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link AlwaysOnVpnManagedProfilePreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class AlwaysOnVpnManagedProfilePreferenceControllerTest {
+public class AlwaysOnVpnManagedProfilePreferenceControllerTest {
private static final String KEY_ALWAYS_ON_VPN_MANAGED_PROFILE = "always_on_vpn_managed_profile";
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
index 7d1aecd..efb4bc7 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
@@ -28,7 +28,6 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.UserAppInfo;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,15 +38,14 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ApplicationListFragmentTest {
+
private static final int USER_ID = 0;
private static final int USER_APP_UID = 0;
@@ -64,7 +62,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = ShadowApplication.getInstance().getApplicationContext();
+ mContext = RuntimeEnvironment.application;
when(mPreferenceManager.getContext()).thenReturn(mContext);
mFragment = new ApplicationListFragmentTestable(mPreferenceManager, mScreen);
@@ -72,25 +70,22 @@
@Test
public void getLogTag() {
- assertThat(mFragment.getLogTag())
- .isEqualTo("EnterprisePrivacySettings");
+ assertThat(mFragment.getLogTag()).isEqualTo("EnterprisePrivacySettings");
}
@Test
public void getScreenResource() {
assertThat(mFragment.getPreferenceScreenResId())
- .isEqualTo(R.xml.app_list_disclosure_settings);
+ .isEqualTo(R.xml.app_list_disclosure_settings);
}
@Test
public void getPreferenceControllers() {
- final List<AbstractPreferenceController> controllers = mFragment.createPreferenceControllers(
- mContext);
+ final List<AbstractPreferenceController> controllers =
+ mFragment.createPreferenceControllers(mContext);
assertThat(controllers).isNotNull();
assertThat(controllers.size()).isEqualTo(1);
- int position = 0;
- assertThat(controllers.get(position++)).isInstanceOf(
- ApplicationListPreferenceController.class);
+ assertThat(controllers.get(0)).isInstanceOf(ApplicationListPreferenceController.class);
}
@Test
@@ -110,7 +105,7 @@
private final PreferenceManager mPreferenceManager;
private final PreferenceScreen mPreferenceScreen;
- public ApplicationListFragmentTestable(PreferenceManager preferenceManager,
+ private ApplicationListFragmentTestable(PreferenceManager preferenceManager,
PreferenceScreen screen) {
this.mPreferenceManager = preferenceManager;
this.mPreferenceScreen = screen;
@@ -119,8 +114,8 @@
@Override
public void buildApplicationList(Context context,
ApplicationFeatureProvider.ListOfAppsCallback callback) {
- final List<UserAppInfo> apps = new ArrayList<>();
final UserInfo user = new UserInfo(USER_ID, "main", UserInfo.FLAG_ADMIN);
+ final List<UserAppInfo> apps = new ArrayList<>();
apps.add(new UserAppInfo(user, buildInfo(USER_APP_UID, APP, 0, 0)));
callback.onListOfAppsResult(apps);
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
index 04ef467..9b95f12 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
@@ -17,9 +17,7 @@
package com.android.settings.enterprise;
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -38,7 +36,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.TestConfig;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.UserAppInfo;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -49,8 +46,7 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.ArrayList;
import java.util.Arrays;
@@ -59,7 +55,6 @@
import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ApplicationListPreferenceControllerTest {
private static final int MAIN_USER_ID = 0;
@@ -88,8 +83,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- final ShadowApplication shadowContext = ShadowApplication.getInstance();
- mContext = spy(shadowContext.getApplicationContext());
+ mContext = spy(RuntimeEnvironment.application);
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
index 0b97353..a3eeb71 100644
--- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
@@ -16,25 +16,19 @@
package com.android.settings.enterprise;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.Date;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
-/**
- * Tests for {@link BugReportsPreferenceController}.
- */
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Date;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class BugReportsPreferenceControllerTest extends
- AdminActionPreferenceControllerTestBase {
+public class BugReportsPreferenceControllerTest
+ extends AdminActionPreferenceControllerTestBase {
@Override
public void setUp() {
@@ -45,7 +39,7 @@
@Override
public void setDate(Date date) {
when(mFeatureFactory.enterprisePrivacyFeatureProvider.getLastBugReportRequestTime())
- .thenReturn(date);
+ .thenReturn(date);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
index 5ee1145..ff1a963 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
@@ -17,27 +17,20 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.when;
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link CaCertsCurrentUserPreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class CaCertsCurrentUserPreferenceControllerTest extends
- CaCertsPreferenceControllerTestBase {
+public class CaCertsCurrentUserPreferenceControllerTest
+ extends CaCertsPreferenceControllerTestBase {
private static final String CA_CERT_DEVICE = "CA certs";
private static final String CA_CERT_PERSONAL = "CA certs in personal profile";
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java
index 2aa5306..2ba55ed 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceControllerTest.java
@@ -18,19 +18,13 @@
import static org.mockito.Mockito.when;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link CaCertsManagedProfilePreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class CaCertsManagedProfilePreferenceControllerTest extends
- CaCertsPreferenceControllerTestBase {
+public class CaCertsManagedProfilePreferenceControllerTest
+ extends CaCertsPreferenceControllerTestBase {
@Override
void mockGetNumberOfCaCerts(int numOfCaCerts) {
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java
index ec76b2b..16905ee 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerBaseTest.java
@@ -18,18 +18,13 @@
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link CaCertsPreferenceControllerBase}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class CaCertsPreferenceControllerBaseTest extends CaCertsPreferenceControllerTestBase {
+
private static final String PREF_KEY = "pref";
private int mNumOfCaCerts;
@@ -49,7 +44,7 @@
private class CaCertsPreferenceControllerBaseTestable extends
CaCertsPreferenceControllerBase {
- public CaCertsPreferenceControllerBaseTestable(Context context) {
+ private CaCertsPreferenceControllerBaseTestable(Context context) {
super(context);
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
index fe7f4e1..fd371c9 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
@@ -84,5 +84,4 @@
abstract String getPreferenceKey();
abstract CaCertsPreferenceControllerBase createController();
-
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index dbbf573..c785681 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -26,7 +26,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,14 +38,9 @@
import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link EnterpriseInstalledPackagesPreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class EnterpriseInstalledPackagesPreferenceControllerTest {
+public class EnterpriseInstalledPackagesPreferenceControllerTest {
private static final String KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES
= "number_enterprise_installed_packages";
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 1ea2567..ddbd3d4 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -16,6 +16,11 @@
package com.android.settings.enterprise;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
+
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -30,7 +35,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settings.wrapper.DevicePolicyManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -40,25 +44,15 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.when;
-
-/**
- * Tests for {@link EnterprisePrivacyFeatureProviderImpl}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class EnterprisePrivacyFeatureProviderImplTest {
+public class EnterprisePrivacyFeatureProviderImplTest {
private final ComponentName OWNER = new ComponentName("dummy", "component");
private final ComponentName ADMIN_1 = new ComponentName("dummy", "admin1");
@@ -69,10 +63,9 @@
private final int MANAGED_PROFILE_USER_ID = MY_USER_ID + 1;
private final String VPN_PACKAGE_ID = "com.example.vpn";
private final String IME_PACKAGE_ID = "com.example.ime";
- private final String OTHER_PACKAGE_ID = "com.example.other";
private final String IME_PACKAGE_LABEL = "Test IME";
- private List<UserInfo> mProfiles = new ArrayList();
+ private List<UserInfo> mProfiles = new ArrayList<>();
private @Mock Context mContext;
private @Mock DevicePolicyManagerWrapper mDevicePolicyManager;
@@ -92,7 +85,7 @@
resetAndInitializePackageManagerWrapper();
when(mUserManager.getProfiles(MY_USER_ID)).thenReturn(mProfiles);
mProfiles.add(new UserInfo(MY_USER_ID, "", "", 0 /* flags */));
- mResources = ShadowApplication.getInstance().getApplicationContext().getResources();
+ mResources = RuntimeEnvironment.application.getResources();
mProvider = new EnterprisePrivacyFeatureProviderImpl(mContext, mDevicePolicyManager,
mPackageManagerWrapper, mUserManager, mConnectivityManger, mResources);
@@ -225,8 +218,8 @@
when(mConnectivityManger.getGlobalProxy()).thenReturn(null);
assertThat(mProvider.isGlobalHttpProxySet()).isFalse();
- when(mConnectivityManger.getGlobalProxy()).thenReturn(
- ProxyInfo.buildDirectProxy("localhost", 123));
+ when(mConnectivityManger.getGlobalProxy())
+ .thenReturn(ProxyInfo.buildDirectProxy("localhost", 123));
assertThat(mProvider.isGlobalHttpProxySet()).isTrue();
}
@@ -292,11 +285,9 @@
public void testGetNumberOfOwnerInstalledCaCertsForCurrent() {
final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM);
final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID);
- final UserInfo managedProfile =
- new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE);
when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
- .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
+ .thenReturn(Arrays.asList("ca1", "ca2"));
when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
.thenReturn(null);
@@ -307,7 +298,7 @@
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUser())
.isEqualTo(0);
when(mDevicePolicyManager.getOwnerInstalledCaCerts(userHandle))
- .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
+ .thenReturn(Arrays.asList("ca1", "ca2"));
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForCurrentUser())
.isEqualTo(2);
}
@@ -321,7 +312,7 @@
// Without a profile
when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
- .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
+ .thenReturn(Arrays.asList("ca1", "ca2"));
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
.isEqualTo(0);
@@ -336,7 +327,7 @@
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
.isEqualTo(0);
when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
- .thenReturn(Arrays.asList(new String[] {"ca1", "ca2"}));
+ .thenReturn(Arrays.asList("ca1", "ca2"));
assertThat(mProvider.getNumberOfOwnerInstalledCaCertsForManagedProfile())
.isEqualTo(2);
}
@@ -344,9 +335,9 @@
@Test
public void testGetNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile() {
when(mDevicePolicyManager.getActiveAdminsAsUser(MY_USER_ID))
- .thenReturn(Arrays.asList(new ComponentName[] {ADMIN_1, ADMIN_2}));
+ .thenReturn(Arrays.asList(ADMIN_1, ADMIN_2));
when(mDevicePolicyManager.getActiveAdminsAsUser(MANAGED_PROFILE_USER_ID))
- .thenReturn(Arrays.asList(new ComponentName[] {ADMIN_1}));
+ .thenReturn(Arrays.asList(ADMIN_1));
assertThat(mProvider.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile())
.isEqualTo(2);
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
index 8a3fc15..adac125 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
@@ -23,7 +23,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,14 +32,9 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link EnterprisePrivacyPreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class EnterprisePrivacyPreferenceControllerTest {
+public class EnterprisePrivacyPreferenceControllerTest {
private static final String MANAGED_GENERIC = "managed by organization";
private static final String MANAGED_WITH_NAME = "managed by Foo, Inc.";
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index 5e80f66..5266fde 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -23,7 +23,6 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.PreferenceCategoryController;
@@ -35,17 +34,12 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.List;
-/**
- * Tests for {@link EnterprisePrivacySettings}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class EnterprisePrivacySettingsTest {
+public class EnterprisePrivacySettingsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@@ -56,7 +50,6 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mFeatureFactory = FakeFeatureFactory.setupForTest();
-
mSettings = new EnterprisePrivacySettings();
}
@@ -89,22 +82,21 @@
}
@Test
- public void getPreferenceControllers() throws Exception {
- final List<AbstractPreferenceController> controllers = mSettings.createPreferenceControllers(
- ShadowApplication.getInstance().getApplicationContext());
+ public void getPreferenceControllers() {
+ final List<AbstractPreferenceController> controllers =
+ mSettings.createPreferenceControllers(RuntimeEnvironment.application);
verifyPreferenceControllers(controllers);
}
@Test
- public void getSearchIndexProviderPreferenceControllers() throws Exception {
- final List<AbstractPreferenceController> controllers
- = EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER.getPreferenceControllers(
- ShadowApplication.getInstance().getApplicationContext());
+ public void getSearchIndexProviderPreferenceControllers() {
+ final List<AbstractPreferenceController> controllers =
+ EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER
+ .getPreferenceControllers(RuntimeEnvironment.application);
verifyPreferenceControllers(controllers);
}
- private void verifyPreferenceControllers(List<AbstractPreferenceController> controllers)
- throws Exception {
+ private void verifyPreferenceControllers(List<AbstractPreferenceController> controllers) {
assertThat(controllers).isNotNull();
assertThat(controllers.size()).isEqualTo(17);
int position = 0;
@@ -137,7 +129,7 @@
PreferenceCategoryController.class);
assertThat(controllers.get(position++)).isInstanceOf(
FailedPasswordWipeCurrentUserPreferenceController.class);
- assertThat(controllers.get(position++)).isInstanceOf(
+ assertThat(controllers.get(position)).isInstanceOf(
FailedPasswordWipeManagedProfilePreferenceController.class);
}
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
index 033d399..109bc92 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
@@ -17,7 +17,6 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.when;
@@ -28,7 +27,6 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.core.AbstractPreferenceController;
import org.junit.Before;
@@ -36,14 +34,13 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EnterpriseSetDefaultAppsListFragmentTest {
+
@Mock(answer = RETURNS_DEEP_STUBS)
private PreferenceScreen mScreen;
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -55,7 +52,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = ShadowApplication.getInstance().getApplicationContext();
+ mContext = RuntimeEnvironment.application;
when(mPreferenceManager.getContext()).thenReturn(mContext);
when(mScreen.getPreferenceManager()).thenReturn(mPreferenceManager);
mFragment = new EnterpriseSetDefaultAppsListFragmentTestable(mPreferenceManager, mScreen);
@@ -83,21 +80,20 @@
final List<AbstractPreferenceController> controllers = mFragment.createPreferenceControllers(mContext);
assertThat(controllers).isNotNull();
assertThat(controllers.size()).isEqualTo(1);
- int position = 0;
- assertThat(controllers.get(position++)).isInstanceOf(
- EnterpriseSetDefaultAppsListPreferenceController.class);
+ assertThat(controllers.get(0))
+ .isInstanceOf(EnterpriseSetDefaultAppsListPreferenceController.class);
}
- private static class EnterpriseSetDefaultAppsListFragmentTestable extends
- EnterpriseSetDefaultAppsListFragment {
+ private static class EnterpriseSetDefaultAppsListFragmentTestable
+ extends EnterpriseSetDefaultAppsListFragment {
private final PreferenceManager mPreferenceManager;
private final PreferenceScreen mPreferenceScreen;
- public EnterpriseSetDefaultAppsListFragmentTestable(PreferenceManager preferenceManager,
+ private EnterpriseSetDefaultAppsListFragmentTestable(PreferenceManager preferenceManager,
PreferenceScreen screen) {
- this.mPreferenceManager = preferenceManager;
- this.mPreferenceScreen = screen;
+ mPreferenceManager = preferenceManager;
+ mPreferenceScreen = screen;
}
@Override
@@ -110,5 +106,4 @@
return mPreferenceScreen;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
index 0c7996e..7fc63b5 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
@@ -38,7 +38,6 @@
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.TestConfig;
import com.android.settings.applications.EnterpriseDefaultApps;
import com.android.settings.applications.UserAppInfo;
import com.android.settings.testutils.ApplicationTestUtils;
@@ -51,15 +50,15 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import java.util.Arrays;
import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EnterpriseSetDefaultAppsListPreferenceControllerTest {
+
private static final int USER_ID = 0;
private static final int APP_UID = 0;
@@ -83,8 +82,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- ShadowApplication shadowContext = ShadowApplication.getInstance();
- mContext = spy(shadowContext.getApplicationContext());
+ mContext = spy(RuntimeEnvironment.application);
mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
when(mPrefenceManager.getContext()).thenReturn(mContext);
@@ -109,7 +107,7 @@
final ApplicationInfo appInfo2 = ApplicationTestUtils.buildInfo(APP_UID, APP_2, 0, 0);
when(mFeatureFactory.userFeatureProvider.getUserProfiles())
- .thenReturn(Arrays.asList(new UserHandle(USER_ID)));
+ .thenReturn(Collections.singletonList(new UserHandle(USER_ID)));
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isInCompMode()).thenReturn(false);
when(mFeatureFactory.applicationFeatureProvider
.findPersistentPreferredActivities(anyInt(), any()))
@@ -117,7 +115,7 @@
when(mFeatureFactory.applicationFeatureProvider
.findPersistentPreferredActivities(eq(USER_ID),
eq(EnterpriseDefaultApps.BROWSER.getIntents())))
- .thenReturn(Arrays.asList(new UserAppInfo(user, appInfo1)));
+ .thenReturn(Collections.singletonList(new UserAppInfo(user, appInfo1)));
when(mFeatureFactory.applicationFeatureProvider
.findPersistentPreferredActivities(eq(USER_ID),
eq(EnterpriseDefaultApps.PHONE.getIntents()))).thenReturn(
@@ -140,7 +138,7 @@
@Test
public void isAvailable() {
when(mFeatureFactory.userFeatureProvider.getUserProfiles())
- .thenReturn(Arrays.asList(new UserHandle(USER_ID)));
+ .thenReturn(Collections.singletonList(new UserHandle(USER_ID)));
when(mFeatureFactory.applicationFeatureProvider
.findPersistentPreferredActivities(anyInt(), any()))
.thenReturn(Collections.emptyList());
@@ -153,7 +151,7 @@
@Test
public void getPreferenceKey() {
when(mFeatureFactory.userFeatureProvider.getUserProfiles())
- .thenReturn(Arrays.asList(new UserHandle(USER_ID)));
+ .thenReturn(Collections.singletonList(new UserHandle(USER_ID)));
when(mFeatureFactory.applicationFeatureProvider
.findPersistentPreferredActivities(anyInt(), any()))
.thenReturn(Collections.emptyList());
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
index 0f64693..971b6d8 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
@@ -31,7 +31,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.EnterpriseDefaultApps;
import com.android.settings.applications.UserAppInfo;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -44,15 +43,11 @@
import org.mockito.ArgumentMatcher;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
-/**
- * Tests for {@link EnterpriseSetDefaultAppsPreferenceController}.
- */
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps";
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
index 8453d62..25044c6 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceControllerTest.java
@@ -18,19 +18,13 @@
import static org.mockito.Mockito.when;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link FailedPasswordWipeCurrentUserPreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class FailedPasswordWipeCurrentUserPreferenceControllerTest extends
- FailedPasswordWipePreferenceControllerTestBase {
+public class FailedPasswordWipeCurrentUserPreferenceControllerTest
+ extends FailedPasswordWipePreferenceControllerTestBase {
public FailedPasswordWipeCurrentUserPreferenceControllerTest() {
super("failed_password_wipe_current_user");
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
index a001a9c..aed46bd 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceControllerTest.java
@@ -18,19 +18,13 @@
import static org.mockito.Mockito.when;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link FailedPasswordWipeManagedProfilePreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class FailedPasswordWipeManagedProfilePreferenceControllerTest extends
- FailedPasswordWipePreferenceControllerTestBase {
+public final class FailedPasswordWipeManagedProfilePreferenceControllerTest
+ extends FailedPasswordWipePreferenceControllerTestBase {
public FailedPasswordWipeManagedProfilePreferenceControllerTest() {
super("failed_password_wipe_managed_profile");
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
index f80667c..83fbe6c 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBaseTest.java
@@ -16,19 +16,13 @@
package com.android.settings.enterprise;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link FailedPasswordWipePreferenceControllerBase}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class FailedPasswordWipePreferenceControllerBaseTest extends
- FailedPasswordWipePreferenceControllerTestBase {
+public class FailedPasswordWipePreferenceControllerBaseTest
+ extends FailedPasswordWipePreferenceControllerTestBase {
private int mMaximumFailedPasswordsBeforeWipe = 0;
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
index 4b85b78..d13197a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
@@ -36,7 +36,7 @@
*/
public abstract class FailedPasswordWipePreferenceControllerTestBase {
- protected final String mKey;
+ private final String mKey;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
protected Context mContext;
@@ -44,7 +44,7 @@
protected FailedPasswordWipePreferenceControllerBase mController;
- public FailedPasswordWipePreferenceControllerTestBase(String key) {
+ FailedPasswordWipePreferenceControllerTestBase(String key) {
mKey = key;
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
index 6594f99..b1753ec 100644
--- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
@@ -22,7 +22,6 @@
import android.content.Context;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,14 +31,9 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link GlobalHttpProxyPreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class GlobalHttpProxyPreferenceControllerTest {
+public class GlobalHttpProxyPreferenceControllerTest {
private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy";
diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
index 64bbd76..26e808f 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
@@ -23,7 +23,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,14 +32,9 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link ImePreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class ImePreferenceControllerTest {
+public class ImePreferenceControllerTest {
private static final String DEFAULT_IME_LABEL = "Test IME";
private static final String DEFAULT_IME_TEXT = "Set to Test IME";
diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
index d449419..b6813d0 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -26,25 +25,19 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-/**
- * Tests for {@link ManageDeviceAdminPreferenceController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class ManageDeviceAdminPreferenceControllerTest {
+public class ManageDeviceAdminPreferenceControllerTest {
@Mock
private Resources mResources;
diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
index 43b793d..2201e69 100644
--- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
@@ -16,25 +16,18 @@
package com.android.settings.enterprise;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.Date;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
-/**
- * Tests for {@link NetworkLogsPreferenceController}.
- */
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Date;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class NetworkLogsPreferenceControllerTest extends
- AdminActionPreferenceControllerTestBase {
+public class NetworkLogsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase {
@Override
public void setUp() {
diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
index 11e219a..2736d56 100644
--- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
@@ -16,25 +16,18 @@
package com.android.settings.enterprise;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import java.util.Date;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
-/**
- * Tests for {@link SecurityLogsPreferenceController}.
- */
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Date;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public final class SecurityLogsPreferenceControllerTest extends
- AdminActionPreferenceControllerTestBase {
+public class SecurityLogsPreferenceControllerTest extends AdminActionPreferenceControllerTestBase {
@Override
public void setUp() {
diff --git a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java b/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
index 81947e8..d306d06 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
@@ -16,7 +16,6 @@
package com.android.settings.fingerprint;
-
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -24,12 +23,9 @@
import android.app.Dialog;
import android.hardware.fingerprint.Fingerprint;
-import com.android.settings.TestConfig;
import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
-import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment
- .DeleteFingerprintDialog;
+import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment.DeleteFingerprintDialog;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowFragment;
import org.junit.Before;
@@ -41,11 +37,7 @@
import org.robolectric.util.FragmentTestUtil;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowEventLogWriter.class,
- ShadowFragment.class
- })
+@Config(shadows = ShadowFragment.class)
public class DeleteFingerprintDialogTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
index 5418ead..c9ed3a5 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fingerprint;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
@@ -34,7 +33,6 @@
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -56,13 +54,7 @@
import java.util.concurrent.TimeUnit;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowUtils.class,
- ShadowVibrator.class
- })
+@Config(shadows = {ShadowUtils.class, ShadowVibrator.class})
public class FingerprintEnrollEnrollingTest {
@Mock
@@ -70,15 +62,13 @@
private FingerprintEnrollEnrolling mActivity;
- private FakeFeatureFactory mFactory;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowUtils.setFingerprintManager(mFingerprintManager);
ShadowVibrator.addToServiceMap();
- mFactory = FakeFeatureFactory.setupForTest();
+ FakeFeatureFactory.setupForTest();
mActivity = Robolectric.buildActivity(
FingerprintEnrollEnrolling.class,
new Intent()
@@ -107,7 +97,6 @@
Robolectric.getForegroundThreadScheduler().advanceBy(2, TimeUnit.MILLISECONDS);
-
ShadowVibrator shadowVibrator =
Shadow.extract(application.getSystemService(Vibrator.class));
verify(shadowVibrator.delegate).vibrate(
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
index be53aa5..922fd19 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fingerprint;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.verify;
@@ -31,12 +30,10 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.wrapper.FingerprintManagerWrapper;
@@ -54,15 +51,7 @@
import org.robolectric.shadows.ShadowActivity.IntentForResult;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- ShadowEventLogWriter.class,
- ShadowUtils.class
- })
+@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowUtils.class})
public class FingerprintEnrollFindSensorTest {
@Mock
@@ -70,13 +59,11 @@
private FingerprintEnrollFindSensor mActivity;
- private FakeFeatureFactory mFactory;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowUtils.setFingerprintManager(mFingerprintManager);
- mFactory = FakeFeatureFactory.setupForTest();
+ FakeFeatureFactory.setupForTest();
mActivity = Robolectric.buildActivity(
FingerprintEnrollFindSensor.class,
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java
index 66114aa..74d4b28 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java
@@ -27,7 +27,6 @@
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,10 +34,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FingerprintEnrollSuggestionActivityTest {
@Mock
@@ -56,8 +53,7 @@
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mContext.getSystemService(eq(Context.DEVICE_POLICY_SERVICE)))
.thenReturn(mDevicePolicyManager);
- when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(), anyInt()))
- .thenReturn(0);
+ when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(), anyInt())).thenReturn(0);
when(mContext.getSystemService(Context.FINGERPRINT_SERVICE))
.thenReturn(mFingerprintManager);
}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
index 7b7e440..24eb1ad 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
@@ -17,37 +17,34 @@
package com.android.settings.fingerprint;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.graphics.SurfaceTexture;
import android.net.Uri;
import android.view.TextureView.SurfaceTextureListener;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FingerprintLocationAnimationVideoViewTest {
- private Context mContext;
private FingerprintLocationAnimationVideoView mView;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = ShadowApplication.getInstance().getApplicationContext();
- mView = spy(new FingerprintLocationAnimationVideoView(mContext, null));
+ final Context context = RuntimeEnvironment.application;
+ mView = spy(new FingerprintLocationAnimationVideoView(context, null));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
index 29c6f10..6e5e1a0 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
@@ -16,6 +16,9 @@
package com.android.settings.fingerprint;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+
import android.content.Context;
import android.support.v7.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
@@ -23,7 +26,6 @@
import android.widget.FrameLayout;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,13 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FingerprintPreferenceTest {
@Mock
@@ -63,12 +60,13 @@
@Test
public void bindAndClickDeleteButton_shouldInvokeOnDeleteListener() {
final FrameLayout layout = new FrameLayout(mContext);
- final View deleteButton = LayoutInflater.from(mContext)
- .inflate(mPreference.getSecondTargetResId(), layout, true);
+ LayoutInflater.from(mContext).inflate(mPreference.getSecondTargetResId(), layout, true);
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(layout);
mPreference.onBindViewHolder(holder);
- layout.findViewById(R.id.delete_button).performClick();
+ final View view = layout.findViewById(R.id.delete_button);
+ assertThat(view).isNotNull();
+ view.performClick();
verify(mOnDeleteClickListener).onDeleteClick(mPreference);
}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
index 9993a95..583428e 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import android.os.UserManager;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,11 +37,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FingerprintProfileStatusPreferenceControllerTest {
private static final int FAKE_PROFILE_USER_ID = 1234;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
index ab53382..441f5b6 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
@@ -33,7 +33,6 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -43,13 +42,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import java.util.Arrays;
+import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FingerprintStatusPreferenceControllerTest {
@Mock
@@ -122,7 +119,7 @@
public void updateState_hasFingerprint_shouldShowSummary() {
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
when(mFingerprintManager.getEnrolledFingerprints(anyInt()))
- .thenReturn(Arrays.asList(mock(Fingerprint.class)));
+ .thenReturn(Collections.singletonList(mock(Fingerprint.class)));
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
index f52f437..ee47f2a 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
@@ -16,9 +16,7 @@
package com.android.settings.fingerprint;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.robolectric.RuntimeEnvironment.application;
import android.app.Activity;
@@ -29,10 +27,8 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -49,14 +45,7 @@
import org.robolectric.shadows.ShadowKeyguardManager;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowEventLogWriter.class,
- ShadowLockPatternUtils.class,
- ShadowUserManager.class
- })
+@Config(shadows = {ShadowLockPatternUtils.class, ShadowUserManager.class})
public class FingerprintSuggestionActivityTest {
@Mock
@@ -64,12 +53,10 @@
private ActivityController<FingerprintSuggestionActivity> mController;
- private FakeFeatureFactory mFactory;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mFactory = FakeFeatureFactory.setupForTest();
+ FakeFeatureFactory.setupForTest();
final Intent intent = new Intent();
mController = Robolectric.buildActivity(FingerprintSuggestionActivity.class, intent);
@@ -91,7 +78,7 @@
ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
assertThat(shadowActivity.getResultCode()).named("Result code")
- .isEqualTo(Activity.RESULT_CANCELED);
+ .isEqualTo(Activity.RESULT_CANCELED);
}
private ShadowKeyguardManager getShadowKeyguardManager() {
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
index c786608..085a622 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
@@ -25,12 +25,10 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.wrapper.FingerprintManagerWrapper;
@@ -46,41 +44,17 @@
import org.robolectric.shadows.ShadowAlertDialog;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- ShadowEventLogWriter.class,
- ShadowUtils.class
- })
+@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowUtils.class})
public class SetupFingerprintEnrollFindSensorTest {
@Mock
private FingerprintManagerWrapper mFingerprintManager;
- private SetupFingerprintEnrollFindSensor mActivity;
-
- private FakeFeatureFactory mFactory;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowUtils.setFingerprintManager(mFingerprintManager);
- mFactory = FakeFeatureFactory.setupForTest();
- }
-
- private void createActivity(Intent intent) {
- mActivity = Robolectric.buildActivity(
- SetupFingerprintEnrollFindSensor.class, intent)
- .setup().get();
- }
-
- private Intent createIntent() {
- return new Intent()
- // Set the challenge token so the confirm screen will not be shown
- .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
+ FakeFeatureFactory.setupForTest();
}
@After
@@ -90,14 +64,21 @@
@Test
public void fingerprintEnroll_showsAlert_whenClickingSkip() {
- createActivity(createIntent());
- Button skipButton = mActivity.findViewById(R.id.skip_button);
+ final Intent intent = new Intent()
+ // Set the challenge token so the confirm screen will not be shown
+ .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, new byte[0]);
+
+ final SetupFingerprintEnrollFindSensor activity =
+ Robolectric.buildActivity(SetupFingerprintEnrollFindSensor.class, intent).setup().get();
+
+ final Button skipButton = activity.findViewById(R.id.skip_button);
skipButton.performClick();
- AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
+
+ final AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
assertNotNull(alertDialog);
- ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
- int titleRes = R.string.setup_fingerprint_enroll_skip_title;
+
+ final ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
+ final int titleRes = R.string.setup_fingerprint_enroll_skip_title;
assertEquals(application.getString(titleRes), shadowAlertDialog.getTitle());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index f5b0c8a..9e62511 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -16,9 +16,7 @@
package com.android.settings.fingerprint;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.robolectric.RuntimeEnvironment.application;
import android.app.KeyguardManager;
@@ -29,15 +27,12 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest
- .ShadowStorageManagerWrapper;
+import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper;
import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment;
import com.android.settings.password.SetupSkipDialog;
import com.android.settings.password.StorageManagerWrapper;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowFingerprintManager;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -59,21 +54,16 @@
import org.robolectric.shadows.ShadowKeyguardManager;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowEventLogWriter.class,
- ShadowFingerprintManager.class,
- ShadowLockPatternUtils.class,
- ShadowStorageManagerWrapper.class,
- ShadowUserManager.class
- })
+@Config(shadows = {
+ ShadowFingerprintManager.class,
+ ShadowLockPatternUtils.class,
+ ShadowStorageManagerWrapper.class,
+ ShadowUserManager.class
+})
public class SetupFingerprintEnrollIntroductionTest {
@Mock
private UserInfo mUserInfo;
- private FakeFeatureFactory mFactory;
private ActivityController<SetupFingerprintEnrollIntroduction> mController;
@@ -82,10 +72,10 @@
MockitoAnnotations.initMocks(this);
Shadows.shadowOf(application.getPackageManager())
- .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
+ .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
ShadowFingerprintManager.addToServiceMap();
- mFactory = FakeFeatureFactory.setupForTest();
+ FakeFeatureFactory.setupForTest();
final Intent intent = new Intent();
mController = Robolectric.buildActivity(SetupFingerprintEnrollIntroduction.class, intent);
@@ -112,7 +102,7 @@
ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
assertThat(shadowActivity.getResultCode()).named("Result code")
- .isEqualTo(SetupSkipDialog.RESULT_SKIP);
+ .isEqualTo(SetupSkipDialog.RESULT_SKIP);
}
@Test
@@ -128,7 +118,7 @@
ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
assertThat(shadowActivity.getResultCode()).named("Result code")
- .isEqualTo(FingerprintEnrollBase.RESULT_SKIP);
+ .isEqualTo(FingerprintEnrollBase.RESULT_SKIP);
}
@Test
@@ -143,7 +133,7 @@
ShadowActivity shadowActivity = Shadows.shadowOf(activity);
assertThat(shadowActivity.getResultIntent()).isNotNull();
assertThat(shadowActivity.getResultIntent().hasExtra(
- SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isTrue();
+ SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isTrue();
}
@Test
@@ -170,7 +160,7 @@
ShadowActivity shadowActivity = Shadows.shadowOf(activity);
assertThat(shadowActivity.getResultIntent()).isNotNull();
assertThat(shadowActivity.getResultIntent().hasExtra(
- SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isTrue();
+ SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isTrue();
}
@Test
@@ -190,7 +180,7 @@
getShadowKeyguardManager().setIsKeyguardSecure(true);
SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
activity.onActivityResult(FingerprintEnrollIntroduction.FINGERPRINT_FIND_SENSOR_REQUEST,
- FingerprintEnrollBase.RESULT_FINISHED, null);
+ FingerprintEnrollBase.RESULT_FINISHED, null);
assertThat(Shadows.shadowOf(activity).getResultIntent()).isNull();
}
@@ -200,7 +190,7 @@
SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
getShadowKeyguardManager().setIsKeyguardSecure(true);
activity.onActivityResult(FingerprintEnrollIntroduction.FINGERPRINT_FIND_SENSOR_REQUEST,
- FingerprintEnrollBase.RESULT_FINISHED, null);
+ FingerprintEnrollBase.RESULT_FINISHED, null);
assertThat(Shadows.shadowOf(activity).getResultIntent()).isNotNull();
}
@@ -209,7 +199,7 @@
getShadowKeyguardManager().setIsKeyguardSecure(false);
SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
activity.onActivityResult(FingerprintEnrollIntroduction.FINGERPRINT_FIND_SENSOR_REQUEST,
- FingerprintEnrollBase.RESULT_FINISHED, null);
+ FingerprintEnrollBase.RESULT_FINISHED, null);
assertThat(Shadows.shadowOf(activity).getResultIntent()).isNull();
}
@@ -228,10 +218,9 @@
IntentForResult startedActivity = shadowActivity.getNextStartedActivityForResult();
assertThat(startedActivity).isNotNull();
assertThat(startedActivity.intent.hasExtra(
- SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isFalse();
+ SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isFalse();
}
-
private ShadowKeyguardManager getShadowKeyguardManager() {
return Shadows.shadowOf(application.getSystemService(KeyguardManager.class));
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 506e394..929f3c3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -28,6 +28,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.app.Activity;
import android.app.AppOpsManager;
@@ -47,7 +48,6 @@
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.fuelgauge.anomaly.AnomalySummaryPreferenceController;
@@ -78,8 +78,7 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowEntityHeaderController.class, ShadowActivityManager.class})
+@Config(shadows = {ShadowEntityHeaderController.class, ShadowActivityManager.class})
public class AdvancedPowerUsageDetailTest {
private static final String APP_LABEL = "app label";
private static final String SUMMARY = "summary";
@@ -139,7 +138,6 @@
private Preference mBackgroundPreference;
private Preference mPowerUsagePreference;
private AdvancedPowerUsageDetail mFragment;
- private FakeFeatureFactory mFeatureFactory;
private SettingsActivity mTestActivity;
private List<Anomaly> mAnomalies;
@@ -148,14 +146,14 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mFeatureFactory = FakeFeatureFactory.setupForTest();
+ FakeFeatureFactory.setupForTest();
mFragment = spy(new AdvancedPowerUsageDetail());
doReturn(mContext).when(mFragment).getContext();
doReturn(mActivity).when(mFragment).getActivity();
doReturn(SUMMARY).when(mFragment).getString(anyInt());
doReturn(APP_LABEL).when(mBundle).getString(nullable(String.class));
- doReturn(mBundle).when(mFragment).getArguments();
+ when(mFragment.getArguments()).thenReturn(mBundle);
doReturn(mLoaderManager).when(mFragment).getLoaderManager();
ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
@@ -177,7 +175,7 @@
.setSummary(nullable(String.class));
doReturn(UID).when(mBatterySipper).getUid();
- doReturn(APP_LABEL).when(mBatteryEntry).getLabel();
+ when(mBatteryEntry.getLabel()).thenReturn(APP_LABEL);
doReturn(BACKGROUND_TIME_US).when(mUid).getProcessStateTime(
eq(BatteryStats.Uid.PROCESS_STATE_BACKGROUND), anyLong(), anyInt());
doReturn(PROCSTATE_TOP_TIME_US).when(mUid).getProcessStateTime(
@@ -282,12 +280,12 @@
mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, mAnomalies);
assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
- assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME)).isEqualTo(
- BACKGROUND_TIME_MS);
- assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME)).isEqualTo(
- FOREGROUND_TIME_MS);
- assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
- USAGE_PERCENT);
+ assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME))
+ .isEqualTo(BACKGROUND_TIME_MS);
+ assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME))
+ .isEqualTo(FOREGROUND_TIME_MS);
+ assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT))
+ .isEqualTo(USAGE_PERCENT);
assertThat(mBundle.getParcelableArrayList(
AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isEqualTo(mAnomalies);
}
@@ -301,12 +299,12 @@
mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
- assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME)).isEqualTo(
- PHONE_FOREGROUND_TIME_MS);
- assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME)).isEqualTo(
- PHONE_BACKGROUND_TIME_MS);
- assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
- USAGE_PERCENT);
+ assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME))
+ .isEqualTo(PHONE_FOREGROUND_TIME_MS);
+ assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME))
+ .isEqualTo(PHONE_BACKGROUND_TIME_MS);
+ assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT))
+ .isEqualTo(USAGE_PERCENT);
assertThat(mBundle.getParcelableArrayList(
AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isNull();
}
@@ -371,12 +369,12 @@
verify(mActivity).startActivity(captor.capture());
assertThat(captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS)
- .getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME))
- .isEqualTo(PACKAGE_NAME[0]);
+ .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%");
+ .getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT))
+ .isEqualTo("0%");
}
@Test
@@ -397,8 +395,8 @@
AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);
- assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
- PACKAGE_NAME[0]);
+ assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME))
+ .isEqualTo(PACKAGE_NAME[0]);
}
@Test
@@ -408,7 +406,7 @@
bundle.putLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME, FOREGROUND_TIME_MS);
bundle.putString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT, USAGE_PERCENT);
bundle.putInt(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_AMOUNT, POWER_MAH);
- doReturn(bundle).when(mFragment).getArguments();
+ when(mFragment.getArguments()).thenReturn(bundle);
doReturn(mContext.getText(R.string.battery_used_for)).when(mFragment).getText(
R.string.battery_used_for);
@@ -427,8 +425,8 @@
@Test
public void testInitAnomalyInfo_anomalyNull_startAnomalyLoader() {
- doReturn(null).when(mBundle).getParcelableArrayList(
- AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST);
+ doReturn(null).when(mBundle)
+ .getParcelableArrayList(AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST);
mFragment.initAnomalyInfo();
@@ -437,12 +435,11 @@
@Test
public void testInitAnomalyInfo_anomalyExisted_updateAnomaly() {
- doReturn(mAnomalies).when(mBundle).getParcelableArrayList(
- AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST);
+ doReturn(mAnomalies).when(mBundle)
+ .getParcelableArrayList(AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST);
mFragment.initAnomalyInfo();
verify(mAnomalySummaryPreferenceController).updateAnomalySummaryPreference(mAnomalies);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
index e01f3e1..d2252a7 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
@@ -42,7 +42,6 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.widget.ActionButtonPreference;
import com.android.settings.widget.ActionButtonPreferenceTest;
@@ -59,15 +58,13 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppButtonsPreferenceControllerTest {
+
private static final String PACKAGE_NAME = "com.android.settings";
private static final String RESOURCE_STRING = "string";
private static final boolean ALL_USERS = false;
@@ -105,7 +102,7 @@
private AppButtonsPreferenceController mController;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest();
@@ -113,7 +110,7 @@
doReturn(mPackageManger).when(mSettingsActivity).getPackageManager();
doReturn(mAm).when(mSettingsActivity).getSystemService(Context.ACTIVITY_SERVICE);
doReturn(mAppEntry).when(mState).getEntry(anyString(), anyInt());
- doReturn(mApplication).when(mSettingsActivity).getApplication();
+ when(mSettingsActivity.getApplication()).thenReturn(mApplication);
when(mSettingsActivity.getResources().getString(anyInt())).thenReturn(RESOURCE_STRING);
mController = spy(new AppButtonsPreferenceController(mSettingsActivity, mFragment,
@@ -132,12 +129,9 @@
mController.mPackageInfo = mPackageInfo;
final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
- Answer<Void> callable = new Answer<Void>() {
- @Override
- public Void answer(InvocationOnMock invocation) throws Exception {
- mUninstallIntent = captor.getValue();
- return null;
- }
+ Answer<Void> callable = invocation -> {
+ mUninstallIntent = captor.getValue();
+ return null;
};
doAnswer(callable).when(mFragment).startActivityForResult(captor.capture(), anyInt());
}
@@ -325,7 +319,6 @@
verify(mButtonPrefs).setButton1Text(R.string.disable_text);
assertThat(controllable).isTrue();
-
}
@Test
@@ -352,8 +345,8 @@
* The test fragment which implements
* {@link ButtonActionDialogFragment.AppButtonsDialogListener}
*/
- public static class TestFragment extends Fragment implements
- ButtonActionDialogFragment.AppButtonsDialogListener {
+ public static class TestFragment extends Fragment
+ implements ButtonActionDialogFragment.AppButtonsDialogListener {
@Override
public void handleDialogClick(int type) {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
index 0cfe135..ee8e798 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
@@ -17,33 +17,24 @@
package com.android.settings.fuelgauge;
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.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import static org.robolectric.Shadows.shadowOf;
-import android.app.AlertDialog;
import android.app.AppOpsManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.UserManager;
-import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
-import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowFragment;
@@ -59,22 +50,12 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowDialog;
-import org.robolectric.util.FragmentTestUtil;
@RunWith(RobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- ShadowFragment.class
- })
+@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowFragment.class})
public class BackgroundActivityPreferenceControllerTest {
+
private static final int UID_LOW_SDK = 1234;
- private static final int UID_HIGH_SDK = 3456;
private static final String HIGH_SDK_PACKAGE = "com.android.package.high";
private static final String LOW_SDK_PACKAGE = "com.android.package.low";
@@ -137,8 +118,8 @@
@Test
public void testHandlePreferenceTreeClick_restrictApp_showDialog() {
- doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager).checkOpNoThrow(anyInt(),
- anyInt(), anyString());
+ doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager)
+ .checkOpNoThrow(anyInt(), anyInt(), anyString());
mController.handlePreferenceTreeClick(mPreference);
@@ -147,8 +128,8 @@
@Test
public void testHandlePreferenceTreeClick_unRestrictApp_showDialog() {
- doReturn(AppOpsManager.MODE_IGNORED).when(mAppOpsManager).checkOpNoThrow(anyInt(),
- anyInt(), anyString());
+ doReturn(AppOpsManager.MODE_IGNORED).when(mAppOpsManager)
+ .checkOpNoThrow(anyInt(), anyInt(), anyString());
mController.handlePreferenceTreeClick(mPreference);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java
index cf38432..b223a10 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java
@@ -32,12 +32,10 @@
import com.android.internal.os.BatteryStatsImpl;
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;
import org.junit.Before;
import org.junit.Test;
@@ -46,14 +44,12 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
- SettingsShadowSystemProperties.class)
public class BatteryAppListPreferenceControllerTest {
+
private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
private static final String KEY_APP_LIST = "app_list";
private static final int UID = 123;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index c75dbf4..3fdbe83 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -15,25 +15,7 @@
*/
package com.android.settings.fuelgauge;
-import android.content.Context;
-import android.content.Intent;
-import android.os.BatteryManager;
-import android.os.PowerManager;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.Utils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
@@ -41,9 +23,24 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import android.content.Context;
+import android.content.Intent;
+import android.os.BatteryManager;
+import android.os.PowerManager;
+
+import com.android.settings.Utils;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryBroadcastReceiverTest {
+
private static final String BATTERY_INIT_LEVEL = "100%";
private static final String BATTERY_INIT_STATUS = "Not charging";
private static final int BATTERY_INTENT_LEVEL = 80;
@@ -68,18 +65,18 @@
mChargingIntent = new Intent(Intent.ACTION_BATTERY_CHANGED);
mChargingIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_INTENT_LEVEL);
mChargingIntent.putExtra(BatteryManager.EXTRA_SCALE, BATTERY_INTENT_SCALE);
- mChargingIntent.putExtra(BatteryManager.EXTRA_STATUS,
- BatteryManager.BATTERY_STATUS_CHARGING);
+ mChargingIntent
+ .putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_CHARGING);
}
@Test
public void testOnReceive_batteryDataChanged_dataUpdated() {
mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent);
- assertThat(mBatteryBroadcastReceiver.mBatteryLevel).isEqualTo(
- Utils.getBatteryPercentage(mChargingIntent));
- assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(
- Utils.getBatteryStatus(mContext.getResources(), mChargingIntent));
+ assertThat(mBatteryBroadcastReceiver.mBatteryLevel)
+ .isEqualTo(Utils.getBatteryPercentage(mChargingIntent));
+ assertThat(mBatteryBroadcastReceiver.mBatteryStatus)
+ .isEqualTo(Utils.getBatteryStatus(mContext.getResources(), mChargingIntent));
verify(mBatteryListener).onBatteryChanged();
}
@@ -94,8 +91,8 @@
@Test
public void testOnReceive_batteryDataNotChanged_listenerNotInvoked() {
final String batteryLevel = Utils.getBatteryPercentage(mChargingIntent);
- final String batteryStatus = Utils.getBatteryStatus(mContext.getResources(),
- mChargingIntent);
+ final String batteryStatus =
+ Utils.getBatteryStatus(mContext.getResources(), mChargingIntent);
mBatteryBroadcastReceiver.mBatteryLevel = batteryLevel;
mBatteryBroadcastReceiver.mBatteryStatus = batteryStatus;
@@ -113,12 +110,11 @@
mBatteryBroadcastReceiver.register();
mBatteryBroadcastReceiver.register();
- assertThat(mBatteryBroadcastReceiver.mBatteryLevel).isEqualTo(
- Utils.getBatteryPercentage(mChargingIntent));
- assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(
- Utils.getBatteryStatus(mContext.getResources(), mChargingIntent));
+ assertThat(mBatteryBroadcastReceiver.mBatteryLevel)
+ .isEqualTo(Utils.getBatteryPercentage(mChargingIntent));
+ assertThat(mBatteryBroadcastReceiver.mBatteryStatus)
+ .isEqualTo(Utils.getBatteryStatus(mContext.getResources(), mChargingIntent));
// 2 times because register will force update the battery
verify(mBatteryListener, times(2)).onBatteryChanged();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java
index 498cd58..8b4ff53 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java
@@ -17,13 +17,11 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.text.format.DateUtils;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager;
@@ -36,14 +34,13 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryDatabaseManagerTest {
+
private static String PACKAGE_NAME_NEW = "com.android.app1";
private static int TYPE_NEW = 1;
private static String PACKAGE_NAME_OLD = "com.android.app2";
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
index a57b6ca..21b1d29 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
@@ -15,6 +15,9 @@
*/
package com.android.settings.fuelgauge;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -26,24 +29,17 @@
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatterySipper.DrainType;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoRule;
import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryEntryTest {
private static final int APP_UID = 123;
@@ -68,8 +64,8 @@
@Before
public void stubPackageManagerToReturnAppPackageAndName() throws NameNotFoundException {
- when(mockPackageManager.getPackagesForUid(APP_UID)).thenReturn(
- new String[]{APP_DEFAULT_PACKAGE_NAME});
+ when(mockPackageManager.getPackagesForUid(APP_UID))
+ .thenReturn(new String[] {APP_DEFAULT_PACKAGE_NAME});
ApplicationInfo appInfo = mock(ApplicationInfo.class);
when(mockPackageManager.getApplicationInfo(APP_DEFAULT_PACKAGE_NAME, 0 /* no flags */))
@@ -130,8 +126,8 @@
@Test
public void batteryEntryForApp_shouldSetHighestDrainPackage_whenMultiplePackagesFoundForUid() {
- when(mockPackageManager.getPackagesForUid(APP_UID)).thenReturn(
- new String[]{APP_DEFAULT_PACKAGE_NAME, "package2", "package3"});
+ when(mockPackageManager.getPackagesForUid(APP_UID))
+ .thenReturn(new String[] {APP_DEFAULT_PACKAGE_NAME, "package2", "package3"});
BatteryEntry entry = createBatteryEntryForApp();
@@ -142,8 +138,8 @@
public void extractPackageFromSipper_systemSipper_returnSystemPackage() {
BatteryEntry entry = createBatteryEntryForSystem();
- assertThat(entry.extractPackagesFromSipper(entry.sipper)).isEqualTo(
- new String[]{ANDROID_PACKAGE});
+ assertThat(entry.extractPackagesFromSipper(entry.sipper))
+ .isEqualTo(new String[] {ANDROID_PACKAGE});
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 58bc14b..bf67cb8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -18,9 +18,7 @@
package com.android.settings.fuelgauge;
import static android.arch.lifecycle.Lifecycle.Event.ON_START;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
@@ -40,7 +38,6 @@
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -59,15 +56,14 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
+@Config(shadows = {
SettingsShadowResources.class,
SettingsShadowResourcesImpl.class,
SettingsShadowResources.SettingsShadowTheme.class,
ShadowEntityHeaderController.class
})
public class BatteryHeaderPreferenceControllerTest {
+
private static final int BATTERY_LEVEL = 60;
private static final String TIME_LEFT = "2h30min";
private static final String BATTERY_STATUS = "Charging";
@@ -113,8 +109,8 @@
doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
mBatteryLayoutPref = new LayoutPreference(mContext, R.layout.battery_header);
- doReturn(mBatteryLayoutPref).when(mPreferenceScreen).findPreference(
- BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
+ doReturn(mBatteryLayoutPref).when(mPreferenceScreen)
+ .findPreference(BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
mBatteryInfo.batteryLevel = BATTERY_LEVEL;
@@ -137,8 +133,8 @@
assertThat(((BatteryMeterView) mBatteryLayoutPref.findViewById(
R.id.battery_header_icon)).getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
- assertThat(((TextView) mBatteryLayoutPref.findViewById(
- R.id.battery_percent)).getText()).isEqualTo("60%");
+ assertThat(((TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent)).getText())
+ .isEqualTo("60%");
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
index 933d673..2a69d35 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
@@ -29,9 +29,8 @@
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.graph.UsageView;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.Before;
@@ -42,16 +41,11 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION
- ,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class
- })
+@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public class BatteryHistoryPreferenceTest {
- public static final String TEST_STRING = "test";
+
+ private static final String TEST_STRING = "test";
@Mock
private PreferenceViewHolder mViewHolder;
@Mock
@@ -59,8 +53,6 @@
@Mock
private TextView mTextView;
@Mock
- private View mItemView;
- @Mock
private UsageView mUsageView;
@Mock
private View mLabelView;
@@ -70,8 +62,8 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
final Context context = RuntimeEnvironment.application;
- final View itemView = LayoutInflater.from(context).inflate(R.layout.battery_usage_graph,
- null);
+ final View itemView =
+ LayoutInflater.from(context).inflate(R.layout.battery_usage_graph, null);
mBatteryHistoryPreference = new BatteryHistoryPreference(context, null);
mBatteryHistoryPreference.mBatteryInfo = mBatteryInfo;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
index 4e1b26c..bebf31f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
@@ -28,7 +28,6 @@
import android.os.BatteryStats;
import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.BatteryTestUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -40,37 +39,31 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryInfoLoaderTest {
+
private static final long TEST_TIME_REMAINING = 1000L;
@Mock (answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStatsHelper mHelper;
@Mock (answer = Answers.RETURNS_DEEP_STUBS)
- private PowerUsageFeatureProvider mProvider;
- @Mock (answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStats mStats;
- private Intent mDisChargingBatteryBroadcast;
private Context mContext;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mProvider = FakeFeatureFactory
- .setupForTest()
- .getPowerUsageFeatureProvider(mContext);
-
- mDisChargingBatteryBroadcast = BatteryTestUtils.getDischargingIntent();
+ FakeFeatureFactory.setupForTest().getPowerUsageFeatureProvider(mContext);
doReturn(mContext).when(mContext).getApplicationContext();
when(mStats.computeBatteryTimeRemaining(anyLong())).thenReturn(TEST_TIME_REMAINING);
doReturn(mStats).when(mHelper).getStats();
- doReturn(mDisChargingBatteryBroadcast).when(mContext).registerReceiver(any(), any());
+
+ final Intent dischargingBatteryBroadcast = BatteryTestUtils.getDischargingIntent();
+ doReturn(dischargingBatteryBroadcast).when(mContext).registerReceiver(any(), any());
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index b613bb3..bfd117d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.any;
@@ -28,24 +27,22 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.os.BatteryManager;
import android.os.BatteryStats;
import android.os.SystemClock;
import android.util.SparseIntArray;
-import com.android.settings.TestConfig;
import com.android.settings.graph.UsageView;
import com.android.settings.testutils.BatteryTestUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
import com.android.settingslib.R;
import com.android.settingslib.utils.PowerUtil;
-import java.time.Duration;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -56,27 +53,25 @@
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
+import java.time.Duration;
import java.util.concurrent.TimeUnit;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryInfoTest {
- private static final String STATUS_FULL = "Full";
private static final String STATUS_CHARGING_NO_TIME = "50% - charging";
private static final String STATUS_CHARGING_TIME = "50% - 0m until fully charged";
private static final String STATUS_NOT_CHARGING = "Not charging";
private static final int PLUGGED_IN = 1;
private static final long REMAINING_TIME_NULL = -1;
private static final long REMAINING_TIME = 2;
- public static final String ENHANCED_STRING_SUFFIX = "based on your usage";
- public static final long TEST_CHARGE_TIME_REMAINING = TimeUnit.MINUTES.toMicros(1);
- public static final String TEST_CHARGE_TIME_REMAINING_STRINGIFIED =
+ private static final String ENHANCED_STRING_SUFFIX = "based on your usage";
+ private static final long TEST_CHARGE_TIME_REMAINING = TimeUnit.MINUTES.toMicros(1);
+ private static final String TEST_CHARGE_TIME_REMAINING_STRINGIFIED =
"1m left until fully charged";
- public static final String TEST_BATTERY_LEVEL_10 = "10%";
- public static final String FIFTEEN_MIN_FORMATTED = "15m";
+ private static final String TEST_BATTERY_LEVEL_10 = "10%";
+ private static final String FIFTEEN_MIN_FORMATTED = "15m";
private Intent mDisChargingBatteryBroadcast;
private Intent mChargingBatteryBroadcast;
private Context mContext;
@@ -84,9 +79,6 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStats mBatteryStats;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Resources mResources;
-
@Before
public void setUp() {
@@ -189,7 +181,6 @@
FIFTEEN_MIN_FORMATTED));
}
-
@Test
public void testGetBatteryInfo_basedOnUsageFalse_usesDefaultString() {
BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
@@ -255,7 +246,7 @@
private void assertOnlyHistory(BatteryInfo info) {
mockBatteryStatsHistory();
UsageView view = mock(UsageView.class);
- doReturn(mContext).when(view).getContext();
+ when(view.getContext()).thenReturn(mContext);
info.bindHistory(view);
verify(view, times(1)).configureGraph(anyInt(), anyInt());
@@ -266,7 +257,7 @@
private void assertHistoryAndLinearProjection(BatteryInfo info) {
mockBatteryStatsHistory();
UsageView view = mock(UsageView.class);
- doReturn(mContext).when(view).getContext();
+ when(view.getContext()).thenReturn(mContext);
info.bindHistory(view);
verify(view, times(2)).configureGraph(anyInt(), anyInt());
@@ -283,7 +274,7 @@
private void assertHistoryAndEnhancedProjection(BatteryInfo info) {
mockBatteryStatsHistory();
UsageView view = mock(UsageView.class);
- doReturn(mContext).when(view).getContext();
+ when(view.getContext()).thenReturn(mContext);
SparseIntArray pointsExpected = new SparseIntArray();
pointsExpected.append(2000, 96);
pointsExpected.append(2500, 95);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
index 3a1fad0..bc91e17 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
@@ -16,14 +16,13 @@
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.verify;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.graphics.ColorFilter;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
@@ -37,17 +36,13 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-// TODO: Consider making the shadow class set global using a robolectric.properties file.
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowTheme.class,
- })
+@Config(shadows = {SettingsShadowResources.class, SettingsShadowTheme.class})
public class BatteryMeterViewTest {
+
private static final int BATTERY_LEVEL = 100;
private static final int BATTERY_CRITICAL_LEVEL = 15;
private static final int BATTERY_LOW_LEVEL = 3;
+
@Mock
private ColorFilter mErrorColorFilter;
@Mock
@@ -68,7 +63,7 @@
mBatteryMeterView.mAccentColorFilter = mAccentColorFilter;
mBatteryMeterView.mErrorColorFilter = mErrorColorFilter;
- doReturn(BATTERY_CRITICAL_LEVEL).when(mDrawable).getCriticalLevel();
+ when(mDrawable.getCriticalLevel()).thenReturn(BATTERY_CRITICAL_LEVEL);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
index bc2b341..b454416 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
@@ -30,8 +30,8 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
import org.junit.Before;
import org.junit.Test;
@@ -40,11 +40,10 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryOptimizationPreferenceControllerTest {
+
private static final String PKG_IN_WHITELIST = "com.pkg.in.whitelist";
private static final String PKG_NOT_IN_WHITELIST = "com.pkg.not.in.whitelist";
private static final String KEY_OPTIMIZATION = "battery_optimization";
@@ -114,8 +113,7 @@
/**
* Create this test class so we could mock it
*/
- public static class TestPowerWhitelistBackend extends
- com.android.settingslib.fuelgauge.PowerWhitelistBackend {
+ public static class TestPowerWhitelistBackend extends PowerWhitelistBackend {
@Override
public void refreshList() {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
index 6cc3310..965684e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
@@ -15,11 +15,15 @@
*/
package com.android.settings.fuelgauge;
+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.content.Context;
import android.os.PowerManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -28,17 +32,11 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatterySaverControllerTest {
+
@Mock
private MasterSwitchPreference mBatterySaverPref;
@Mock
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
index 259bcd2..c57c522 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
@@ -22,7 +22,6 @@
import android.os.BatteryManager;
import android.os.PowerManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -30,11 +29,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatterySaverReceiverTest {
+
@Mock
private BatterySaverReceiver.BatterySaverListener mBatterySaverListener;
@Mock
@@ -77,5 +75,4 @@
verify(mBatterySaverListener).onPowerSaveModeChanged();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
index 5f8d7cf..8d1302f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
@@ -20,11 +20,11 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.net.ConnectivityManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -33,10 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryStatsHelperLoaderTest {
@Mock
private BatteryUtils mBatteryUtils;
@@ -59,10 +57,9 @@
@Test
public void testLoadInBackground_loadWithoutBundle() {
- doReturn(mContext).when(mBatteryStatsHelperLoader).getContext();
+ when(mBatteryStatsHelperLoader.getContext()).thenReturn(mContext);
mBatteryStatsHelperLoader.loadInBackground();
verify(mBatteryUtils).initBatteryStatsHelper(any(), eq(null), any());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 9d3fb7a..6518b8e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -20,9 +20,7 @@
import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE;
import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP;
import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING;
-
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.anyLong;
@@ -52,7 +50,6 @@
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -64,14 +61,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryUtilsTest {
+
// unit that used to converted ms to us
private static final long UNIT = 1000;
private static final long TIME_STATE_TOP = 1500 * UNIT;
@@ -208,24 +204,24 @@
doReturn(mAppOpsManager).when(shadowContext).getSystemService(Context.APP_OPS_SERVICE);
mBatteryUtils = spy(new BatteryUtils(shadowContext));
mBatteryUtils.mPowerUsageFeatureProvider = mProvider;
- doReturn(0L).when(mBatteryUtils).getForegroundServiceTotalTimeUs(
- any(BatteryStats.Uid.class), anyLong());
+ doReturn(0L).when(mBatteryUtils)
+ .getForegroundServiceTotalTimeUs(any(BatteryStats.Uid.class), anyLong());
mUsageList = new ArrayList<>();
mUsageList.add(mNormalBatterySipper);
mUsageList.add(mScreenBatterySipper);
mUsageList.add(mCellBatterySipper);
- doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
- doReturn(TOTAL_BATTERY_USAGE + BATTERY_SCREEN_USAGE).when(
- mBatteryStatsHelper).getTotalPower();
- when(mBatteryStatsHelper.getStats().getDischargeAmount(anyInt())).thenReturn(
- DISCHARGE_AMOUNT);
+ when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
+ when(mBatteryStatsHelper.getTotalPower())
+ .thenReturn(TOTAL_BATTERY_USAGE + BATTERY_SCREEN_USAGE);
+ when(mBatteryStatsHelper.getStats().getDischargeAmount(anyInt()))
+ .thenReturn(DISCHARGE_AMOUNT);
}
@Test
public void testGetProcessTimeMs_typeForeground_timeCorrect() {
- doReturn(TIME_STATE_FOREGROUND + 500).when(mBatteryUtils).getForegroundActivityTotalTimeUs(
- eq(mUid), anyLong());
+ doReturn(TIME_STATE_FOREGROUND + 500).when(mBatteryUtils)
+ .getForegroundActivityTotalTimeUs(eq(mUid), anyLong());
final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.FOREGROUND, mUid,
BatteryStats.STATS_SINCE_CHARGED);
@@ -243,8 +239,8 @@
@Test
public void testGetProcessTimeMs_typeAll_timeCorrect() {
- doReturn(TIME_STATE_FOREGROUND + 500).when(mBatteryUtils).getForegroundActivityTotalTimeUs(
- eq(mUid), anyLong());
+ doReturn(TIME_STATE_FOREGROUND + 500).when(mBatteryUtils)
+ .getForegroundActivityTotalTimeUs(eq(mUid), anyLong());
final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.ALL, mUid,
BatteryStats.STATS_SINCE_CHARGED);
@@ -271,8 +267,7 @@
sippers.add(mWifiBatterySipper);
sippers.add(mBluetoothBatterySipper);
sippers.add(mIdleBatterySipper);
- when(mProvider.isTypeSystem(mSystemBatterySipper))
- .thenReturn(true);
+ when(mProvider.isTypeSystem(mSystemBatterySipper)).thenReturn(true);
doNothing().when(mBatteryUtils).smearScreenBatterySipper(any(), any());
final double totalUsage = mBatteryUtils.removeHiddenBatterySippers(sippers);
@@ -465,12 +460,12 @@
doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager).checkOpNoThrow(
AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME);
- assertThat(mBatteryUtils.isBackgroundRestrictionEnabled(SDK_VERSION, UID,
- PACKAGE_NAME)).isFalse();
+ assertThat(mBatteryUtils.isBackgroundRestrictionEnabled(SDK_VERSION, UID, PACKAGE_NAME))
+ .isFalse();
}
- private BatterySipper createTestSmearBatterySipper(long topTime,
- double totalPowerMah, int uidCode, boolean isUidNull) {
+ private BatterySipper createTestSmearBatterySipper(
+ long topTime, double totalPowerMah, int uidCode, boolean isUidNull) {
final BatterySipper sipper = mock(BatterySipper.class);
sipper.drainType = BatterySipper.DrainType.APP;
sipper.totalPowerMah = totalPowerMah;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
index dec445d..83d8f7a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java
@@ -16,7 +16,6 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -30,8 +29,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import org.junit.Before;
import org.junit.Test;
@@ -39,16 +36,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowAlertDialog;
import org.robolectric.shadows.ShadowDialog;
import org.robolectric.util.FragmentTestUtil;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- ShadowEventLogWriter.class
-})
public class ButtonActionDialogFragmentTest {
+
private static final int FORCE_STOP_ID = ButtonActionDialogFragment.DialogType.FORCE_STOP;
private static final int DISABLE_ID = ButtonActionDialogFragment.DialogType.DISABLE;
private static final int SPECIAL_DISABLE_ID =
@@ -82,6 +76,7 @@
FragmentTestUtil.startFragment(fragment);
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+ assertThat(dialog).isNotNull();
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getMessage()).isEqualTo(
@@ -101,6 +96,7 @@
FragmentTestUtil.startFragment(fragment);
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+ assertThat(dialog).isNotNull();
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getMessage()).isEqualTo(
@@ -113,12 +109,13 @@
@Test
public void testOnCreateDialog_specialDisableDialog() {
- ButtonActionDialogFragment fragment = ButtonActionDialogFragment.newInstance(
- SPECIAL_DISABLE_ID);
+ ButtonActionDialogFragment fragment =
+ ButtonActionDialogFragment.newInstance(SPECIAL_DISABLE_ID);
FragmentTestUtil.startFragment(fragment);
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+ assertThat(dialog).isNotNull();
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getMessage()).isEqualTo(
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
index ca3fdd2..8029c55 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
@@ -23,7 +23,6 @@
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,31 +30,26 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HighPowerDetailTest {
- private Context mContext;
-
private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
- mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
}
@Test
public void logSpecialPermissionChange() {
// Deny means app is whitelisted to opt out of power save restrictions
- HighPowerDetail.logSpecialPermissionChange(true, "app", mContext);
+ HighPowerDetail.logSpecialPermissionChange(true, "app", RuntimeEnvironment.application);
verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_DENY), eq("app"));
// Allow means app is NOT whitelisted to opt out of power save restrictions
- HighPowerDetail.logSpecialPermissionChange(false, "app", mContext);
+ HighPowerDetail.logSpecialPermissionChange(false, "app", RuntimeEnvironment.application);
verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_ALLOW), eq("app"));
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
index 32f6a96..8c25974 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
@@ -27,7 +27,6 @@
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,13 +34,13 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PowerGaugePreferenceTest {
+
private static final String SUBTITLE = "Summary";
private static final String CONTENT_DESCRIPTION = "Content description";
+
private Context mContext;
private PowerGaugePreference mPowerGaugePreference;
private View mRootView;
@@ -53,11 +52,12 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mRootView = LayoutInflater.from(mContext).inflate(R.layout.preference_app,
- null);
- mWidgetView = LayoutInflater.from(mContext).inflate(R.layout.preference_widget_summary,
- null);
- ((LinearLayout) mRootView.findViewById(android.R.id.widget_frame)).addView(mWidgetView);
+ mRootView = LayoutInflater.from(mContext).inflate(R.layout.preference_app, null);
+ mWidgetView =
+ LayoutInflater.from(mContext).inflate(R.layout.preference_widget_summary, null);
+ final LinearLayout widgetFrame = mRootView.findViewById(android.R.id.widget_frame);
+ assertThat(widgetFrame).isNotNull();
+ widgetFrame.addView(mWidgetView);
mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
mPowerGaugePreference = new PowerGaugePreference(mContext);
@@ -69,8 +69,8 @@
mPowerGaugePreference.setSubtitle(SUBTITLE);
mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
- assertThat(((TextView) mPreferenceViewHolder.findViewById(
- R.id.widget_summary)).getText()).isEqualTo(SUBTITLE);
+ TextView widgetSummary = (TextView) mPreferenceViewHolder.findViewById(R.id.widget_summary);
+ assertThat(widgetSummary.getText()).isEqualTo(SUBTITLE);
}
@Test
@@ -78,8 +78,8 @@
mPowerGaugePreference.shouldShowAnomalyIcon(true);
mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
- final Drawable[] drawables = ((TextView) mPreferenceViewHolder.findViewById(
- R.id.widget_summary)).getCompoundDrawablesRelative();
+ TextView widgetSummary = (TextView) mPreferenceViewHolder.findViewById(R.id.widget_summary);
+ final Drawable[] drawables = widgetSummary.getCompoundDrawablesRelative();
assertThat(drawables[0]).isInstanceOf(VectorDrawable.class);
}
@@ -89,8 +89,8 @@
mPowerGaugePreference.shouldShowAnomalyIcon(false);
mPowerGaugePreference.onBindViewHolder(mPreferenceViewHolder);
- final Drawable[] drawables = ((TextView) mPreferenceViewHolder.findViewById(
- R.id.widget_summary)).getCompoundDrawablesRelative();
+ TextView widgetSummary = (TextView) mPreferenceViewHolder.findViewById(R.id.widget_summary);
+ final Drawable[] drawables = widgetSummary.getCompoundDrawablesRelative();
assertThat(drawables[0]).isNull();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index 2b5e704..81d40a3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -16,11 +16,9 @@
package com.android.settings.fuelgauge;
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.eq;
-import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
@@ -42,12 +40,11 @@
import com.android.internal.os.BatterySipper.DrainType;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
-import com.android.settings.testutils.BatteryTestUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.Utils;
import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData;
import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData.UsageType;
+import com.android.settings.testutils.BatteryTestUtils;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
@@ -56,15 +53,14 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PowerUsageAdvancedTest {
+
private static final int FAKE_UID_1 = 50;
private static final int FAKE_UID_2 = 100;
private static final int DISCHARGE_AMOUNT = 60;
@@ -246,8 +242,8 @@
public void testUpdateUsageDataSummary_moreThanOneApp_showMaxUsageApp() {
mPowerUsageData.usageList.add(mNormalBatterySipper);
mPowerUsageData.usageList.add(mMaxBatterySipper);
- doReturn(mMaxBatterySipper).when(mPowerUsageAdvanced).findBatterySipperWithMaxBatteryUsage(
- mPowerUsageData.usageList);
+ doReturn(mMaxBatterySipper).when(mPowerUsageAdvanced)
+ .findBatterySipperWithMaxBatteryUsage(mPowerUsageData.usageList);
final double percentage = (TYPE_BLUETOOTH_USAGE / TOTAL_POWER) * DISCHARGE_AMOUNT;
mPowerUsageAdvanced.updateUsageDataSummary(mPowerUsageData, TOTAL_POWER, DISCHARGE_AMOUNT);
@@ -259,8 +255,8 @@
public void testFindBatterySipperWithMaxBatteryUsage_findCorrectOne() {
mPowerUsageData.usageList.add(mNormalBatterySipper);
mPowerUsageData.usageList.add(mMaxBatterySipper);
- BatterySipper sipper = mPowerUsageAdvanced.findBatterySipperWithMaxBatteryUsage(
- mPowerUsageData.usageList);
+ BatterySipper sipper =
+ mPowerUsageAdvanced.findBatterySipperWithMaxBatteryUsage(mPowerUsageData.usageList);
assertThat(sipper).isEqualTo(mMaxBatterySipper);
}
@@ -316,8 +312,8 @@
@Test
public void testShouldHideCategory_typeCellWhileNotSupported_returnTrue() {
mPowerUsageData.usageType = UsageType.CELL;
- doReturn(false).when(mConnectivityManager).isNetworkSupported(
- ConnectivityManager.TYPE_MOBILE);
+ doReturn(false).when(mConnectivityManager)
+ .isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
assertThat(mPowerUsageAdvanced.shouldHideCategory(mPowerUsageData)).isTrue();
}
@@ -414,8 +410,8 @@
powerUsageDataList.add(new PowerUsageData(UsageType.APP, normalPower));
powerUsageDataList.add(new PowerUsageData(UsageType.CELL, normalPower));
- assertThat(mPowerUsageAdvanced.calculateHiddenPower(powerUsageDataList)).isWithin(
- PRECISION).of(unaccountedPower);
+ assertThat(mPowerUsageAdvanced.calculateHiddenPower(powerUsageDataList))
+ .isWithin(PRECISION).of(unaccountedPower);
}
@Test
@@ -439,5 +435,4 @@
mPowerUsageAdvanced.refreshUi();
verify(mHistPref, atLeastOnce()).setBottomSummary(any());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
index 693117e..47a462b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java
@@ -23,9 +23,9 @@
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import static org.mockito.Mockito.verify;
-import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
@@ -36,7 +36,6 @@
import android.util.IconDrawableFactory;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -49,14 +48,13 @@
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PowerUsageAnomalyDetailsTest {
+
private static final String NAME_APP_1 = "app1";
private static final String NAME_APP_2 = "app2";
private static final String NAME_APP_3 = "app3";
@@ -78,7 +76,7 @@
private PackageManager mPackageManager;
@Mock
private IconDrawableFactory mIconDrawableFactory;
- private Context mContext;
+
private PowerUsageAnomalyDetails mFragment;
private PreferenceGroup mAbnormalListGroup;
private List<Anomaly> mAnomalyList;
@@ -87,8 +85,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mAbnormalListGroup = spy(new PreferenceCategory(mContext));
+ mAbnormalListGroup = spy(new PreferenceCategory(RuntimeEnvironment.application));
mAnomalyList = new ArrayList<>();
Anomaly anomaly1 = new Anomaly.Builder()
@@ -113,18 +110,18 @@
mFragment = spy(new PowerUsageAnomalyDetails());
mFragment.mAbnormalListGroup = mAbnormalListGroup;
mFragment.mAnomalies = mAnomalyList;
- mFragment.mBatteryUtils = new BatteryUtils(mContext);
+ mFragment.mBatteryUtils = new BatteryUtils(RuntimeEnvironment.application);
mFragment.mPackageManager = mPackageManager;
mFragment.mIconDrawableFactory = mIconDrawableFactory;
- doReturn(mPreferenceManager).when(mFragment).getPreferenceManager();
- doReturn(mContext).when(mPreferenceManager).getContext();
+ when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
+ when(mPreferenceManager.getContext()).thenReturn(RuntimeEnvironment.application);
}
@Test
public void testRefreshUi_displayCorrectTitleAndSummary() {
final List<Preference> testPreferences = new ArrayList<>();
- final ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(
- Preference.class);
+ final ArgumentCaptor<Preference> preferenceCaptor =
+ ArgumentCaptor.forClass(Preference.class);
Answer<Void> prefCallable = new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
index 9a55ef0..d9f572d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
@@ -15,7 +15,6 @@
*/
package com.android.settings.fuelgauge;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -28,7 +27,6 @@
import android.os.Bundle;
import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowDashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -42,13 +40,10 @@
import java.util.List;
-/**
- * Unit tests for {@link PowerUsageBase}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = ShadowDashboardFragment.class)
+@Config(shadows = ShadowDashboardFragment.class)
public class PowerUsageBaseTest {
+
@Mock
private BatteryStatsHelper mBatteryStatsHelper;
@Mock
@@ -98,7 +93,7 @@
return null;
}
- public void setBatteryStatsHelper(BatteryStatsHelper batteryStatsHelper) {
+ private void setBatteryStatsHelper(BatteryStatsHelper batteryStatsHelper) {
mStatsHelper = batteryStatsHelper;
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index afda69f..f37d607 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -16,25 +16,25 @@
package com.android.settings.fuelgauge;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Process;
+
import com.android.internal.os.BatterySipper;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.when;
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PowerUsageFeatureProviderImplTest {
+
private static final int UID_OTHER = Process.FIRST_APPLICATION_UID + 2;
private static final int UID_CALENDAR = Process.FIRST_APPLICATION_UID + 3;
private static final int UID_MEDIA = Process.FIRST_APPLICATION_UID + 4;
@@ -42,6 +42,7 @@
private static final String[] PACKAGES_CALENDAR = {"com.android.providers.calendar"};
private static final String[] PACKAGES_MEDIA = {"com.android.providers.media"};
private static final String[] PACKAGES_SYSTEMUI = {"com.android.systemui"};
+
@Mock
private Context mContext;
@Mock
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java
index 329665b..093adfe 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java
@@ -32,11 +32,9 @@
import static org.mockito.Mockito.when;
import android.app.LoaderManager;
-import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.os.PowerManager;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
@@ -54,7 +52,6 @@
import com.android.internal.os.BatteryStatsImpl;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
@@ -63,36 +60,30 @@
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.core.AbstractPreferenceController;
-
import com.android.settingslib.utils.StringUtil;
+
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
-/**
- * Unit tests for {@link PowerUsageSummary}.
- */
// TODO: Improve this test class so that it starts up the real activity and fragment.
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- })
+@Config(shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowResources.SettingsShadowTheme.class,
+})
public class PowerUsageSummaryLegacyTest {
+
private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
private static final String STUB_STRING = "stub_string";
private static final int UID = 123;
@@ -104,13 +95,10 @@
private static final int DISCHARGE_AMOUNT = 100;
private static final long USAGE_TIME_MS = 65 * 60 * 1000;
private static final double TOTAL_POWER = 200;
- private static final double BATTERY_SCREEN_USAGE = 300;
- private static final double BATTERY_SYSTEM_USAGE = 600;
- private static final double BATTERY_OVERCOUNTED_USAGE = 500;
private static final double PRECISION = 0.001;
private static final double POWER_USAGE_PERCENTAGE = 50;
- public static final String NEW_ML_EST_SUFFIX = "(New ML est)";
- public static final String OLD_EST_SUFFIX = "(Old est)";
+ private static final String NEW_ML_EST_SUFFIX = "(New ML est)";
+ private static final String OLD_EST_SUFFIX = "(Old est)";
private static Intent sAdditionalBatteryInfoIntent;
@BeforeClass
@@ -119,12 +107,8 @@
}
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Menu mMenu;
@Mock
- private MenuItem mAdditionalBatteryInfoMenu;
- @Mock
private MenuItem mToggleAppsMenu;
@Mock
private MenuItem mHighPowerMenu;
@@ -145,14 +129,10 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStatsHelper mBatteryHelper;
@Mock
- private PowerManager mPowerManager;
- @Mock
private SettingsActivity mSettingsActivity;
@Mock
private LoaderManager mLoaderManager;
@Mock
- private ContentResolver mContentResolver;
- @Mock
private PreferenceScreen mPreferenceScreen;
@Mock
private PreferenceGroup mAppListGroup;
@@ -169,7 +149,6 @@
private PowerGaugePreference mPreference;
private PowerGaugePreference mScreenUsagePref;
private PowerGaugePreference mLastFullChargePref;
- private SparseArray<List<Anomaly>> mAnomalySparseArray;
@Before
public void setUp() {
@@ -177,12 +156,11 @@
mRealContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
- when(mContext.getSystemService(Context.POWER_SERVICE)).thenReturn(mPowerManager);
mPreference = new PowerGaugePreference(mRealContext);
mScreenUsagePref = new PowerGaugePreference(mRealContext);
mLastFullChargePref = new PowerGaugePreference(mRealContext);
- mFragment = spy(new TestFragment(mContext));
+ mFragment = spy(new TestFragment(mRealContext));
mFragment.initFeatureProvider();
mBatteryMeterView = new BatteryMeterView(mRealContext);
mBatteryMeterView.mDrawable = new BatteryMeterView.BatteryMeterDrawable(mRealContext, 0);
@@ -193,10 +171,10 @@
when(mToggleAppsMenu.getItemId()).thenReturn(MENU_TOGGLE_APPS);
when(mHighPowerMenu.getItemId()).thenReturn(MENU_HIGH_POWER_APPS);
when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())
- .thenReturn(sAdditionalBatteryInfoIntent);
+ .thenReturn(sAdditionalBatteryInfoIntent);
when(mBatteryHelper.getTotalPower()).thenReturn(TOTAL_POWER);
- when(mBatteryHelper.getStats().computeBatteryRealtime(anyLong(), anyInt())).thenReturn(
- TIME_SINCE_LAST_FULL_CHARGE_US);
+ when(mBatteryHelper.getStats().computeBatteryRealtime(anyLong(), anyInt()))
+ .thenReturn(TIME_SINCE_LAST_FULL_CHARGE_US);
when(mNormalBatterySipper.getPackages()).thenReturn(PACKAGE_NAMES);
when(mNormalBatterySipper.getUid()).thenReturn(UID);
@@ -232,7 +210,7 @@
public void testOptionsMenu_menuHighPower_metricEventInvoked() {
mFragment.onOptionsItemSelected(mHighPowerMenu);
- verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
+ verify(mFeatureFactory.metricsFeatureProvider).action(mRealContext,
MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_OPTIMIZATION);
}
@@ -241,7 +219,7 @@
mFragment.onOptionsItemSelected(mToggleAppsMenu);
mFragment.mShowAllApps = false;
- verify(mFeatureFactory.metricsFeatureProvider).action(mContext,
+ verify(mFeatureFactory.metricsFeatureProvider).action(mRealContext,
MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE, true);
}
@@ -310,9 +288,9 @@
@Test
public void testSetUsageSummary_timeMoreThanOneMinute_normalApp_setScreenSummary() {
mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
- doReturn(mRealContext.getText(R.string.battery_used_for)).when(mFragment).getText(
- R.string.battery_used_for);
- doReturn(mRealContext).when(mFragment).getContext();
+ doReturn(mRealContext.getText(R.string.battery_used_for)).when(mFragment)
+ .getText(R.string.battery_used_for);
+ when(mFragment.getContext()).thenReturn(mRealContext);
mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
@@ -323,7 +301,7 @@
public void testSetUsageSummary_timeMoreThanOneMinute_hiddenApp_setUsedSummary() {
mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
doReturn(true).when(mFragment.mBatteryUtils).shouldHideSipper(mNormalBatterySipper);
- doReturn(mRealContext).when(mFragment).getContext();
+ when(mFragment.getContext()).thenReturn(mRealContext);
mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
@@ -334,7 +312,7 @@
public void testSetUsageSummary_timeMoreThanOneMinute_notApp_setUsedSummary() {
mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
mNormalBatterySipper.drainType = BatterySipper.DrainType.PHONE;
- doReturn(mRealContext).when(mFragment).getContext();
+ when(mFragment.getContext()).thenReturn(mRealContext);
mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
@@ -350,16 +328,16 @@
@Test
public void testFindBatterySipperByType_findTypeScreen() {
- BatterySipper sipper = mFragment.findBatterySipperByType(mUsageList,
- BatterySipper.DrainType.SCREEN);
+ BatterySipper sipper =
+ mFragment.findBatterySipperByType(mUsageList, BatterySipper.DrainType.SCREEN);
assertThat(sipper).isSameAs(mScreenBatterySipper);
}
@Test
public void testFindBatterySipperByType_findTypeApp() {
- BatterySipper sipper = mFragment.findBatterySipperByType(mUsageList,
- BatterySipper.DrainType.APP);
+ BatterySipper sipper =
+ mFragment.findBatterySipperByType(mUsageList, BatterySipper.DrainType.APP);
assertThat(sipper).isSameAs(mNormalBatterySipper);
}
@@ -367,7 +345,7 @@
@Test
public void testUpdateScreenPreference_showCorrectSummary() {
doReturn(mScreenBatterySipper).when(mFragment).findBatterySipperByType(any(), any());
- doReturn(mRealContext).when(mFragment).getContext();
+ when(mFragment.getContext()).thenReturn(mRealContext);
final CharSequence expectedSummary =
StringUtil.formatElapsedTime(mRealContext, USAGE_TIME_MS, false);
@@ -378,7 +356,7 @@
@Test
public void testUpdateLastFullChargePreference_showCorrectSummary() {
- doReturn(mRealContext).when(mFragment).getContext();
+ when(mFragment.getContext()).thenReturn(mRealContext);
mFragment.updateLastFullChargePreference(TIME_SINCE_LAST_FULL_CHARGE_MS);
@@ -387,9 +365,9 @@
@Test
public void testUpdatePreference_usageListEmpty_shouldNotCrash() {
- when(mBatteryHelper.getUsageList()).thenReturn(new ArrayList<BatterySipper>());
+ when(mBatteryHelper.getUsageList()).thenReturn(new ArrayList<>());
doReturn(STUB_STRING).when(mFragment).getString(anyInt(), any());
- doReturn(mRealContext).when(mFragment).getContext();
+ when(mFragment.getContext()).thenReturn(mRealContext);
// Should not crash when update
mFragment.updateScreenPreference();
@@ -405,8 +383,8 @@
public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {
final Context context = RuntimeEnvironment.application;
final PowerUsageSummary fragment = new PowerUsageSummary();
- final List<String> preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context,
- fragment.getPreferenceScreenResId());
+ final List<String> preferenceScreenKeys =
+ XmlTestUtils.getKeysFromPreferenceXml(context, fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
@@ -441,8 +419,8 @@
mFragment.restartAnomalyDetectionIfPossible();
- verify(mLoaderManager).restartLoader(eq(PowerUsageSummaryLegacy.ANOMALY_LOADER),
- eq(Bundle.EMPTY), any());
+ verify(mLoaderManager)
+ .restartLoader(eq(PowerUsageSummaryLegacy.ANOMALY_LOADER), eq(Bundle.EMPTY), any());
}
@Test
@@ -495,6 +473,7 @@
@Test
public void testDebugMode() {
doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isEstimateDebugEnabled();
+ doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
mFragment.restartBatteryInfoLoader();
ArgumentCaptor<View.OnLongClickListener> listener = ArgumentCaptor.forClass(
@@ -522,8 +501,6 @@
public static class TestFragment extends PowerUsageSummaryLegacy {
private Context mContext;
- private boolean mStartActivityCalled;
- private Intent mStartActivityIntent;
public TestFragment(Context context) {
mContext = context;
@@ -536,13 +513,29 @@
@Override
public void startActivity(Intent intent) {
- mStartActivityCalled = true;
- mStartActivityIntent = intent;
}
@Override
protected void refreshUi() {
// Leave it empty for toggle apps menu test
}
+
+ @Override
+ void showBothEstimates() {
+ List<BatteryInfo> fakeBatteryInfo = new ArrayList<>(2);
+ BatteryInfo info1 = new BatteryInfo();
+ info1.batteryLevel = 10;
+ info1.remainingTimeUs = 10000;
+ info1.discharging = true;
+
+ BatteryInfo info2 = new BatteryInfo();
+ info2.batteryLevel = 10;
+ info2.remainingTimeUs = 10000;
+ info2.discharging = true;
+
+ fakeBatteryInfo.add(info1);
+ fakeBatteryInfo.add(info2);
+ updateViews(fakeBatteryInfo);
+ }
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 336df87..7f6e39d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -16,11 +16,11 @@
package com.android.settings.fuelgauge;
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.anyLong;
import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -34,9 +34,8 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.os.PowerManager;
-import android.support.v7.preference.PreferenceScreen;
import android.util.SparseArray;
+import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
@@ -44,10 +43,8 @@
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.fuelgauge.anomaly.Anomaly;
-import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
@@ -63,6 +60,8 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@@ -70,19 +69,14 @@
import java.util.ArrayList;
import java.util.List;
-/**
- * Unit tests for {@link PowerUsageSummary}.
- */
// TODO: Improve this test class so that it starts up the real activity and fragment.
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- })
+@Config(shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowResources.SettingsShadowTheme.class,
+})
public class PowerUsageSummaryTest {
- private static final String STUB_STRING = "stub_string";
+
private static final int UID = 123;
private static final int UID_2 = 234;
private static final int POWER_MAH = 100;
@@ -91,8 +85,8 @@
TIME_SINCE_LAST_FULL_CHARGE_MS * 1000;
private static final long USAGE_TIME_MS = 65 * 60 * 1000;
private static final double TOTAL_POWER = 200;
- public static final String NEW_ML_EST_SUFFIX = "(New ML est)";
- public static final String OLD_EST_SUFFIX = "(Old est)";
+ private static final String NEW_ML_EST_SUFFIX = "(New ML est)";
+ private static final String OLD_EST_SUFFIX = "(Old est)";
private static Intent sAdditionalBatteryInfoIntent;
@BeforeClass
@@ -100,8 +94,6 @@
sAdditionalBatteryInfoIntent = new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
}
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
@Mock
private BatterySipper mNormalBatterySipper;
@Mock
@@ -117,16 +109,10 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStatsHelper mBatteryHelper;
@Mock
- private PowerManager mPowerManager;
- @Mock
private SettingsActivity mSettingsActivity;
@Mock
private LoaderManager mLoaderManager;
@Mock
- private PreferenceScreen mPreferenceScreen;
- @Mock
- private AnomalyDetectionPolicy mAnomalyDetectionPolicy;
- @Mock
private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
private List<BatterySipper> mUsageList;
@@ -143,11 +129,9 @@
mRealContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
- when(mContext.getSystemService(Context.POWER_SERVICE)).thenReturn(mPowerManager);
-
mScreenUsagePref = new PowerGaugePreference(mRealContext);
mLastFullChargePref = new PowerGaugePreference(mRealContext);
- mFragment = spy(new TestFragment(mContext));
+ mFragment = spy(new TestFragment(mRealContext));
mFragment.initFeatureProvider();
mBatteryMeterView = new BatteryMeterView(mRealContext);
mBatteryMeterView.mDrawable = new BatteryMeterView.BatteryMeterDrawable(mRealContext, 0);
@@ -158,8 +142,8 @@
when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())
.thenReturn(sAdditionalBatteryInfoIntent);
when(mBatteryHelper.getTotalPower()).thenReturn(TOTAL_POWER);
- when(mBatteryHelper.getStats().computeBatteryRealtime(anyLong(), anyInt())).thenReturn(
- TIME_SINCE_LAST_FULL_CHARGE_US);
+ when(mBatteryHelper.getStats().computeBatteryRealtime(anyLong(), anyInt()))
+ .thenReturn(TIME_SINCE_LAST_FULL_CHARGE_US);
when(mNormalBatterySipper.getUid()).thenReturn(UID);
mNormalBatterySipper.totalPowerMah = POWER_MAH;
@@ -191,7 +175,7 @@
@Test
public void testUpdateLastFullChargePreference_showCorrectSummary() {
- doReturn(mRealContext).when(mFragment).getContext();
+ when(mFragment.getContext()).thenReturn(mRealContext);
mFragment.updateLastFullChargePreference(TIME_SINCE_LAST_FULL_CHARGE_MS);
@@ -201,11 +185,11 @@
@Test
public void testNonIndexableKeys_MatchPreferenceKeys() {
final Context context = RuntimeEnvironment.application;
- final List<String> niks = PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(context);
+ final List<String> niks =
+ PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(context);
- final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context,
- R.xml.power_usage_summary);
+ final List<String> keys =
+ XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.power_usage_summary);
assertThat(keys).containsAllIn(niks);
}
@@ -214,8 +198,8 @@
public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {
final Context context = RuntimeEnvironment.application;
final PowerUsageSummary fragment = new PowerUsageSummary();
- final List<String> preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context,
- fragment.getPreferenceScreenResId());
+ final List<String> preferenceScreenKeys =
+ XmlTestUtils.getKeysFromPreferenceXml(context, fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
@@ -249,13 +233,29 @@
mFragment.restartBatteryTipLoader();
- verify(mLoaderManager).restartLoader(eq(PowerUsageSummary.BATTERY_TIP_LOADER),
- eq(Bundle.EMPTY), any());
+ verify(mLoaderManager)
+ .restartLoader(eq(PowerUsageSummary.BATTERY_TIP_LOADER), eq(Bundle.EMPTY), any());
}
- @Ignore("b/73892008")
@Test
public void testShowBothEstimates_summariesAreBothModified() {
+ when(mFeatureFactory.powerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(any()))
+ .thenReturn(true);
+ doAnswer(new Answer() {
+ @Override
+ public Object answer(InvocationOnMock invocation) throws Throwable {
+ return mRealContext.getString(
+ R.string.power_usage_old_debug, invocation.getArguments()[0]);
+ }
+ }).when(mFeatureFactory.powerUsageFeatureProvider).getOldEstimateDebugString(any());
+ doAnswer(new Answer() {
+ @Override
+ public Object answer(InvocationOnMock invocation) throws Throwable {
+ return mRealContext.getString(
+ R.string.power_usage_enhanced_debug, invocation.getArguments()[0]);
+ }
+ }).when(mFeatureFactory.powerUsageFeatureProvider).getEnhancedEstimateDebugString(any());
+
doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary1);
mFragment.onLongClick(new View(mRealContext));
@@ -269,6 +269,7 @@
@Test
public void testDebugMode() {
doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isEstimateDebugEnabled();
+ doReturn(new TextView(mRealContext)).when(mBatteryLayoutPref).findViewById(R.id.summary2);
mFragment.restartBatteryInfoLoader();
ArgumentCaptor<View.OnLongClickListener> listener = ArgumentCaptor.forClass(
@@ -310,5 +311,23 @@
protected void refreshUi() {
// Leave it empty for toggle apps menu test
}
+
+ @Override
+ void showBothEstimates() {
+ List<BatteryInfo> fakeBatteryInfo = new ArrayList<>(2);
+ BatteryInfo info1 = new BatteryInfo();
+ info1.batteryLevel = 10;
+ info1.remainingTimeUs = 10000;
+ info1.discharging = true;
+
+ BatteryInfo info2 = new BatteryInfo();
+ info2.batteryLevel = 10;
+ info2.remainingTimeUs = 10000;
+ info2.discharging = true;
+
+ fakeBatteryInfo.add(info1);
+ fakeBatteryInfo.add(info2);
+ updateViews(fakeBatteryInfo);
+ }
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
index 4503736..c9c82c2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
@@ -31,7 +31,6 @@
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;
@@ -42,13 +41,11 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RestrictAppPreferenceControllerTest {
@Mock
@@ -71,8 +68,8 @@
mContext = spy(RuntimeEnvironment.application);
doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
doReturn(mContext).when(mSettingsActivity).getApplicationContext();
- mRestrictAppPreferenceController = new RestrictAppPreferenceController(mSettingsActivity,
- mFragment);
+ mRestrictAppPreferenceController =
+ new RestrictAppPreferenceController(mSettingsActivity, mFragment);
mPackageOpsList = new ArrayList<>();
mPreference = new Preference(mContext);
mPreference.setKey(mRestrictAppPreferenceController.getPreferenceKey());
@@ -120,5 +117,4 @@
assertThat(intent.getValue().getIntExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1))
.isEqualTo(R.string.restricted_app_title);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
index 1d4d71e..da4b40a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
@@ -21,6 +21,7 @@
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.Intent;
@@ -33,7 +34,6 @@
import android.util.IconDrawableFactory;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.fuelgauge.batterytip.AppInfo;
@@ -46,16 +46,16 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RestrictedAppDetailsTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final String APP_NAME = "app";
+
@Mock
private PackageManager mPackageManager;
@Mock
@@ -74,57 +74,56 @@
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
+ MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- mRestrictedAppDetails = spy(new RestrictedAppDetails());
+ mContext = spy(RuntimeEnvironment.application);
+ mRestrictedAppDetails = spy(new RestrictedAppDetails());
- doReturn(mPreferenceManager).when(mRestrictedAppDetails).getPreferenceManager();
- doReturn(mContext).when(mPreferenceManager).getContext();
- mRestrictedAppDetails.mPackageManager = mPackageManager;
- mRestrictedAppDetails.mIconDrawableFactory = mIconDrawableFactory;
- mRestrictedAppDetails.mAppInfos = new ArrayList<>();
- mRestrictedAppDetails.mAppInfos.add(new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME)
- .build());
- mRestrictedAppDetails.mRestrictedAppListGroup = spy(new PreferenceCategory(mContext));
- mRestrictedAppDetails.mBatteryUtils = new BatteryUtils(mContext);
- doReturn(mPreferenceManager).when(
- mRestrictedAppDetails.mRestrictedAppListGroup).getPreferenceManager();
+ when(mRestrictedAppDetails.getPreferenceManager()).thenReturn(mPreferenceManager);
+ when(mPreferenceManager.getContext()).thenReturn(mContext);
+ mRestrictedAppDetails.mPackageManager = mPackageManager;
+ mRestrictedAppDetails.mIconDrawableFactory = mIconDrawableFactory;
+ mRestrictedAppDetails.mAppInfos = new ArrayList<>();
+ mRestrictedAppDetails.mAppInfos.add(new AppInfo.Builder()
+ .setPackageName(PACKAGE_NAME)
+ .build());
+ mRestrictedAppDetails.mRestrictedAppListGroup = spy(new PreferenceCategory(mContext));
+ mRestrictedAppDetails.mBatteryUtils = new BatteryUtils(mContext);
+ when(mRestrictedAppDetails.mRestrictedAppListGroup.getPreferenceManager())
+ .thenReturn(mPreferenceManager);
}
@Test
public void testRefreshUi_displayPreference() throws Exception {
- doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME, 0);
- doReturn(APP_NAME).when(mPackageManager).getApplicationLabel(mApplicationInfo);
+ doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME, 0);
+ doReturn(APP_NAME).when(mPackageManager).getApplicationLabel(mApplicationInfo);
- mRestrictedAppDetails.refreshUi();
+ mRestrictedAppDetails.refreshUi();
- assertThat(mRestrictedAppDetails.mRestrictedAppListGroup.getPreferenceCount()).isEqualTo(1);
- final Preference preference = mRestrictedAppDetails.mRestrictedAppListGroup.getPreference(
- 0);
- assertThat(preference.getKey()).isEqualTo(PACKAGE_NAME);
- assertThat(preference.getTitle()).isEqualTo(APP_NAME);
+ assertThat(mRestrictedAppDetails.mRestrictedAppListGroup.getPreferenceCount()).isEqualTo(1);
+ final Preference preference = mRestrictedAppDetails.mRestrictedAppListGroup.getPreference(0);
+ assertThat(preference.getKey()).isEqualTo(PACKAGE_NAME);
+ assertThat(preference.getTitle()).isEqualTo(APP_NAME);
}
@Test
public void testStartRestrictedAppDetails_startWithCorrectData() {
- final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
- doAnswer(invocation -> {
- // Get the intent in which it has the app info bundle
- mIntent = captor.getValue();
- return true;
- }).when(mSettingsActivity).startActivity(captor.capture());
+ final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+ doAnswer(invocation -> {
+ // Get the intent in which it has the app info bundle
+ mIntent = captor.getValue();
+ return true;
+ }).when(mSettingsActivity).startActivity(captor.capture());
- RestrictedAppDetails.startRestrictedAppDetails(mSettingsActivity, mFragment,
- mRestrictedAppDetails.mAppInfos);
+ RestrictedAppDetails.
+ startRestrictedAppDetails(mSettingsActivity, mFragment, mRestrictedAppDetails.mAppInfos);
- final Bundle bundle = mIntent.getBundleExtra(
- SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
- // Verify the bundle has the correct info
- final List<AppInfo> appInfos = bundle.getParcelableArrayList(
- RestrictedAppDetails.EXTRA_APP_INFO_LIST);
- assertThat(appInfos).hasSize(1);
- assertThat(appInfos.get(0).packageName).isEqualTo(PACKAGE_NAME);
+ final Bundle bundle = mIntent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+ // Verify the bundle has the correct info
+ final List<AppInfo> appInfos =
+ bundle.getParcelableArrayList(RestrictedAppDetails.EXTRA_APP_INFO_LIST);
+ assertThat(appInfos).isNotNull();
+ assertThat(appInfos).hasSize(1);
+ assertThat(appInfos.get(0).packageName).isEqualTo(PACKAGE_NAME);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
index cc5fb30..494d563 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
@@ -18,37 +18,34 @@
import static com.google.common.truth.Truth.assertThat;
-import android.content.Context;
+import android.content.ContentResolver;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
-import com.android.settings.TestConfig;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SmartBatteryPreferenceControllerTest {
+
private static final int ON = 1;
private static final int OFF = 0;
private SmartBatteryPreferenceController mController;
private SwitchPreference mPreference;
- private Context mContext;
+ private ContentResolver mContentResolver;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new SmartBatteryPreferenceController(mContext);
- mPreference = new SwitchPreference(mContext);
+ mContentResolver = RuntimeEnvironment.application.getContentResolver();
+ mController = new SmartBatteryPreferenceController(RuntimeEnvironment.application);
+ mPreference = new SwitchPreference(RuntimeEnvironment.application);
}
@Test
@@ -84,12 +81,10 @@
}
private void putSmartBatteryValue(int value) {
- Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.APP_STANDBY_ENABLED,
- value);
+ Settings.Global.putInt(mContentResolver, Settings.Global.APP_STANDBY_ENABLED, value);
}
private int getSmartBatteryValue() {
- return Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.APP_STANDBY_ENABLED, ON);
+ return Settings.Global.getInt(mContentResolver, Settings.Global.APP_STANDBY_ENABLED, ON);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
index 46db6b3..6b10345 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.anomaly;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
@@ -29,18 +28,16 @@
import android.util.KeyValueListParser;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.wrapper.KeyValueListParserWrapper;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AnomalyDetectionPolicyTest {
+
private static final String ANOMALY_DETECTION_CONSTANTS_VALUE =
"anomaly_detection_enabled=true"
+ ",wakelock_enabled=false"
@@ -83,8 +80,8 @@
doReturn(true).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(true));
doReturn(false).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(false));
- AnomalyDetectionPolicy anomalyDetectionPolicy = new AnomalyDetectionPolicy(mContext,
- mKeyValueListParserWrapper);
+ AnomalyDetectionPolicy anomalyDetectionPolicy =
+ new AnomalyDetectionPolicy(mContext, mKeyValueListParserWrapper);
assertThat(anomalyDetectionPolicy.anomalyDetectionEnabled).isFalse();
assertThat(anomalyDetectionPolicy.wakeLockDetectionEnabled).isFalse();
@@ -93,20 +90,17 @@
assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(10);
assertThat(anomalyDetectionPolicy.wakeupBlacklistedTags).isNull();
assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isFalse();
- assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(
- 30 * DateUtils.MINUTE_IN_MILLIS);
+ assertThat(anomalyDetectionPolicy.bluetoothScanThreshold)
+ .isEqualTo(30 * DateUtils.MINUTE_IN_MILLIS);
}
@Test
public void testIsAnomalyDetectorEnabled_usesConfigValues() {
- AnomalyDetectionPolicy anomalyDetectionPolicy = createAnomalyPolicyWithConfig();
+ AnomalyDetectionPolicy policy = createAnomalyPolicyWithConfig();
- assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
- Anomaly.AnomalyType.WAKE_LOCK)).isFalse();
- assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
- Anomaly.AnomalyType.WAKEUP_ALARM)).isTrue();
- assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
- Anomaly.AnomalyType.BLUETOOTH_SCAN)).isTrue();
+ assertThat(policy.isAnomalyDetectorEnabled(Anomaly.AnomalyType.WAKE_LOCK)).isFalse();
+ assertThat(policy.isAnomalyDetectorEnabled(Anomaly.AnomalyType.WAKEUP_ALARM)).isTrue();
+ assertThat(policy.isAnomalyDetectorEnabled(Anomaly.AnomalyType.BLUETOOTH_SCAN)).isTrue();
}
@Test
@@ -117,32 +111,27 @@
doReturn(true).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(true));
doReturn(false).when(mKeyValueListParserWrapper).getBoolean(anyString(), eq(false));
- AnomalyDetectionPolicy anomalyDetectionPolicy = new AnomalyDetectionPolicy(mContext,
+ AnomalyDetectionPolicy policy = new AnomalyDetectionPolicy(mContext,
mKeyValueListParserWrapper);
- assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
- Anomaly.AnomalyType.WAKE_LOCK)).isFalse();
- assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
- Anomaly.AnomalyType.WAKEUP_ALARM)).isFalse();
- assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
- Anomaly.AnomalyType.BLUETOOTH_SCAN)).isFalse();
+ assertThat(policy.isAnomalyDetectorEnabled(Anomaly.AnomalyType.WAKE_LOCK)).isFalse();
+ assertThat(policy.isAnomalyDetectorEnabled(Anomaly.AnomalyType.WAKEUP_ALARM)).isFalse();
+ assertThat(policy.isAnomalyDetectorEnabled(Anomaly.AnomalyType.BLUETOOTH_SCAN)).isFalse();
}
private AnomalyDetectionPolicy createAnomalyPolicyWithConfig() {
Settings.Global.putString(mContext.getContentResolver(),
Settings.Global.ANOMALY_DETECTION_CONSTANTS, ANOMALY_DETECTION_CONSTANTS_VALUE);
// Mock it to avoid noSuchMethodError
- doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
- AnomalyDetectionPolicy.KEY_ANOMALY_DETECTION_ENABLED, false);
- doReturn(false).when(mKeyValueListParserWrapper).getBoolean(
- AnomalyDetectionPolicy.KEY_WAKELOCK_DETECTION_ENABLED, false);
- doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
- AnomalyDetectionPolicy.KEY_WAKEUP_ALARM_DETECTION_ENABLED, false);
- doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
- AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);
+ doReturn(true).when(mKeyValueListParserWrapper)
+ .getBoolean(AnomalyDetectionPolicy.KEY_ANOMALY_DETECTION_ENABLED, false);
+ doReturn(false).when(mKeyValueListParserWrapper)
+ .getBoolean(AnomalyDetectionPolicy.KEY_WAKELOCK_DETECTION_ENABLED, false);
+ doReturn(true).when(mKeyValueListParserWrapper)
+ .getBoolean(AnomalyDetectionPolicy.KEY_WAKEUP_ALARM_DETECTION_ENABLED, false);
+ doReturn(true).when(mKeyValueListParserWrapper)
+ .getBoolean(AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);
return new AnomalyDetectionPolicy(mContext, mKeyValueListParserWrapper);
}
-
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java
index 80d8e44..831b07c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.anomaly;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -34,7 +33,6 @@
import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowRuntimePermissionPresenter;
import org.junit.Before;
@@ -49,9 +47,9 @@
import org.robolectric.util.FragmentTestUtil;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = ShadowRuntimePermissionPresenter.class)
+@Config(shadows = ShadowRuntimePermissionPresenter.class)
public class AnomalyDialogFragmentTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final String DISPLAY_NAME = "app";
private static final int UID = 111;
@@ -105,8 +103,8 @@
@Test
public void testOnCreateDialog_hasCorrectData() {
- mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeLockAnomaly,
- 0 /* metricskey */);
+ mAnomalyDialogFragment =
+ AnomalyDialogFragment.newInstance(mWakeLockAnomaly, 0 /* metricskey */);
FragmentTestUtil.startFragment(mAnomalyDialogFragment);
assertThat(mAnomalyDialogFragment.mAnomaly).isEqualTo(mWakeLockAnomaly);
@@ -114,12 +112,13 @@
@Test
public void testOnCreateDialog_wakelockAnomaly_fireForceStopDialog() {
- mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeLockAnomaly,
- 0 /* metricskey */);
+ mAnomalyDialogFragment =
+ AnomalyDialogFragment.newInstance(mWakeLockAnomaly, 0 /* metricskey */);
FragmentTestUtil.startFragment(mAnomalyDialogFragment);
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+ assertThat(dialog).isNotNull();
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getMessage()).isEqualTo(
@@ -134,12 +133,13 @@
@Test
public void testOnCreateDialog_wakeupAlarmAnomalyPriorO_fireStopAndBackgroundCheckDialog() {
- mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeupAlarmAnomaly,
- 0 /* metricskey */);
+ mAnomalyDialogFragment =
+ AnomalyDialogFragment.newInstance(mWakeupAlarmAnomaly, 0 /* metricskey */);
FragmentTestUtil.startFragment(mAnomalyDialogFragment);
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+ assertThat(dialog).isNotNull();
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getMessage()).isEqualTo(
@@ -155,12 +155,13 @@
@Test
public void testOnCreateDialog_wakeupAlarmAnomalyTargetingO_fireForceStopDialog() {
- mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeupAlarmAnomaly2,
- 0 /* metricskey */);
+ mAnomalyDialogFragment =
+ AnomalyDialogFragment.newInstance(mWakeupAlarmAnomaly2, 0 /* metricskey */);
FragmentTestUtil.startFragment(mAnomalyDialogFragment);
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+ assertThat(dialog).isNotNull();
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getMessage()).isEqualTo(
@@ -186,6 +187,7 @@
FragmentTestUtil.startFragment(mAnomalyDialogFragment);
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+ assertThat(dialog).isNotNull();
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getMessage()).isEqualTo(
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
index 469ad7c..e2febc1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
@@ -17,7 +17,6 @@
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.anyInt;
import static org.mockito.Matchers.anyString;
@@ -31,11 +30,10 @@
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.fuelgauge.anomaly.checker.BluetoothScanAnomalyDetector;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector;
import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
@@ -43,15 +41,13 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION
-)
public class AnomalyLoaderTest {
+
private static final String PACKAGE_NAME = "com.android.settings";
private static final CharSequence DISPLAY_NAME = "Settings";
private static final int UID = 0;
@@ -94,14 +90,14 @@
mWakeupAlarmAnomalies = new ArrayList<>();
mWakeupAlarmAnomaly = createAnomaly(Anomaly.AnomalyType.WAKEUP_ALARM);
mWakeupAlarmAnomalies.add(mWakeupAlarmAnomaly);
- doReturn(mWakeupAlarmAnomalies).when(mWakeupAlarmAnomalyDetector).detectAnomalies(any(),
- any());
+ doReturn(mWakeupAlarmAnomalies)
+ .when(mWakeupAlarmAnomalyDetector).detectAnomalies(any(), any());
mBluetoothScanAnomalies = new ArrayList<>();
mBluetoothScanAnomaly = createAnomaly(Anomaly.AnomalyType.BLUETOOTH_SCAN);
mBluetoothScanAnomalies.add(mBluetoothScanAnomaly);
- doReturn(mBluetoothScanAnomalies).when(mBluetoothScanAnomalyDetector).detectAnomalies(any(),
- any());
+ doReturn(mBluetoothScanAnomalies)
+ .when(mBluetoothScanAnomalyDetector).detectAnomalies(any(), any());
mAnomalyLoader = new AnomalyLoader(mContext, mBatteryStatsHelper, null,
mAnomalyDetectionPolicy);
@@ -120,8 +116,8 @@
List<Anomaly> anomalies = mAnomalyLoader.loadInBackground();
- assertThat(anomalies).containsExactly(mWakeLockAnomaly, mWakeupAlarmAnomaly,
- mBluetoothScanAnomaly);
+ assertThat(anomalies)
+ .containsExactly(mWakeLockAnomaly, mWakeupAlarmAnomaly, mBluetoothScanAnomaly);
}
private Anomaly createAnomaly(@Anomaly.AnomalyType int type) {
@@ -137,7 +133,7 @@
public void testGenerateFakeData() {
List<Anomaly> anomalies = mAnomalyLoader.generateFakeData();
- assertThat(anomalies).containsExactly(mWakeLockAnomaly, mWakeupAlarmAnomaly,
- mBluetoothScanAnomaly);
+ assertThat(anomalies)
+ .containsExactly(mWakeLockAnomaly, mWakeupAlarmAnomaly, mBluetoothScanAnomaly);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
index c0157ae..9b85981 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyPreferenceTest.java
@@ -21,18 +21,16 @@
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AnomalyPreferenceTest {
+
@Anomaly.AnomalyType
private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
private static final String PACKAGE_NAME = "com.android.app";
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
index f5c16b4..0ee94ba 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
@@ -29,7 +29,6 @@
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.SettingsRobolectricTestRunner;
@@ -39,14 +38,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AnomalySummaryPreferenceControllerTest {
+
@Anomaly.AnomalyType
private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
private static final String PACKAGE_NAME = "com.android.app";
@@ -148,5 +146,4 @@
.setDisplayName(DISPLAY_NAME)
.build();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java
index 13a5b31..be09c24 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.java
@@ -21,16 +21,14 @@
import android.os.Build;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AnomalyTest {
+
private static int TYPE = Anomaly.AnomalyType.WAKE_LOCK;
private static int UID = 111;
private static int SDK_VERSION = Build.VERSION_CODES.L;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
index 3e33823..fa79f65 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
@@ -17,20 +17,18 @@
package com.android.settings.fuelgauge.anomaly;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import android.os.Build;
import android.util.Pair;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.fuelgauge.anomaly.action.StopAndBackgroundCheckAction;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.anomaly.action.ForceStopAction;
+import com.android.settings.fuelgauge.anomaly.action.StopAndBackgroundCheckAction;
import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector;
-import com.android.settings.testutils.shadow.ShadowKeyValueListParserWrapperImpl;
import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowKeyValueListParserWrapperImpl;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
@@ -45,9 +43,9 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- ShadowKeyValueListParserWrapperImpl.class})
+@Config(shadows = ShadowKeyValueListParserWrapperImpl.class)
public class AnomalyUtilsTest {
+
private static final String PACKAGE_NAME_WAKEUP = "com.android.app1";
private static final String PACKAGE_NAME_WAKELOCK = "com.android.app2";
private static final int CONTEXT_ID = 55;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.java
index 4fc561d..226be10 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.java
@@ -24,7 +24,6 @@
import android.util.Pair;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,11 +34,10 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AnomalyActionTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final int UID = 111;
private static final int ACTION_KEY = 2;
@@ -48,7 +46,7 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
- private AppOpsManager mAppOpsManagerr;
+ private AppOpsManager mAppOpsManager;
private Anomaly mAnomaly;
private TestAnomalyAction mTestAnomalyAction;
private FakeFeatureFactory mFeatureFactory;
@@ -58,12 +56,9 @@
MockitoAnnotations.initMocks(this);
mFeatureFactory = FakeFeatureFactory.setupForTest();
- doReturn(mAppOpsManagerr).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
+ doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
- mAnomaly = new Anomaly.Builder()
- .setUid(UID)
- .setPackageName(PACKAGE_NAME)
- .build();
+ mAnomaly = new Anomaly.Builder().setUid(UID).setPackageName(PACKAGE_NAME).build();
mTestAnomalyAction = new TestAnomalyAction(mContext);
}
@@ -75,11 +70,8 @@
Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, METRIC_KEY));
}
- /**
- * Test class for {@link AnomalyAction}
- */
- public class TestAnomalyAction extends AnomalyAction {
- public TestAnomalyAction(Context context) {
+ private class TestAnomalyAction extends AnomalyAction {
+ private TestAnomalyAction(Context context) {
super(context);
mActionMetricKey = ACTION_KEY;
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
index 60d9984..20b5486 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java
@@ -24,7 +24,6 @@
import android.content.Context;
import android.os.Build;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -36,11 +35,10 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BackgroundCheckActionTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final int UID = 111;
private static final int SDK_VERSION = Build.VERSION_CODES.L;
@@ -80,16 +78,16 @@
@Test
public void testIsActionActive_modeAllowed_returnTrue() {
- doReturn(false).when(mBatteryUtils).isBackgroundRestrictionEnabled(SDK_VERSION, UID,
- PACKAGE_NAME);
+ doReturn(false).when(mBatteryUtils)
+ .isBackgroundRestrictionEnabled(SDK_VERSION, UID, PACKAGE_NAME);
assertThat(mBackgroundCheckAction.isActionActive(mAnomaly)).isTrue();
}
@Test
public void testIsActionActive_modeIgnored_returnFalse() {
- doReturn(true).when(mBatteryUtils).isBackgroundRestrictionEnabled(SDK_VERSION, UID,
- PACKAGE_NAME);
+ doReturn(true).when(mBatteryUtils)
+ .isBackgroundRestrictionEnabled(SDK_VERSION, UID, PACKAGE_NAME);
assertThat(mBackgroundCheckAction.isActionActive(mAnomaly)).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java
index 48d3957..49c679b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java
@@ -25,7 +25,6 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,11 +35,10 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ForceStopActionTest {
+
private static final String PACKAGE_NAME = "com.android.app";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -61,12 +59,10 @@
FakeFeatureFactory.setupForTest();
doReturn(mActivityManager).when(mContext).getSystemService(Context.ACTIVITY_SERVICE);
doReturn(mPackageManager).when(mContext).getPackageManager();
- doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME,
- PackageManager.GET_META_DATA);
+ doReturn(mApplicationInfo).when(mPackageManager)
+ .getApplicationInfo(PACKAGE_NAME, PackageManager.GET_META_DATA);
- mAnomaly = new Anomaly.Builder()
- .setPackageName(PACKAGE_NAME)
- .build();
+ mAnomaly = new Anomaly.Builder().setPackageName(PACKAGE_NAME).build();
mForceStopAction = new ForceStopAction(mContext);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
index 964236b..711fa11 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
@@ -22,7 +22,6 @@
import android.content.Context;
import android.content.pm.PackageManager;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,9 +36,9 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
- ShadowPermissionChecker.class)
+@Config(shadows = ShadowPermissionChecker.class)
public class LocationCheckActionTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final int UID = 12345;
@@ -81,5 +80,4 @@
public void testIsActionActive_noLocationGranted_returnFalse() {
assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isFalse();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java
index e607bad..f49395b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java
@@ -22,7 +22,6 @@
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,11 +32,10 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StopAndBackgroundActionTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final int UID = 111;
private static final int METRICS_KEY = 3;
@@ -54,10 +52,7 @@
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- mAnomaly = new Anomaly.Builder()
- .setUid(UID)
- .setPackageName(PACKAGE_NAME)
- .build();
+ mAnomaly = new Anomaly.Builder().setUid(UID).setPackageName(PACKAGE_NAME).build();
FakeFeatureFactory.setupForTest();
mStopAndBackgroundCheckAction = new StopAndBackgroundCheckAction(mContext, mForceStopAction,
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java
index edf026a..61cf694 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java
@@ -17,13 +17,13 @@
package com.android.settings.fuelgauge.anomaly.checker;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.BatteryStats;
@@ -31,7 +31,6 @@
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
@@ -45,15 +44,14 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothScanAnomalyDetectorTest {
+
private static final String TARGET_PACKAGE_NAME = "com.android.app";
private static final int ANOMALY_UID = 111;
private static final int NORMAL_UID = 222;
@@ -107,7 +105,7 @@
mUsageList.add(mAnomalySipper);
mUsageList.add(mNormalSipper);
mUsageList.add(mTargetSipper);
- doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
+ when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
mBluetoothScanAnomalyDetector = spy(new BluetoothScanAnomalyDetector(mContext, mPolicy,
mAnomalyUtils));
@@ -132,8 +130,8 @@
final Anomaly anomaly = createBluetoothAnomaly(ANOMALY_UID);
final Anomaly targetAnomaly = createBluetoothAnomaly(TARGET_UID);
- List<Anomaly> mAnomalies = mBluetoothScanAnomalyDetector.detectAnomalies(
- mBatteryStatsHelper);
+ List<Anomaly> mAnomalies =
+ mBluetoothScanAnomalyDetector.detectAnomalies(mBatteryStatsHelper);
assertThat(mAnomalies).containsExactly(anomaly, targetAnomaly);
}
@@ -143,11 +141,10 @@
doReturn(TARGET_UID).when(mBatteryUtils).getPackageUid(TARGET_PACKAGE_NAME);
final Anomaly targetAnomaly = createBluetoothAnomaly(TARGET_UID);
- List<Anomaly> mAnomalies = mBluetoothScanAnomalyDetector.detectAnomalies(
- mBatteryStatsHelper, TARGET_PACKAGE_NAME);
+ List<Anomaly> mAnomalies =
+ mBluetoothScanAnomalyDetector.detectAnomalies(mBatteryStatsHelper, TARGET_PACKAGE_NAME);
assertThat(mAnomalies).containsExactly(targetAnomaly);
-
}
private Anomaly createBluetoothAnomaly(int uid) {
@@ -157,5 +154,4 @@
.setBluetoothScanningTimeMs(ANOMALY_BLUETOOTH_SCANNING_TIME)
.build();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java
index d7682ea..b70dcaf 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.anomaly.checker;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -25,6 +24,7 @@
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -34,13 +34,12 @@
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
+import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
@@ -48,15 +47,14 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WakeLockAnomalyDetectorTest {
+
private static final String TARGET_PACKAGE_NAME = "com.android.app";
private static final long ANOMALY_WAKELOCK_TIME_MS = 2 * DateUtils.HOUR_IN_MILLIS;
private static final long NORMAL_WAKELOCK_TIME_MS = DateUtils.SECOND_IN_MILLIS;
@@ -112,40 +110,40 @@
doReturn(false).when(mBatteryUtils).shouldHideSipper(nullable(BatterySipper.class));
doReturn(mPackageManager).when(mContext).getPackageManager();
doReturn(mApplicationInfo).when(mPackageManager)
- .getApplicationInfo(nullable(String.class), anyInt());
+ .getApplicationInfo(nullable(String.class), anyInt());
doReturn(true).when(mAnomalyAction).isActionActive(any());
doReturn(mAnomalyAction).when(mAnomalyUtils).getAnomalyAction(any());
- mWakelockAnomalyDetector = spy(
- new WakeLockAnomalyDetector(mContext, mPolicy, mAnomalyUtils));
+ mWakelockAnomalyDetector =
+ spy(new WakeLockAnomalyDetector(mContext, mPolicy, mAnomalyUtils));
mWakelockAnomalyDetector.mBatteryUtils = mBatteryUtils;
mAnomalySipper.uidObj = mAnomalyUid;
doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
- .getBackgroundTotalDurationMs(eq(mAnomalyUid), anyLong());
- doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector).getCurrentDurationMs(
- eq(mAnomalyUid), anyLong());
+ .getBackgroundTotalDurationMs(eq(mAnomalyUid), anyLong());
+ doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
+ .getCurrentDurationMs(eq(mAnomalyUid), anyLong());
doReturn(ANOMALY_UID).when(mAnomalyUid).getUid();
mNormalSipper.uidObj = mNormalUid;
doReturn(NORMAL_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
- .getBackgroundTotalDurationMs(eq(mNormalUid), anyLong());
- doReturn(0L).when(mWakelockAnomalyDetector).getCurrentDurationMs(eq(mNormalUid),
- anyLong());
+ .getBackgroundTotalDurationMs(eq(mNormalUid), anyLong());
+ doReturn(0L).when(mWakelockAnomalyDetector)
+ .getCurrentDurationMs(eq(mNormalUid), anyLong());
doReturn(NORMAL_UID).when(mNormalUid).getUid();
mTargetSipper.uidObj = mTargetUid;
doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
- .getBackgroundTotalDurationMs(eq(mTargetUid), anyLong());
- doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector).getCurrentDurationMs(
- eq(mTargetUid), anyLong());
+ .getBackgroundTotalDurationMs(eq(mTargetUid), anyLong());
+ doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
+ .getCurrentDurationMs(eq(mTargetUid), anyLong());
doReturn(TARGET_UID).when(mTargetUid).getUid();
mInactiveSipper.uidObj = mInactiveUid;
doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
- .getBackgroundTotalDurationMs(eq(mInactiveUid), anyLong());
- doReturn(0L).when(mWakelockAnomalyDetector).getCurrentDurationMs(eq(mInactiveUid),
- anyLong());
+ .getBackgroundTotalDurationMs(eq(mInactiveUid), anyLong());
+ doReturn(0L).when(mWakelockAnomalyDetector)
+ .getCurrentDurationMs(eq(mInactiveUid), anyLong());
doReturn(INACTIVE_UID).when(mInactiveUid).getUid();
mUsageList = new ArrayList<>();
@@ -153,7 +151,7 @@
mUsageList.add(mNormalSipper);
mUsageList.add(mTargetSipper);
mUsageList.add(mInactiveSipper);
- doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
+ when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
mAnomaly = createWakeLockAnomaly(ANOMALY_UID);
mTargetAnomaly = createWakeLockAnomaly(TARGET_UID);
@@ -172,8 +170,8 @@
public void testDetectAnomalies_containsTargetPackage_detectIt() {
doReturn(TARGET_UID).when(mBatteryUtils).getPackageUid(TARGET_PACKAGE_NAME);
- List<Anomaly> mAnomalies = mWakelockAnomalyDetector.detectAnomalies(mBatteryStatsHelper,
- TARGET_PACKAGE_NAME);
+ List<Anomaly> mAnomalies =
+ mWakelockAnomalyDetector.detectAnomalies(mBatteryStatsHelper, TARGET_PACKAGE_NAME);
assertThat(mAnomalies).containsExactly(mTargetAnomaly);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
index dafcab3..789b80b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java
@@ -17,12 +17,12 @@
package com.android.settings.fuelgauge.anomaly.checker;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.BatteryStats;
@@ -33,13 +33,12 @@
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
+import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
@@ -47,7 +46,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
@@ -55,8 +53,8 @@
import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WakeupAlarmAnomalyDetectorTest {
+
private static final String TARGET_PACKAGE_NAME = "com.android.target";
private static final String ANOMALY_PACKAGE_NAME = "com.android.anomaly";
private static final boolean TARGET_BACKGROUND_RESTRICTION_ON = false;
@@ -118,8 +116,8 @@
ReflectionHelpers.setField(mPolicy, "wakeupBlacklistedTags", blacklistedTags);
doReturn(false).when(mBatteryUtils).shouldHideSipper(any());
- doReturn(RUNNING_TIME_MS).when(mBatteryUtils).calculateRunningTimeBasedOnStatsType(any(),
- anyInt());
+ doReturn(RUNNING_TIME_MS).when(mBatteryUtils)
+ .calculateRunningTimeBasedOnStatsType(any(), anyInt());
doReturn(true).when(mAnomalyAction).isActionActive(any());
doReturn(mAnomalyAction).when(mAnomalyUtils).getAnomalyAction(any());
@@ -134,7 +132,7 @@
mUsageList.add(mAnomalySipper);
mUsageList.add(mNormalSipper);
mUsageList.add(mTargetSipper);
- doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
+ when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
doReturn(TARGET_PACKAGE_NAME).when(mBatteryUtils).getPackageName(TARGET_UID);
doReturn(ANOMALY_PACKAGE_NAME).when(mBatteryUtils).getPackageName(ANOMALY_UID);
@@ -162,20 +160,20 @@
.setWakeupAlarmCount(ANOMALY_WAKEUP_FREQUENCY)
.build();
- mWakeupAlarmAnomalyDetector = spy(
- new WakeupAlarmAnomalyDetector(mContext, mPolicy, mAnomalyUtils));
+ mWakeupAlarmAnomalyDetector =
+ spy(new WakeupAlarmAnomalyDetector(mContext, mPolicy, mAnomalyUtils));
mWakeupAlarmAnomalyDetector.mBatteryUtils = mBatteryUtils;
}
@Test
public void testDetectAnomalies_containsAnomaly_detectIt() {
doReturn(-1).when(mBatteryUtils).getPackageUid(nullable(String.class));
- doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
- mAnomalyUid);
- doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
- mTargetUid);
- doReturn(NORMAL_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
- mNormalUid);
+ doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector)
+ .getWakeupAlarmCountFromUid(mAnomalyUid);
+ doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector)
+ .getWakeupAlarmCountFromUid(mTargetUid);
+ doReturn(NORMAL_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector)
+ .getWakeupAlarmCountFromUid(mNormalUid);
List<Anomaly> mAnomalies = mWakeupAlarmAnomalyDetector.detectAnomalies(mBatteryStatsHelper);
@@ -185,15 +183,15 @@
@Test
public void testDetectAnomalies_detectTargetAnomaly_detectIt() {
doReturn(TARGET_UID).when(mBatteryUtils).getPackageUid(TARGET_PACKAGE_NAME);
- doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
- mAnomalyUid);
- doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
- mTargetUid);
- doReturn(NORMAL_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector).getWakeupAlarmCountFromUid(
- mNormalUid);
+ doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector)
+ .getWakeupAlarmCountFromUid(mAnomalyUid);
+ doReturn(ANOMALY_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector)
+ .getWakeupAlarmCountFromUid(mTargetUid);
+ doReturn(NORMAL_WAKEUP_COUNT).when(mWakeupAlarmAnomalyDetector)
+ .getWakeupAlarmCountFromUid(mNormalUid);
- List<Anomaly> mAnomalies = mWakeupAlarmAnomalyDetector.detectAnomalies(mBatteryStatsHelper,
- TARGET_PACKAGE_NAME);
+ List<Anomaly> mAnomalies = mWakeupAlarmAnomalyDetector
+ .detectAnomalies(mBatteryStatsHelper, TARGET_PACKAGE_NAME);
assertThat(mAnomalies).containsExactly(mTargetAnomaly);
}
@@ -209,8 +207,8 @@
alarms.put("1", mCounter);
alarms.put("2", mCounter);
- assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid)).isEqualTo(
- 2 * NORMAL_WAKEUP_COUNT);
+ assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid))
+ .isEqualTo(2 * NORMAL_WAKEUP_COUNT);
}
@Test
@@ -225,7 +223,7 @@
alarms.put("allowedTag", mCounter);
alarms.put("blacklistedTag", mCounter2);
- assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid)).isEqualTo(
- NORMAL_WAKEUP_COUNT);
+ assertThat(mWakeupAlarmAnomalyDetector.getWakeupAlarmCountFromUid(mAnomalyUid))
+ .isEqualTo(NORMAL_WAKEUP_COUNT);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java
index af0f855..e95868a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java
@@ -23,7 +23,6 @@
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -35,8 +34,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
- SettingsShadowResources.class)
+@Config(shadows = SettingsShadowResources.class)
public class AutoBatterySaverPreferenceControllerTest {
private AutoBatterySaverPreferenceController mController;
@@ -92,5 +90,4 @@
public void testIsChecked_useDefaultValue_returnTrue() {
assertThat(mController.isChecked()).isTrue();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
index d3c2752..d2c052a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
@@ -20,9 +20,7 @@
import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.widget.SeekBarPreference;
@@ -36,9 +34,9 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
- SettingsShadowResources.class)
+@Config(shadows = SettingsShadowResources.class)
public class AutoBatterySeekBarPreferenceControllerTest {
+
private static final int TRIGGER_LEVEL = 20;
private static final int DEFAULT_LEVEL = 15;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
index 29f924f..14f6533 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
@@ -17,12 +17,9 @@
package com.android.settings.fuelgauge.batterysaver;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyString;
-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.arch.lifecycle.LifecycleOwner;
import android.content.Context;
@@ -32,7 +29,6 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.TwoStateButtonPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,21 +39,20 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPowerManager;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = com.android.settings.testutils.shadow.ShadowPowerManager.class)
+@Config(shadows = ShadowPowerManager.class)
public class BatterySaverButtonPreferenceControllerTest {
+
private BatterySaverButtonPreferenceController mController;
private Context mContext;
private Lifecycle mLifecycle;
private LifecycleOwner mLifecycleOwner;
private Button mButtonOn;
private Button mButtonOff;
- private ShadowPowerManager mShadowPowerManager;
+ private PowerManager mPowerManager;
@Mock
private TwoStateButtonPreference mPreference;
@Mock
@@ -70,8 +65,7 @@
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
mContext = spy(RuntimeEnvironment.application);
- PowerManager powerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
- mShadowPowerManager = Shadows.shadowOf(powerManager);
+ mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
doReturn(mPreference).when(mPreferenceScreen).findPreference(anyString());
mButtonOn = new Button(mContext);
@@ -87,7 +81,7 @@
@Test
public void testUpdateState_lowPowerOn_displayButtonOff() {
- mShadowPowerManager.setIsPowerSaveMode(true);
+ mPowerManager.setPowerSaveMode(true);
mController.updateState(mPreference);
@@ -97,7 +91,7 @@
@Test
public void testUpdateState_lowPowerOff_displayButtonOn() {
- mShadowPowerManager.setIsPowerSaveMode(false);
+ mPowerManager.setPowerSaveMode(false);
mController.updateState(mPreference);
@@ -109,13 +103,13 @@
public void testOnClick_clickButtonOn_setPowerSaveMode() {
mController.onClick(mButtonOn);
- assertThat(mShadowPowerManager.isPowerSaveMode()).isTrue();
+ assertThat(mPowerManager.isPowerSaveMode()).isTrue();
}
@Test
public void testOnClick_clickButtonOff_clearPowerSaveMode() {
mController.onClick(mButtonOff);
- assertThat(mShadowPowerManager.isPowerSaveMode()).isFalse();
+ assertThat(mPowerManager.isPowerSaveMode()).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
index 4682d15..0e7fbc5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.batterytip;
import static com.google.common.truth.Truth.assertThat;
-
import static org.junit.Assert.assertEquals;
import static org.robolectric.RuntimeEnvironment.application;
@@ -25,7 +24,6 @@
import android.app.job.JobScheduler;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -33,14 +31,12 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowJobScheduler;
import java.util.List;
import java.util.concurrent.TimeUnit;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AnomalyCleanupJobServiceTest {
@Before
public void setUp() {
@@ -51,8 +47,8 @@
public void testScheduleCleanUp() {
AnomalyCleanupJobService.scheduleCleanUp(application);
- ShadowJobScheduler shadowJobScheduler = Shadows.shadowOf(
- application.getSystemService(JobScheduler.class));
+ ShadowJobScheduler shadowJobScheduler =
+ Shadows.shadowOf(application.getSystemService(JobScheduler.class));
List<JobInfo> pendingJobs = shadowJobScheduler.getAllPendingJobs();
assertEquals(1, pendingJobs.size());
JobInfo pendingJob = pendingJobs.get(0);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
index 48c99c5..77e51b1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
@@ -17,8 +17,6 @@
package com.android.settings.fuelgauge.batterytip;
import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertEquals;
import static org.robolectric.RuntimeEnvironment.application;
import android.app.job.JobInfo;
@@ -26,34 +24,30 @@
import android.content.Intent;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowJobScheduler;
import java.util.List;
import java.util.concurrent.TimeUnit;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AnomalyDetectionJobServiceTest {
@Test
public void testScheduleCleanUp() {
- AnomalyDetectionJobService.scheduleAnomalyDetection(application,
- new Intent());
+ AnomalyDetectionJobService.scheduleAnomalyDetection(application, new Intent());
- ShadowJobScheduler shadowJobScheduler = Shadows.shadowOf(
- application.getSystemService(JobScheduler.class));
+ ShadowJobScheduler shadowJobScheduler =
+ Shadows.shadowOf(application.getSystemService(JobScheduler.class));
List<JobInfo> pendingJobs = shadowJobScheduler.getAllPendingJobs();
assertThat(pendingJobs).hasSize(1);
JobInfo pendingJob = pendingJobs.get(0);
assertThat(pendingJob.getId()).isEqualTo(R.id.job_anomaly_detection);
- assertThat(pendingJob.getMaxExecutionDelayMillis()).isEqualTo(
- TimeUnit.MINUTES.toMillis(30));
+ assertThat(pendingJob.getMaxExecutionDelayMillis())
+ .isEqualTo(TimeUnit.MINUTES.toMillis(30));
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
index 16b45df..155351a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
@@ -21,22 +21,20 @@
import android.os.Parcel;
import android.text.format.DateUtils;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppInfoTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final int ANOMALY_TYPE = Anomaly.AnomalyType.WAKE_LOCK;
private static final long SCREEN_TIME_MS = DateUtils.HOUR_IN_MILLIS;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
index ec72384..a3dabba 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.batterytip;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.robolectric.Shadows.shadowOf;
@@ -26,7 +25,6 @@
import android.text.format.DateUtils;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
@@ -39,6 +37,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowAlertDialog;
@@ -49,9 +48,9 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = ShadowUtils.class)
+@Config(shadows = ShadowUtils.class)
public class BatteryTipDialogFragmentTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final String DISPLAY_NAME = "app";
private static final long SCREEN_TIME_MS = DateUtils.HOUR_IN_MILLIS;
@@ -91,15 +90,19 @@
@Test
public void testOnCreateDialog_highUsageTip_fireHighUsageDialog() {
+ Robolectric.getForegroundThreadScheduler().pause();
+
mDialogFragment = BatteryTipDialogFragment.newInstance(mHighUsageTip);
FragmentTestUtil.startFragment(mDialogFragment);
+ Robolectric.getForegroundThreadScheduler().advanceToLastPostedRunnable();
+
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
ShadowAlertDialog shadowDialog = shadowOf(dialog);
- assertThat(shadowDialog.getMessage()).isEqualTo(
- mContext.getString(R.string.battery_tip_dialog_message, "1h"));
+ assertThat(shadowDialog.getMessage())
+ .isEqualTo(mContext.getString(R.string.battery_tip_dialog_message, "1h"));
}
@Test
@@ -112,22 +115,26 @@
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getTitle()).isEqualTo("Restrict app?");
- assertThat(shadowDialog.getMessage()).isEqualTo(
- mContext.getString(R.string.battery_tip_restrict_app_dialog_message));
+ assertThat(shadowDialog.getMessage())
+ .isEqualTo(mContext.getString(R.string.battery_tip_restrict_app_dialog_message));
}
@Test
public void testOnCreateDialog_restrictAppsTip_fireRestrictAppsDialog() {
+ Robolectric.getForegroundThreadScheduler().pause();
+
mDialogFragment = BatteryTipDialogFragment.newInstance(mRestrictAppsTip);
FragmentTestUtil.startFragment(mDialogFragment);
+ Robolectric.getForegroundThreadScheduler().advanceToLastPostedRunnable();
+
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getTitle()).isEqualTo("Restrict 2 apps?");
- assertThat(shadowDialog.getMessage()).isEqualTo(
- mContext.getString(R.string.battery_tip_restrict_app_dialog_message));
+ assertThat(shadowDialog.getMessage())
+ .isEqualTo(mContext.getString(R.string.battery_tip_restrict_app_dialog_message));
assertThat(shadowDialog.getView()).isNotNull();
}
@@ -142,9 +149,7 @@
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getTitle()).isEqualTo("Remove restriction for app?");
- assertThat(shadowDialog.getMessage()).isEqualTo(
- mContext.getString(R.string.battery_tip_unrestrict_app_dialog_message));
+ assertThat(shadowDialog.getMessage())
+ .isEqualTo(mContext.getString(R.string.battery_tip_unrestrict_app_dialog_message));
}
-
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
index c044a14..b50cc40 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.batterytip;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -27,10 +26,8 @@
import android.os.PowerManager;
import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.BatteryInfo;
import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.fuelgauge.batterytip.detectors.BatteryTipDetector;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,14 +38,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryTipLoaderTest {
+
private static final int[] TIP_ORDER = {
BatteryTip.TipType.APP_RESTRICTION,
BatteryTip.TipType.BATTERY_SAVER,
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
index 188fe77..c52b73e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
@@ -18,26 +18,20 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
import android.content.Context;
import android.provider.Settings;
import android.text.format.DateUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryTipPolicyTest {
+
private static final String BATTERY_TIP_CONSTANTS_VALUE = "battery_tip_enabled=true"
+ ",summary_enabled=false"
+ ",battery_saver_tip_enabled=false"
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
index 66be3e2..b5cb173 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
@@ -15,16 +15,14 @@
*/
package com.android.settings.fuelgauge.batterytip;
-import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType
- .SMART_BATTERY_MANAGER;
-
+import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType.SMART_BATTERY_MANAGER;
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 static org.mockito.Mockito.when;
import android.content.Context;
import android.support.v7.preference.Preference;
@@ -35,7 +33,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.SummaryTip;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -48,14 +45,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryTipPreferenceControllerTest {
+
private static final String KEY_PREF = "battery_tip";
private static final String KEY_TIP = "key_battery_tip";
@Mock
@@ -83,8 +79,8 @@
mContext = RuntimeEnvironment.application;
mPreferenceGroup = spy(new PreferenceCategory(mContext));
- doReturn(mContext).when(mPreferenceScreen).getContext();
- doReturn(mPreferenceManager).when(mPreferenceGroup).getPreferenceManager();
+ when(mPreferenceScreen.getContext()).thenReturn(mContext);
+ when(mPreferenceGroup.getPreferenceManager()).thenReturn(mPreferenceManager);
doReturn(mPreferenceGroup).when(mPreferenceScreen).findPreference(KEY_PREF);
mPreference = new Preference(mContext);
mPreference.setKey(KEY_TIP);
@@ -130,7 +126,7 @@
@Test
public void testHandlePreferenceTreeClick_noDialog_invokeCallback() {
- doReturn(SMART_BATTERY_MANAGER).when(mBatteryTip).getType();
+ when(mBatteryTip.getType()).thenReturn(SMART_BATTERY_MANAGER);
List<BatteryTip> batteryTips = new ArrayList<>();
batteryTips.add(mBatteryTip);
doReturn(mPreference).when(mBatteryTip).buildPreference(any());
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
index c7865d8..c731a2e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
@@ -17,12 +17,11 @@
package com.android.settings.fuelgauge.batterytip;
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 com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.fuelgauge.batterytip.actions.OpenRestrictAppFragmentAction;
import com.android.settings.fuelgauge.batterytip.actions.RestrictAppAction;
@@ -37,13 +36,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryTipUtilsTest {
+
@Mock
private SettingsActivity mSettingsActivity;
@Mock
@@ -61,7 +59,7 @@
@Test
public void testGetActionForBatteryTip_typeRestrictStateNew_returnActionRestrict() {
- doReturn(BatteryTip.StateType.NEW).when(mRestrictAppTip).getState();
+ when(mRestrictAppTip.getState()).thenReturn(BatteryTip.StateType.NEW);
assertThat(BatteryTipUtils.getActionForBatteryTip(mRestrictAppTip, mSettingsActivity,
mFragment)).isInstanceOf(RestrictAppAction.class);
@@ -69,10 +67,9 @@
@Test
public void testGetActionForBatteryTip_typeRestrictStateHandled_returnActionOpen() {
- doReturn(BatteryTip.StateType.HANDLED).when(mRestrictAppTip).getState();
+ when(mRestrictAppTip.getState()).thenReturn(BatteryTip.StateType.HANDLED);
assertThat(BatteryTipUtils.getActionForBatteryTip(mRestrictAppTip, mSettingsActivity,
mFragment)).isInstanceOf(OpenRestrictAppFragmentAction.class);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
index fdac12e..3569d7d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/HighUsageDataParserTest.java
@@ -19,22 +19,19 @@
import static com.google.common.truth.Truth.assertThat;
import android.os.BatteryStats;
-import android.text.format.DateUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.time.Duration;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HighUsageDataParserTest {
+
private static final long PERIOD_ONE_MINUTE_MS = Duration.ofMinutes(1).toMillis();
private static final long PERIOD_ONE_HOUR_MS = Duration.ofHours(1).toMillis();
private static final long END_TIME_MS = 2 * PERIOD_ONE_MINUTE_MS;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
index 728bbff..8934dfa 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java
@@ -20,9 +20,7 @@
import static org.mockito.Mockito.verify;
import android.app.AppOpsManager;
-import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
@@ -37,53 +35,45 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RestrictAppActionTest {
+
private static final String PACKAGE_NAME_1 = "com.android.app1";
private static final String PACKAGE_NAME_2 = "com.android.app2";
@Mock
private BatteryUtils mBatteryUtils;
- private Context mContext;
private RestrictAppAction mRestrictAppAction;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
final List<AppInfo> mAppInfos = new ArrayList<>();
- mAppInfos.add(new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME_1)
- .build());
- mAppInfos.add(new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME_2)
- .build());
+ mAppInfos.add(new AppInfo.Builder().setPackageName(PACKAGE_NAME_1).build());
+ mAppInfos.add(new AppInfo.Builder().setPackageName(PACKAGE_NAME_2).build());
- mRestrictAppAction = new RestrictAppAction(mContext, new RestrictAppTip(
- BatteryTip.StateType.NEW, mAppInfos));
+ mRestrictAppAction = new RestrictAppAction(RuntimeEnvironment.application,
+ new RestrictAppTip(BatteryTip.StateType.NEW, mAppInfos));
mRestrictAppAction.mBatteryUtils = mBatteryUtils;
}
@After
public void cleanUp() {
- DatabaseTestUtils.clearDb(mContext);
+ DatabaseTestUtils.clearDb(RuntimeEnvironment.application);
}
@Test
public void testHandlePositiveAction() {
mRestrictAppAction.handlePositiveAction();
- verify(mBatteryUtils).setForceAppStandby(anyInt(), eq(PACKAGE_NAME_1),
- eq(AppOpsManager.MODE_IGNORED));
- verify(mBatteryUtils).setForceAppStandby(anyInt(), eq(PACKAGE_NAME_2),
- eq(AppOpsManager.MODE_IGNORED));
+ verify(mBatteryUtils)
+ .setForceAppStandby(anyInt(), eq(PACKAGE_NAME_1), eq(AppOpsManager.MODE_IGNORED));
+ verify(mBatteryUtils)
+ .setForceAppStandby(anyInt(), eq(PACKAGE_NAME_2), eq(AppOpsManager.MODE_IGNORED));
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
index ace6da9..ec9b5d5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -27,7 +26,6 @@
import android.os.BatteryManager;
import android.os.PowerManager;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,12 +36,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EarlyWarningDetectorTest {
+
private Context mContext;
private BatteryTipPolicy mPolicy;
private EarlyWarningDetector mEarlyWarningDetector;
@@ -63,8 +60,8 @@
doReturn(mIntent).when(mContext).registerReceiver(any(), any());
doReturn(0).when(mIntent).getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
- doReturn(true).when(mFakeFeatureFactory.powerUsageFeatureProvider).getEarlyWarningSignal(
- any(), any());
+ doReturn(true).when(mFakeFeatureFactory.powerUsageFeatureProvider)
+ .getEarlyWarningSignal(any(), any());
mEarlyWarningDetector = new EarlyWarningDetector(mPolicy, mContext);
}
@@ -92,10 +89,9 @@
@Test
public void testDetect_noEarlyWarning_tipInvisible() {
- doReturn(false).when(mFakeFeatureFactory.powerUsageFeatureProvider).getEarlyWarningSignal(
- any(), any());
+ doReturn(false).when(mFakeFeatureFactory.powerUsageFeatureProvider)
+ .getEarlyWarningSignal(any(), any());
assertThat(mEarlyWarningDetector.detect().isVisible()).isFalse();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
index 8df7c56..7dbad7a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
@@ -17,11 +17,10 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.BatteryStats;
@@ -29,8 +28,6 @@
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.TestConfig;
-import com.android.settings.fuelgauge.BatteryInfo;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
import com.android.settings.fuelgauge.batterytip.HighUsageDataParser;
@@ -42,15 +39,14 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HighUsageDetectorTest {
+
private Context mContext;
@Mock
private BatteryStatsHelper mBatteryStatsHelper;
@@ -90,7 +86,7 @@
@Test
public void testDetect_containsHighUsageApp_tipVisible() {
doReturn(true).when(mDataParser).isDeviceHeavilyUsed();
- doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
+ when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
doReturn(DateUtils.HOUR_IN_MILLIS).when(mBatteryUtils).getProcessTimeMs(
BatteryUtils.StatusType.FOREGROUND, mBatterySipper.uidObj,
BatteryStats.STATS_SINCE_CHARGED);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
index d953b7c..1f4affa 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
@@ -17,13 +17,10 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
-import android.content.Context;
import android.text.format.DateUtils;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.BatteryInfo;
import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,13 +31,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LowBatteryDetectorTest {
- private Context mContext;
+
@Mock
private BatteryInfo mBatteryInfo;
private BatteryTipPolicy mPolicy;
@@ -50,8 +45,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mPolicy = spy(new BatteryTipPolicy(mContext));
+ mPolicy = spy(new BatteryTipPolicy(RuntimeEnvironment.application));
ReflectionHelpers.setField(mPolicy, "lowBatteryEnabled", true);
mLowBatteryDetector = new LowBatteryDetector(mPolicy, mBatteryInfo);
@@ -67,7 +61,7 @@
@Test
public void testDetect_shortBatteryLife_tipVisible() {
mBatteryInfo.discharging = true;
- mBatteryInfo.remainingTimeUs = 1 * DateUtils.MINUTE_IN_MILLIS;
+ mBatteryInfo.remainingTimeUs = DateUtils.MINUTE_IN_MILLIS;
assertThat(mLowBatteryDetector.detect().isVisible()).isTrue();
}
@@ -75,7 +69,7 @@
@Test
public void testDetect_longBatteryLife_tipInvisible() {
mBatteryInfo.discharging = true;
- mBatteryInfo.remainingTimeUs = 1 * DateUtils.DAY_IN_MILLIS;
+ mBatteryInfo.remainingTimeUs = DateUtils.DAY_IN_MILLIS;
assertThat(mLowBatteryDetector.detect().isVisible()).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java
index 6a25c6d..e8a79c5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.eq;
@@ -26,7 +25,6 @@
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager;
@@ -42,14 +40,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RestrictAppDetectorTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private Context mContext;
private BatteryTipPolicy mPolicy;
@@ -63,9 +60,7 @@
MockitoAnnotations.initMocks(this);
mAppInfoList = new ArrayList<>();
- mAppInfoList.add(new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME)
- .build());
+ mAppInfoList.add(new AppInfo.Builder().setPackageName(PACKAGE_NAME).build());
mContext = RuntimeEnvironment.application;
mPolicy = spy(new BatteryTipPolicy(mContext));
@@ -80,30 +75,30 @@
@Test
public void testDetect_hasAnomaly_tipNew() {
- doReturn(mAppInfoList).when(mBatteryDatabaseManager).queryAllAnomalies(anyLong(),
- eq(AnomalyDatabaseHelper.State.NEW));
+ doReturn(mAppInfoList).when(mBatteryDatabaseManager)
+ .queryAllAnomalies(anyLong(), eq(AnomalyDatabaseHelper.State.NEW));
assertThat(mRestrictAppDetector.detect().getState()).isEqualTo(BatteryTip.StateType.NEW);
}
@Test
public void testDetect_hasAutoHandledAnomaly_tipHandled() {
- doReturn(new ArrayList<AppInfo>()).when(mBatteryDatabaseManager).queryAllAnomalies(
- anyLong(), eq(AnomalyDatabaseHelper.State.NEW));
- doReturn(mAppInfoList).when(mBatteryDatabaseManager).queryAllAnomalies(anyLong(),
- eq(AnomalyDatabaseHelper.State.AUTO_HANDLED));
+ doReturn(new ArrayList<AppInfo>()).when(mBatteryDatabaseManager)
+ .queryAllAnomalies(anyLong(), eq(AnomalyDatabaseHelper.State.NEW));
+ doReturn(mAppInfoList).when(mBatteryDatabaseManager)
+ .queryAllAnomalies(anyLong(), eq(AnomalyDatabaseHelper.State.AUTO_HANDLED));
- assertThat(mRestrictAppDetector.detect().getState()).isEqualTo(
- BatteryTip.StateType.HANDLED);
+ assertThat(mRestrictAppDetector.detect().getState())
+ .isEqualTo(BatteryTip.StateType.HANDLED);
}
@Test
public void testDetect_noAnomaly_tipInvisible() {
- doReturn(new ArrayList<AppInfo>()).when(mBatteryDatabaseManager).queryAllAnomalies(
- anyLong(), anyInt());
+ doReturn(new ArrayList<AppInfo>()).when(mBatteryDatabaseManager)
+ .queryAllAnomalies(anyLong(), anyInt());
- assertThat(mRestrictAppDetector.detect().getState()).isEqualTo(
- BatteryTip.StateType.INVISIBLE);
+ assertThat(mRestrictAppDetector.detect().getState())
+ .isEqualTo(BatteryTip.StateType.INVISIBLE);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
index 8400d89..9134319 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
@@ -17,13 +17,12 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
+import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,13 +31,12 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SmartBatteryDetectorTest {
+
private Context mContext;
- private BatteryTipPolicy mPolicy;
+ private ContentResolver mContentResolver;
private SmartBatteryDetector mSmartBatteryDetector;
@Before
@@ -46,22 +44,21 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mPolicy = spy(new BatteryTipPolicy(mContext));
- mSmartBatteryDetector = new SmartBatteryDetector(mPolicy, mContext.getContentResolver());
+ mContentResolver = mContext.getContentResolver();
+ final BatteryTipPolicy policy = spy(new BatteryTipPolicy(mContext));
+ mSmartBatteryDetector = new SmartBatteryDetector(policy, mContentResolver);
}
@Test
public void testDetect_smartBatteryOff_tipVisible() {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.APP_STANDBY_ENABLED, 0);
+ Settings.Global.putInt(mContentResolver, Settings.Global.APP_STANDBY_ENABLED, 0);
assertThat(mSmartBatteryDetector.detect().isVisible()).isTrue();
}
@Test
public void testDetect_smartBatteryOn_tipInvisible() {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.APP_STANDBY_ENABLED, 1);
+ Settings.Global.putInt(mContentResolver, Settings.Global.APP_STANDBY_ENABLED, 1);
assertThat(mSmartBatteryDetector.detect().isVisible()).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java
index 12e98e9..5ca1ad2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java
@@ -17,12 +17,8 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
-import android.content.Context;
-
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,21 +27,18 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SummaryDetectorTest {
- private Context mContext;
+
private BatteryTipPolicy mPolicy;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mPolicy = spy(new BatteryTipPolicy(mContext));
+ mPolicy = spy(new BatteryTipPolicy(RuntimeEnvironment.application));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
index 74b9e2f..85c8ffc 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
@@ -17,7 +17,6 @@
import static com.google.common.truth.Truth.assertThat;
-import android.app.Dialog;
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
@@ -25,21 +24,19 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BatteryTipTest {
+
private static final String TITLE = "title";
private static final String SUMMARY = "summary";
@IdRes
@@ -130,5 +127,4 @@
}
};
}
-
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java
index 7dfe42e..c30563d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java
@@ -21,26 +21,24 @@
import android.os.Parcel;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EarlyWarningTipTest {
+
private Context mContext;
private EarlyWarningTip mEarlyWarningTip;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mEarlyWarningTip = new EarlyWarningTip(BatteryTip.StateType.NEW,
- false /* powerSaveModeOn */);
+ mEarlyWarningTip =
+ new EarlyWarningTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */);
}
@Test
@@ -56,8 +54,8 @@
@Test
public void testInfo_stateNew_displayPowerModeInfo() {
- final EarlyWarningTip tip = new EarlyWarningTip(BatteryTip.StateType.NEW,
- false /* powerModeOn */);
+ final EarlyWarningTip tip =
+ new EarlyWarningTip(BatteryTip.StateType.NEW, false /* powerModeOn */);
assertThat(tip.getTitle(mContext)).isEqualTo("Turn on Low Battery Mode");
assertThat(tip.getSummary(mContext)).isEqualTo("Extend your battery life");
@@ -66,8 +64,8 @@
@Test
public void testInfo_stateHandled_displayPowerModeHandledInfo() {
- final EarlyWarningTip tip = new EarlyWarningTip(BatteryTip.StateType.HANDLED,
- false /* powerModeOn */);
+ final EarlyWarningTip tip =
+ new EarlyWarningTip(BatteryTip.StateType.HANDLED, false /* powerModeOn */);
assertThat(tip.getTitle(mContext)).isEqualTo("Low Battery Mode is on");
assertThat(tip.getSummary(mContext)).isEqualTo("Some features are limited");
@@ -76,8 +74,8 @@
@Test
public void testUpdate_powerModeTurnedOn_typeBecomeHandled() {
- final EarlyWarningTip nextTip = new EarlyWarningTip(BatteryTip.StateType.INVISIBLE,
- true /* powerModeOn */);
+ final EarlyWarningTip nextTip =
+ new EarlyWarningTip(BatteryTip.StateType.INVISIBLE, true /* powerModeOn */);
mEarlyWarningTip.updateState(nextTip);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
index 0689778..db2f37e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
@@ -21,7 +21,6 @@
import android.os.Parcel;
import android.text.format.DateUtils;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -29,14 +28,13 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HighUsageTipTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final long SCREEN_TIME = 30 * DateUtils.MINUTE_IN_MILLIS;
@@ -69,6 +67,7 @@
assertThat(parcelTip.getType()).isEqualTo(BatteryTip.TipType.HIGH_DEVICE_USAGE);
assertThat(parcelTip.getState()).isEqualTo(BatteryTip.StateType.NEW);
assertThat(parcelTip.getScreenTimeMs()).isEqualTo(SCREEN_TIME);
+ assertThat(parcelTip.mHighUsageAppList).isNotNull();
assertThat(parcelTip.mHighUsageAppList.size()).isEqualTo(1);
final AppInfo app = parcelTip.mHighUsageAppList.get(0);
assertThat(app.packageName).isEqualTo(PACKAGE_NAME);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
index 74536a5..20b896f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
@@ -16,7 +16,6 @@
package com.android.settings.fuelgauge.batterytip.tips;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -25,7 +24,6 @@
import android.content.pm.PackageManager;
import android.os.Parcel;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,14 +33,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RestrictAppTipTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private static final String DISPLAY_NAME = "app";
@@ -67,9 +64,7 @@
doReturn(DISPLAY_NAME).when(mApplicationInfo).loadLabel(mPackageManager);
mUsageAppList = new ArrayList<>();
- mUsageAppList.add(new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME)
- .build());
+ mUsageAppList.add(new AppInfo.Builder().setPackageName(PACKAGE_NAME).build());
mNewBatteryTip = new RestrictAppTip(BatteryTip.StateType.NEW, mUsageAppList);
mHandledBatteryTip = new RestrictAppTip(BatteryTip.StateType.HANDLED, mUsageAppList);
mInvisibleBatteryTip = new RestrictAppTip(BatteryTip.StateType.INVISIBLE, mUsageAppList);
@@ -101,14 +96,14 @@
@Test
public void testGetSummary_stateNew_showRestrictSummary() {
- assertThat(mNewBatteryTip.getSummary(mContext)).isEqualTo(
- "app has high battery usage");
+ assertThat(mNewBatteryTip.getSummary(mContext))
+ .isEqualTo("app has high battery usage");
}
@Test
public void testGetSummary_stateHandled_showHandledSummary() {
- assertThat(mHandledBatteryTip.getSummary(mContext)).isEqualTo(
- "App changes are in progress");
+ assertThat(mHandledBatteryTip.getSummary(mContext))
+ .isEqualTo("App changes are in progress");
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java
index a83a158..f3e9735 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java
@@ -19,7 +19,6 @@
import android.os.Parcel;
-import com.android.settings.TestConfig;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -27,11 +26,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UnrestrictAppTipTest {
+
private static final String PACKAGE_NAME = "com.android.app";
private UnrestrictAppTip mBatteryTip;
@@ -40,9 +38,7 @@
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- AppInfo appInfo = new AppInfo.Builder()
- .setPackageName(PACKAGE_NAME)
- .build();
+ AppInfo appInfo = new AppInfo.Builder().setPackageName(PACKAGE_NAME).build();
mBatteryTip = new UnrestrictAppTip(BatteryTip.StateType.NEW, appInfo);
}
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
index 927133c..3b5facd 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
@@ -24,7 +24,6 @@
import android.provider.Settings;
import android.provider.Settings.Secure;
-import com.android.settings.TestConfig;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
@@ -42,26 +41,22 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = ShadowSecureSettings.class
-)
+@Config(shadows = ShadowSecureSettings.class)
public class AssistGestureSettingsPreferenceControllerTest {
+ private static final String KEY_ASSIST = "gesture_assist";
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFactory;
private AssistGestureSettingsPreferenceController mController;
- private static final String KEY_ASSIST = "gesture_assist";
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mFactory = FakeFeatureFactory.setupForTest();
- mController = new AssistGestureSettingsPreferenceController(mContext, null, KEY_ASSIST,
- false);
+ mController =
+ new AssistGestureSettingsPreferenceController(mContext, null, KEY_ASSIST, false);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
index a4a8873..9793f7d 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
@@ -24,7 +24,6 @@
import android.provider.SearchIndexableResource;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,13 +32,10 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AssistGestureSettingsTest {
private FakeFeatureFactory mFakeFeatureFactory;
@@ -62,8 +58,7 @@
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
AssistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- ShadowApplication.getInstance().getApplicationContext(),
- true /* enabled */);
+ RuntimeEnvironment.application, true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
@@ -79,4 +74,3 @@
.contains("gesture_assist_settings_page");
}
}
-
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
index 1f5ca20..e8c036e 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import android.content.SharedPreferences;
import android.provider.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
@@ -41,26 +40,22 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- SettingsShadowResources.class
-})
+@Config(shadows = SettingsShadowResources.class)
public class DoubleTapPowerPreferenceControllerTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
+ private ContentResolver mContentResolver;
private DoubleTapPowerPreferenceController mController;
private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mContentResolver = mContext.getContentResolver();
mController = new DoubleTapPowerPreferenceController(mContext, null, KEY_DOUBLE_TAP_POWER);
}
@@ -71,18 +66,16 @@
@Test
public void isAvailable_configIsTrue_shouldReturnTrue() {
- when(mContext.getResources().
- getBoolean(com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled))
- .thenReturn(true);
+ SettingsShadowResources.overrideResource(
+ com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, Boolean.TRUE);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_configIsTrue_shouldReturnFalse() {
- when(mContext.getResources().
- getBoolean(com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled))
- .thenReturn(false);
+ SettingsShadowResources.overrideResource(
+ com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, Boolean.FALSE);
assertThat(mController.isAvailable()).isFalse();
}
@@ -90,10 +83,8 @@
@Test
public void testSwitchEnabled_configIsNotSet_shouldReturnTrue() {
// Set the setting to be enabled.
- final Context context = RuntimeEnvironment.application;
- Settings.System.putInt(context.getContentResolver(),
- CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
- mController = new DoubleTapPowerPreferenceController(context, null, KEY_DOUBLE_TAP_POWER);
+ Settings.System.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
+ mController = new DoubleTapPowerPreferenceController(mContext, null, KEY_DOUBLE_TAP_POWER);
assertThat(mController.isSwitchPrefEnabled()).isTrue();
}
@@ -101,20 +92,17 @@
@Test
public void testSwitchEnabled_configIsSet_shouldReturnFalse() {
// Set the setting to be disabled.
- final Context context = RuntimeEnvironment.application;
- Settings.System.putInt(context.getContentResolver(),
- CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
- mController = new DoubleTapPowerPreferenceController(context, null, KEY_DOUBLE_TAP_POWER);
+ Settings.System.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
+ mController = new DoubleTapPowerPreferenceController(mContext, null, KEY_DOUBLE_TAP_POWER);
assertThat(mController.isSwitchPrefEnabled()).isFalse();
}
@Test
public void testPreferenceController_ProperResultPayloadType() {
- final Context context = RuntimeEnvironment.application;
DoubleTapPowerPreferenceController controller =
- new DoubleTapPowerPreferenceController(context, null /* lifecycle */,
- KEY_DOUBLE_TAP_POWER);
+ new DoubleTapPowerPreferenceController(mContext, null /* lifecycle */,
+ KEY_DOUBLE_TAP_POWER);
ResultPayload payload = controller.getResultPayload();
assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
}
@@ -123,13 +111,12 @@
@Config(shadows = ShadowSecureSettings.class)
public void testSetValue_updatesCorrectly() {
int newValue = 1;
- ContentResolver resolver = mContext.getContentResolver();
- Settings.Secure.putInt(resolver, Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
- 0);
+ Settings.Secure.putInt(mContentResolver,
+ Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
InlinePayload payload = ((InlineSwitchPayload) mController.getResultPayload());
payload.setValue(mContext, newValue);
- int updatedValue = Settings.Secure.getInt(resolver,
+ int updatedValue = Settings.Secure.getInt(mContentResolver,
Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, -1);
updatedValue = 1 - updatedValue; // DoubleTapPower is a non-standard switch
@@ -140,8 +127,7 @@
@Config(shadows = ShadowSecureSettings.class)
public void testGetValue_correctValueReturned() {
int currentValue = 1;
- ContentResolver resolver = mContext.getContentResolver();
- Settings.Secure.putInt(resolver,
+ Settings.Secure.putInt(mContentResolver,
Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, currentValue);
int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
@@ -154,9 +140,7 @@
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, false);
- assertThat(
- isSuggestionComplete(RuntimeEnvironment.application, null/* prefs */))
- .isTrue();
+ assertThat(isSuggestionComplete(mContext, null/* prefs */)).isTrue();
}
@Test
@@ -164,12 +148,9 @@
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
// No stored value in shared preferences if not visited yet.
- final Context context = RuntimeEnvironment.application;
- final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
- .getSharedPrefs(context);
- assertThat(
- isSuggestionComplete(RuntimeEnvironment.application, prefs))
- .isFalse();
+ final SharedPreferences prefs =
+ new SuggestionFeatureProviderImpl(mContext).getSharedPrefs(mContext);
+ assertThat(isSuggestionComplete(mContext, prefs)).isFalse();
}
@Test
@@ -177,14 +158,10 @@
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
// No stored value in shared preferences if not visited yet.
- final Context context = RuntimeEnvironment.application;
- final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
- .getSharedPrefs(context);
- prefs.edit().putBoolean(
- DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+ final SharedPreferences prefs =
+ new SuggestionFeatureProviderImpl(mContext).getSharedPrefs(mContext);
+ prefs.edit().putBoolean(DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
- assertThat(
- isSuggestionComplete(RuntimeEnvironment.application, prefs))
- .isTrue();
+ assertThat(isSuggestionComplete(mContext, prefs)).isTrue();
}
}
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
index b9635a7..5f7ee65 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerSettingsTest.java
@@ -16,23 +16,20 @@
package com.android.settings.gestures;
+import static com.google.common.truth.Truth.assertThat;
+
import android.provider.SearchIndexableResource;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DoubleTapPowerSettingsTest {
private DoubleTapPowerSettings mSettings;
@@ -45,9 +42,8 @@
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
- DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- ShadowApplication.getInstance().getApplicationContext(),
- true /* enabled */);
+ DoubleTapPowerSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+ RuntimeEnvironment.application, true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
index 74e1e5d..344156c 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.gestures;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
@@ -27,16 +26,13 @@
import android.provider.Settings;
import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,7 +43,6 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DoubleTapScreenPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -65,11 +60,6 @@
mContext, null, mAmbientDisplayConfiguration, 0, KEY_DOUBLE_TAP_SCREEN);
}
- @After
- public void tearDown() {
- SettingsShadowResources.reset();
- }
-
@Test
public void isAvailable_configIsTrue_shouldReturnTrue() {
when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(true);
@@ -127,8 +117,7 @@
@Config(shadows = ShadowSecureSettings.class)
public void testGetValue_correctValueReturned() {
int currentValue = 1;
- ContentResolver resolver = mContext.getContentResolver();
- Settings.Secure.putInt(resolver,
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, currentValue);
int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
@@ -141,25 +130,25 @@
when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(true);
// No stored value in shared preferences if not visited yet.
final Context context = RuntimeEnvironment.application;
- final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
- .getSharedPrefs(context);
+ final SharedPreferences prefs =
+ new SuggestionFeatureProviderImpl(context).getSharedPrefs(context);
- assertThat(DoubleTapScreenPreferenceController.isSuggestionComplete(
- mAmbientDisplayConfiguration, prefs)).isFalse();
+ assertThat(DoubleTapScreenPreferenceController
+ .isSuggestionComplete(mAmbientDisplayConfiguration, prefs)).isFalse();
}
@Test
public void isSuggestionCompleted_ambientDisplay_trueWhenVisited() {
when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(false);
final Context context = RuntimeEnvironment.application;
- final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
- .getSharedPrefs(context);
+ final SharedPreferences prefs =
+ new SuggestionFeatureProviderImpl(context).getSharedPrefs(context);
prefs.edit().putBoolean(
DoubleTapScreenSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
- assertThat(DoubleTapScreenPreferenceController.isSuggestionComplete(
- mAmbientDisplayConfiguration, prefs)).isTrue();
+ assertThat(DoubleTapScreenPreferenceController
+ .isSuggestionComplete(mAmbientDisplayConfiguration, prefs)).isTrue();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
index 3d56d71..0f14073 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenSettingsTest.java
@@ -16,23 +16,20 @@
package com.android.settings.gestures;
+import static com.google.common.truth.Truth.assertThat;
+
import android.provider.SearchIndexableResource;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DoubleTapScreenSettingsTest {
private DoubleTapScreenSettings mSettings;
@@ -45,9 +42,8 @@
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
- DoubleTapScreenSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- ShadowApplication.getInstance().getApplicationContext(),
- true /* enabled */);
+ DoubleTapScreenSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+ RuntimeEnvironment.application, true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
index 236896a..66fbbc9 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
@@ -16,23 +16,20 @@
package com.android.settings.gestures;
+import static com.google.common.truth.Truth.assertThat;
+
import android.provider.SearchIndexableResource;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DoubleTwistGestureSettingsTest {
private DoubleTwistGestureSettings mSettings;
@@ -45,9 +42,8 @@
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
- DoubleTwistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- ShadowApplication.getInstance().getApplicationContext(),
- true /* enabled */);
+ DoubleTwistGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+ RuntimeEnvironment.application, true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index 3fc6bcf..d633ebe 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -29,11 +29,9 @@
import android.provider.Settings;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowDoubleTwistPreferenceController;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.After;
import org.junit.Before;
@@ -44,15 +42,12 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- SettingsShadowResources.class
-})
+@Config(shadows = SettingsShadowResources.class)
public class DoubleTwistPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -119,12 +114,10 @@
}
@Test
- @Config(shadows = {
- ShadowDoubleTwistPreferenceController.class,
- ShadowSecureSettings.class})
+ @Config(shadows = ShadowDoubleTwistPreferenceController.class)
public void onPreferenceChange_hasWorkProfile_shouldUpdateSettingForWorkProfileUser() {
final int managedId = 2;
- ShadowSecureSettings.putIntForUser(
+ Settings.Secure.putIntForUser(
null, Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId);
DoubleTwistPreferenceController controller =
spy(new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST));
@@ -144,7 +137,7 @@
@Test
public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
// Set the setting to be enabled.
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
Settings.System.putInt(context.getContentResolver(),
Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1);
mController = new DoubleTwistPreferenceController(context, null, KEY_DOUBLE_TWIST);
@@ -155,7 +148,7 @@
@Test
public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
// Set the setting to be disabled.
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
Settings.System.putInt(context.getContentResolver(),
Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0);
mController = new DoubleTwistPreferenceController(context, null, KEY_DOUBLE_TWIST);
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
index e7e1007..361c95d 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
@@ -29,7 +29,6 @@
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.TwoStatePreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.VideoPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -41,13 +40,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class GesturePreferenceControllerTest {
-
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -100,13 +96,13 @@
verify(videoPreference).onViewVisible(false);
reset(videoPreference);
- savedState.putBoolean(mController.KEY_VIDEO_PAUSED, true);
+ savedState.putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, true);
mController.onCreate(savedState);
mController.onResume();
verify(videoPreference).onViewVisible(true);
reset(videoPreference);
- savedState.putBoolean(mController.KEY_VIDEO_PAUSED, false);
+ savedState.putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, false);
mController.onCreate(savedState);
mController.onResume();
verify(videoPreference).onViewVisible(false);
@@ -146,11 +142,11 @@
mController.mVideoPaused = true;
mController.onSaveInstanceState(outState);
- verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, true);
+ verify(outState).putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, true);
mController.mVideoPaused = false;
mController.onSaveInstanceState(outState);
- verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, false);
+ verify(outState).putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, false);
}
@Test
@@ -199,7 +195,7 @@
boolean mIsPrefAvailable;
boolean mIsPrefEnabled;
- public TestPrefController(Context context,
+ private TestPrefController(Context context,
Lifecycle lifecycle) {
super(context, lifecycle);
}
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
index 5fc787b..08a0372 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
@@ -48,7 +47,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class GesturesSettingsPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -93,7 +91,7 @@
}
@Test
- @Config(shadows = {ShadowSecureSettings.class})
+ @Config(shadows = ShadowSecureSettings.class)
public void updateState_assistSupported_shouldSetToAssistGestureStatus() {
final FakeFeatureFactory featureFactory =
(FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
@@ -120,7 +118,7 @@
}
@Test
- @Config(shadows = {ShadowSecureSettings.class})
+ @Config(shadows = ShadowSecureSettings.class)
public void updateState_sensorNotAvailable_shouldSetToEmptyStatus() {
final FakeFeatureFactory featureFactory =
(FakeFeatureFactory) FakeFeatureFactory.getFactory(mActivity);
@@ -130,5 +128,4 @@
mController.updateState(mPreference);
verify(mPreference).setSummary("");
}
-
}
diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
index 4e73ed6..09e9ff7 100644
--- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
@@ -28,16 +28,12 @@
import android.provider.Settings;
import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,14 +41,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- SettingsShadowResources.class
-})
public class PickupGesturePreferenceControllerTest {
+ private static final String KEY_PICK_UP = "gesture_pick_up";
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
@@ -60,8 +54,6 @@
private PickupGesturePreferenceController mController;
- private static final String KEY_PICK_UP = "gesture_pick_up";
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -69,12 +61,6 @@
mContext, null, mAmbientDisplayConfiguration, 0, KEY_PICK_UP);
}
- @After
- public void tearDown() {
- SettingsShadowResources.reset();
- ShadowSecureSettings.clear();
- }
-
@Test
public void isAvailable_configIsTrue_shouldReturnTrue() {
when(mAmbientDisplayConfiguration.pulseOnPickupAvailable()).thenReturn(true);
@@ -132,7 +118,6 @@
}
@Test
- @Config(shadows = ShadowSecureSettings.class)
public void testSetValue_updatesCorrectly() {
int newValue = 1;
ContentResolver resolver = mContext.getContentResolver();
@@ -146,7 +131,6 @@
}
@Test
- @Config(shadows = ShadowSecureSettings.class)
public void testGetValue_correctValueReturned() {
int currentValue = 1;
ContentResolver resolver = mContext.getContentResolver();
@@ -159,15 +143,12 @@
@Test
public void isSuggestionCompleted_ambientDisplayPickup_trueWhenVisited() {
- when(mContext.getResources().getBoolean(anyInt()))
- .thenReturn(true);
- when(mContext.getResources().getString(anyInt()))
- .thenReturn("foo");
+ when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
+ when(mContext.getResources().getString(anyInt())).thenReturn("foo");
final Context context = RuntimeEnvironment.application;
- final SharedPreferences prefs = new SuggestionFeatureProviderImpl(context)
- .getSharedPrefs(context);
- prefs.edit().putBoolean(
- PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+ final SharedPreferences prefs =
+ new SuggestionFeatureProviderImpl(context).getSharedPrefs(context);
+ prefs.edit().putBoolean(PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
assertThat(PickupGesturePreferenceController.isSuggestionComplete(mContext, prefs))
.isTrue();
diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
index 2c4a1c4..d78880b 100644
--- a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
@@ -16,23 +16,20 @@
package com.android.settings.gestures;
+import static com.google.common.truth.Truth.assertThat;
+
import android.provider.SearchIndexableResource;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PickupGestureSettingsTest {
private PickupGestureSettings mSettings;
@@ -45,12 +42,10 @@
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
- PickupGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- ShadowApplication.getInstance().getApplicationContext(),
- true /* enabled */);
+ PickupGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+ RuntimeEnvironment.application, true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
index 86fd267..69226b6 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
@@ -26,7 +26,6 @@
import android.hardware.fingerprint.FingerprintManager;
import android.provider.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,11 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SwipeToNotificationPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -101,7 +97,7 @@
stubFingerprintSupported(true);
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
// Set the setting to be enabled.
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
Settings.System.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 1);
mController = new SwipeToNotificationPreferenceController(context, null, KEY_SWIPE_DOWN);
@@ -113,7 +109,7 @@
stubFingerprintSupported(true);
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
// Set the setting to be disabled.
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
Settings.System.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 0);
mController = new SwipeToNotificationPreferenceController(context, null, KEY_SWIPE_DOWN);
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
index d6ecb1c..78f1917 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
@@ -22,7 +22,6 @@
import android.provider.SearchIndexableResource;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -31,13 +30,11 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SwipeToNotificationSettingsTest {
@Mock
@@ -67,9 +64,8 @@
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
- SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- ShadowApplication.getInstance().getApplicationContext(),
- true /* enabled */);
+ SwipeToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER
+ .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
diff --git a/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java b/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
index c9804d6..6ba22d1 100644
--- a/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
+++ b/tests/robotests/src/com/android/settings/graph/BottomLabelLayoutTest.java
@@ -19,35 +19,30 @@
import static com.google.common.truth.Truth.assertThat;
-import android.content.Context;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.Space;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BottomLabelLayoutTest {
+
private BottomLabelLayout mBottomLabelLayout;
- private Context mContext;
private Space mSpace;
@Before
public void setUp() {
- mContext = RuntimeEnvironment.application;
- mBottomLabelLayout = new BottomLabelLayout(mContext, null);
+ mBottomLabelLayout = new BottomLabelLayout(RuntimeEnvironment.application, null);
mBottomLabelLayout.setOrientation(LinearLayout.HORIZONTAL);
- mSpace = new Space(mContext);
+ mSpace = new Space(RuntimeEnvironment.application);
mSpace.setId(R.id.spacer);
mBottomLabelLayout.addView(mSpace);
}
diff --git a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java
index fbd6fd4..e2dd99d 100644
--- a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java
+++ b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java
@@ -18,15 +18,14 @@
package com.android.settings.graph;
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.content.res.Resources;
import android.util.SparseIntArray;
-import com.android.settings.TestConfig;
import com.android.settingslib.R;
import org.junit.Before;
@@ -34,11 +33,10 @@
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UsageGraphTest {
+
private UsageGraph mGraph;
@Before
@@ -53,8 +51,8 @@
doReturn(1).when(resources).getDimensionPixelSize(R.dimen.usage_graph_dot_interval);
doReturn(1).when(resources).getDimensionPixelSize(R.dimen.usage_graph_divider_size);
mGraph = spy(new UsageGraph(context, null));
- doReturn(1000).when(mGraph).getWidth();
- doReturn(200).when(mGraph).getHeight();
+ when(mGraph.getWidth()).thenReturn(1000);
+ when(mGraph.getHeight()).thenReturn(200);
// Set the conceptual size of the graph to 500ms x 100%.
mGraph.setMax(500, 100);
diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
index 220aa6d..bc4eca8 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
@@ -26,7 +26,6 @@
import android.hardware.input.InputManager;
import android.view.InputDevice;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -43,7 +42,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class GameControllerPreferenceControllerTest {
@Mock
@@ -124,7 +122,6 @@
public void updateNonIndexableKeys_shouldIncludeCategoryAndPrefKeys() {
when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{});
-
final List<String> nonIndexables = new ArrayList<>();
mController.updateNonIndexableKeys(nonIndexables);
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
index 356cfb4..13c99a6 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
@@ -29,7 +29,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowInputDevice;
import org.junit.After;
@@ -42,7 +41,6 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PhysicalKeyboardPreferenceControllerTest {
@Mock
@@ -84,11 +82,9 @@
}
@Test
- @Config(shadows = {
- ShadowInputDevice.class,
- })
+ @Config(shadows = ShadowInputDevice.class)
public void updateState_noKeyboard_setDisconnectedSummary() {
- ShadowInputDevice.sDeviceIds = new int[]{};
+ ShadowInputDevice.sDeviceIds = new int[0];
mController.updateState(mPreference);
verify(mPreference).setSummary(R.string.disconnected);
@@ -108,5 +104,4 @@
verify(mPreference).setSummary(device.getName());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
index c41a03b..1a9f3c8 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
@@ -16,7 +16,9 @@
package com.android.settings.inputmethod;
-import static org.mockito.Mockito.spy;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
@@ -26,7 +28,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -35,14 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SpellCheckerPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java
index 7b149f3..b81e551 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java
@@ -16,7 +16,6 @@
package com.android.settings.inputmethod;
-
import static com.google.common.truth.Truth.assertThat;
import android.content.ContentProvider;
@@ -26,7 +25,6 @@
import android.net.Uri;
import android.provider.UserDictionary;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,11 +32,9 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowContentResolver;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UserDictionaryCursorLoaderTest {
private ContentProvider mContentProvider;
@@ -61,7 +57,6 @@
public static class FakeProvider extends ContentProvider {
-
@Override
public boolean onCreate() {
return false;
@@ -100,5 +95,4 @@
return 0;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java
index 91fcaae..eaf5b1d 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java
@@ -20,12 +20,12 @@
import android.content.ContentProvider;
import android.content.ContentValues;
+import android.content.Context;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.net.Uri;
import android.provider.UserDictionary;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -33,16 +33,13 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowContentResolver;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UserDictionaryListTest {
private FakeProvider mContentProvider;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -54,13 +51,13 @@
public void getUserDictionaryLocalesSet_noLocale_shouldReturnEmptySet() {
mContentProvider.hasDictionary = false;
- assertThat(UserDictionaryList.getUserDictionaryLocalesSet(RuntimeEnvironment.application))
- .isEmpty();
+ final Context context = RuntimeEnvironment.application;
+ assertThat(UserDictionaryList.getUserDictionaryLocalesSet(context)).isEmpty();
}
public static class FakeProvider extends ContentProvider {
- public boolean hasDictionary = true;
+ private boolean hasDictionary = true;
@Override
public boolean onCreate() {
diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
index c078725..97ae2ec 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.inputmethod;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
@@ -36,7 +35,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +48,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VirtualKeyboardPreferenceControllerTest {
@Mock
@@ -77,7 +74,7 @@
@Test
public void testVirtualKeyboard_byDefault_shouldBeShown() {
- final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
+ final Context context = spy(RuntimeEnvironment.application);
mController = new VirtualKeyboardPreferenceController(context);
assertThat(mController.isAvailable()).isTrue();
}
@@ -85,7 +82,7 @@
@Test
@Config(qualifiers = "mcc999")
public void testVirtualKeyboard_ifDisabled_shouldNotBeShown() {
- final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
+ final Context context = spy(RuntimeEnvironment.application);
mController = new VirtualKeyboardPreferenceController(context);
assertThat(mController.isAvailable()).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index 4d82356..a602412 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -17,7 +17,6 @@
package com.android.settings.language;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -28,6 +27,7 @@
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
+import android.arch.lifecycle.LifecycleObserver;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -42,14 +42,11 @@
import android.view.textservice.TextServicesManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
import org.junit.Before;
import org.junit.Test;
@@ -58,13 +55,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LanguageAndInputSettingsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -127,9 +122,6 @@
}
@Test
- @Config(shadows = {
- ShadowSecureSettings.class,
- })
public void testSummary_shouldSetToCurrentImeName() {
final Activity activity = mock(Activity.class);
final SummaryLoader loader = mock(SummaryLoader.class);
@@ -145,7 +137,7 @@
when(imis.get(0).getPackageName()).thenReturn(componentName.getPackageName());
when(mInputMethodManager.getInputMethodList()).thenReturn(imis);
- SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
+ SummaryLoader.SummaryProvider provider = LanguageAndInputSettings.SUMMARY_PROVIDER_FACTORY
.createSummaryProvider(activity, loader);
provider.setListening(true);
@@ -158,18 +150,17 @@
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = spy(RuntimeEnvironment.application);
final Resources res = spy(RuntimeEnvironment.application.getResources());
- //(InputManager) context.getSystemService(Context.INPUT_SERVICE);
final InputManager inputManager = mock(InputManager.class);
final TextServicesManager textServicesManager = mock(TextServicesManager.class);
- when(inputManager.getInputDeviceIds()).thenReturn(new int[]{});
+ when(inputManager.getInputDeviceIds()).thenReturn(new int[0]);
doReturn(inputManager).when(context).getSystemService(Context.INPUT_SERVICE);
- doReturn(textServicesManager).when(context).getSystemService(
- Context.TEXT_SERVICES_MANAGER_SERVICE);
+ doReturn(textServicesManager).when(context)
+ .getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE);
doReturn(res).when(context).getResources();
doReturn(false).when(res)
.getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys);
- final List<String> niks = LanguageAndInputSettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(context);
+ final List<String> niks =
+ LanguageAndInputSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(context);
LanguageAndInputSettings settings = new LanguageAndInputSettings();
final int xmlId = settings.getPreferenceScreenResId();
@@ -182,11 +173,11 @@
public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {
final Context context = spy(RuntimeEnvironment.application);
final TextServicesManager textServicesManager = mock(TextServicesManager.class);
- doReturn(textServicesManager).when(context).getSystemService(
- Context.TEXT_SERVICES_MANAGER_SERVICE);
+ doReturn(textServicesManager).when(context)
+ .getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE);
final LanguageAndInputSettings fragment = new LanguageAndInputSettings();
- final List<String> preferenceScreenKeys = XmlTestUtils.getKeysFromPreferenceXml(context,
- fragment.getPreferenceScreenResId());
+ final List<String> preferenceScreenKeys =
+ XmlTestUtils.getKeysFromPreferenceXml(context, fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
index 90a4a12..9fbbb98 100644
--- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.language;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,14 +25,12 @@
import android.content.res.AssetManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
@@ -43,7 +40,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PhoneLanguagePreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java
index 32217df..9d42088 100644
--- a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java
@@ -17,24 +17,20 @@
package com.android.settings.language;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PointerSpeedControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
index 18cb12a..194c778 100644
--- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
@@ -27,13 +27,11 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
@@ -43,7 +41,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TtsPreferenceControllerTest {
@Mock
@@ -94,7 +91,6 @@
@Test
@Config(qualifiers = "mcc999")
public void testIsAvailable_ifDisabled_shouldReturnFalse() {
-
assertThat(mController.isAvailable()).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
index 0afa9d2..4b115bf 100644
--- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
@@ -21,7 +21,6 @@
import android.content.Context;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.inputmethod.UserDictionaryList;
import com.android.settings.inputmethod.UserDictionarySettings;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -33,13 +32,11 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import java.util.TreeSet;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UserDictionaryPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -52,7 +49,7 @@
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest();
mController = new TestController(mContext);
- mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
+ mPreference = new Preference(RuntimeEnvironment.application);
}
@Test
@@ -74,10 +71,9 @@
mController.updateState(mPreference);
- assertThat(mPreference.getFragment())
- .isEqualTo(UserDictionarySettings.class.getCanonicalName());
- assertThat(mPreference.getExtras().getString("locale"))
- .isEqualTo("en");
+ final String fragmentName = UserDictionarySettings.class.getCanonicalName();
+ assertThat(mPreference.getFragment()).isEqualTo(fragmentName);
+ assertThat(mPreference.getExtras().getString("locale")).isEqualTo("en");
}
@Test
@@ -102,9 +98,8 @@
return mLocales;
}
- public TestController(Context context) {
+ private TestController(Context context) {
super(context);
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
index 737c16d..4db32bd 100644
--- a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
+++ b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
@@ -16,15 +16,16 @@
package com.android.settings.localepicker;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import android.view.View;
import android.widget.TextView;
-import com.android.settings.TestConfig;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSettingsPreferenceFragment;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,9 +35,7 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = { ShadowSettingsPreferenceFragment.class })
+@Config(shadows = ShadowSettingsPreferenceFragment.class)
public class LocaleListEditorTest {
private LocaleListEditor mLocaleListEditor;
@@ -44,8 +43,6 @@
@Mock
private Context mContext;
- private FakeFeatureFactory mFactory;
-
@Before
public void setUp() {
mLocaleListEditor = new LocaleListEditor();
@@ -55,7 +52,7 @@
RuntimeEnvironment.application.getSystemService(Context.RESTRICTIONS_SERVICE));
ReflectionHelpers.setField(mLocaleListEditor, "mUserManager",
RuntimeEnvironment.application.getSystemService(Context.USER_SERVICE));
- mFactory = FakeFeatureFactory.setupForTest();
+ FakeFeatureFactory.setupForTest();
}
@Test
@@ -63,7 +60,7 @@
ReflectionHelpers.setField(mLocaleListEditor, "mIsUiRestricted", true);
mLocaleListEditor.onAttach(mContext);
mLocaleListEditor.onResume();
- Assert.assertEquals(View.GONE, mLocaleListEditor.getEmptyTextView().getVisibility());
+ assertThat(mLocaleListEditor.getEmptyTextView().getVisibility()).isEqualTo(View.GONE);
}
@Test
@@ -71,6 +68,6 @@
ReflectionHelpers.setField(mLocaleListEditor, "mIsUiRestricted", false);
mLocaleListEditor.onAttach(mContext);
mLocaleListEditor.onResume();
- Assert.assertEquals(View.VISIBLE, mLocaleListEditor.getEmptyTextView().getVisibility());
+ assertThat(mLocaleListEditor.getEmptyTextView().getVisibility()).isEqualTo(View.VISIBLE);
}
}
diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
index 1b36a45..16c694e 100644
--- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
@@ -5,7 +5,6 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -14,10 +13,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppLocationPermissionPreferenceControllerTest {
private AppLocationPermissionPreferenceController mController;
@@ -35,8 +32,7 @@
@Test
public void isAvailable_noLocationLinkPermission_shouldReturnFalse() {
Settings.System.putInt(mContext.getContentResolver(),
- android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,
- 0);
+ android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED, 0);
assertThat(mController.isAvailable()).isFalse();
}
@@ -44,8 +40,7 @@
@Test
public void displayPreference_hasLocationLinkPermission_shouldReturnTrue() {
Settings.System.putInt(mContext.getContentResolver(),
- android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED,
- 1);
+ android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED, 1);
assertThat(mController.isAvailable()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java
index 2384687..ff25e25 100644
--- a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java
@@ -16,15 +16,14 @@
package com.android.settings.location;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.Context;
+import android.content.ContentResolver;
import android.provider.Settings;
+import android.provider.Settings.Global;
import android.support.v14.preference.SwitchPreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -33,30 +32,27 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BluetoothScanningPreferenceControllerTest {
@Mock
private SwitchPreference mPreference;
- private Context mContext;
+ private ContentResolver mContentResolver;
private BluetoothScanningPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new BluetoothScanningPreferenceController(mContext);
+ mContentResolver = RuntimeEnvironment.application.getContentResolver();
+ mController = new BluetoothScanningPreferenceController(RuntimeEnvironment.application);
when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
}
@Test
public void updateState_bluetoothScanningEnabled_shouldCheckedPreference() {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 1);
+ Settings.Global.putInt(mContentResolver, Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 1);
mController.updateState(mPreference);
@@ -65,8 +61,7 @@
@Test
public void updateState_bluetoothScanningDisabled_shouldUncheckedPreference() {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0);
+ Settings.Global.putInt(mContentResolver, Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0);
mController.updateState(mPreference);
@@ -79,9 +74,8 @@
mController.handlePreferenceTreeClick(mPreference);
- assertThat(Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0)).isEqualTo(1);
-
+ final int btScanning = Global.getInt(mContentResolver, Global.BLE_SCAN_ALWAYS_AVAILABLE, 0);
+ assertThat(btScanning).isEqualTo(1);
}
@Test
@@ -90,8 +84,7 @@
mController.handlePreferenceTreeClick(mPreference);
- assertThat(Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 1)).isEqualTo(0);
-
+ final int btScanning = Global.getInt(mContentResolver, Global.BLE_SCAN_ALWAYS_AVAILABLE, 1);
+ assertThat(btScanning).isEqualTo(0);
}
}
diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
index ca42b3a..0c0cd4c 100644
--- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
@@ -39,13 +39,12 @@
import android.os.UserManager;
import android.provider.Settings;
import android.text.TextUtils;
-import com.android.settings.TestConfig;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.wrapper.LocationManagerWrapper;
-import java.util.ArrayList;
-import java.util.List;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -57,12 +56,13 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
+import java.util.ArrayList;
+import java.util.List;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowSecureSettings.class,
- LocationEnablerTest.ShadowLocationManagerWrapper.class})
+@Config(shadows = {
+ ShadowSecureSettings.class,
+ LocationEnablerTest.ShadowLocationManagerWrapper.class})
public class LocationEnablerTest {
@Mock
@@ -90,7 +90,7 @@
mEnabler.onResume();
verify(mContext).registerReceiver(eq(mEnabler.mReceiver),
- eq(mEnabler.INTENT_FILTER_LOCATION_MODE_CHANGED));
+ eq(LocationEnabler.INTENT_FILTER_LOCATION_MODE_CHANGED));
}
@Test
@@ -150,8 +150,7 @@
mEnabler.setLocationMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
- verify(mListener)
- .onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, true);
+ verify(mListener).onLocationModeChanged(Settings.Secure.LOCATION_MODE_BATTERY_SAVING, true);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java
index da00010..2d420f2 100644
--- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java
@@ -39,11 +39,10 @@
import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
-import com.android.settings.TestConfig;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import java.util.ArrayList;
-import java.util.List;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -51,11 +50,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-/** Unit tests for {@link LocationFooterPreferenceController} */
+import java.util.ArrayList;
+import java.util.List;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LocationFooterPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
index 5b2455f..314b805 100644
--- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.location;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -34,7 +33,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -46,14 +44,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LocationForWorkPreferenceControllerTest {
@Mock
@@ -95,8 +91,8 @@
mController.handlePreferenceTreeClick(mPreference);
- verify(mUserManager).setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, false,
- mUserHandle);
+ verify(mUserManager)
+ .setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, false, mUserHandle);
verify(mPreference).setSummary(R.string.switch_on_text);
}
@@ -107,14 +103,14 @@
mController.handlePreferenceTreeClick(mPreference);
- verify(mUserManager).setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, true,
- mUserHandle);
+ verify(mUserManager)
+ .setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, true, mUserHandle);
verify(mPreference).setSummary(R.string.switch_off_text);
}
@Test
public void isAvailable_noManagedProfile_shouldReturnFalse() {
- when(mUserManager.getUserProfiles()).thenReturn(new ArrayList<UserHandle>());
+ when(mUserManager.getUserProfiles()).thenReturn(new ArrayList<>());
assertThat(mController.isAvailable()).isFalse();
}
@@ -194,5 +190,4 @@
when(mUserManager.getUserInfo(5))
.thenReturn(new UserInfo(5, "user 5", UserInfo.FLAG_MANAGED_PROFILE));
}
-
}
diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
index e4aa075..33c6446 100644
--- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
@@ -17,9 +17,7 @@
import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.verify;
@@ -38,7 +36,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.search.InlineListPayload;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.ResultPayload;
@@ -56,7 +53,6 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LocationPreferenceControllerTest {
@Mock
private Preference mPreference;
@@ -101,38 +97,38 @@
@Test
public void getLocationSummary_locationOff_shouldSetSummaryOff() {
- Secure.putInt(mContext.getContentResolver(),
- Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Secure.putInt(contentResolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
- assertThat(mController.getLocationSummary(mContext)).isEqualTo(
- mContext.getString(R.string.location_off_summary));
+ final String locationSummary = mController.getLocationSummary(mContext);
+ assertThat(locationSummary).isEqualTo(mContext.getString(R.string.location_off_summary));
}
@Test
public void getLocationSummary_sensorsOnly_shouldSetSummaryOn() {
- Secure.putInt(mContext.getContentResolver(),
- Secure.LOCATION_MODE, Secure.LOCATION_MODE_SENSORS_ONLY);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Secure.putInt(contentResolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_SENSORS_ONLY);
- assertThat(mController.getLocationSummary(mContext)).isEqualTo(
- mContext.getString(R.string.location_on_summary));
+ final String locationSummary = mController.getLocationSummary(mContext);
+ assertThat(locationSummary).isEqualTo(mContext.getString(R.string.location_on_summary));
}
@Test
public void getLocationSummary_highAccuracy_shouldSetSummaryOn() {
- Secure.putInt(mContext.getContentResolver(),
- Secure.LOCATION_MODE, Secure.LOCATION_MODE_HIGH_ACCURACY);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Secure.putInt(contentResolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_HIGH_ACCURACY);
- assertThat(mController.getLocationSummary(mContext)).isEqualTo(
- mContext.getString(R.string.location_on_summary));
+ final String locationSummary = mController.getLocationSummary(mContext);
+ assertThat(locationSummary).isEqualTo(mContext.getString(R.string.location_on_summary));
}
@Test
public void getLocationSummary_batterySaving_shouldSetSummaryOn() {
- Secure.putInt(mContext.getContentResolver(),
- Secure.LOCATION_MODE, Secure.LOCATION_MODE_BATTERY_SAVING);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Secure.putInt(contentResolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_BATTERY_SAVING);
- assertThat(mController.getLocationSummary(mContext)).isEqualTo(
- mContext.getString(R.string.location_on_summary));
+ final String locationSummary = mController.getLocationSummary(mContext);
+ assertThat(locationSummary).isEqualTo(mContext.getString(R.string.location_on_summary));
}
@Test
@@ -153,9 +149,8 @@
mController.displayPreference(mScreen);
mController.onResume();
- mController.mLocationProvidersChangedReceiver.onReceive(
- mContext,
- new Intent().setAction(LocationManager.PROVIDERS_CHANGED_ACTION));
+ mController.mLocationProvidersChangedReceiver
+ .onReceive(mContext, new Intent(LocationManager.PROVIDERS_CHANGED_ACTION));
verify(mPreference).setSummary(any());
}
@@ -171,13 +166,13 @@
@Test
@Config(shadows = ShadowSecureSettings.class)
public void testSetValue_updatesCorrectly() {
- int newValue = Secure.LOCATION_MODE_BATTERY_SAVING;
+ final int newValue = Secure.LOCATION_MODE_BATTERY_SAVING;
ContentResolver resolver = mContext.getContentResolver();
Settings.Secure.putInt(resolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
- int updatedValue = Settings.Secure.getInt(resolver, Secure.LOCATION_MODE,
- Secure.LOCATION_MODE_OFF);
+ final int updatedValue =
+ Settings.Secure.getInt(resolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
assertThat(updatedValue).isEqualTo(newValue);
}
diff --git a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java
index 7577ac1..e25b226 100644
--- a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java
@@ -18,33 +18,22 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LocationScanningPreferenceControllerTest {
- private Context mContext;
private LocationScanningPreferenceController mController;
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application.getApplicationContext());
- mController = new LocationScanningPreferenceController(mContext);
+ mController = new LocationScanningPreferenceController(RuntimeEnvironment.application);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
index 51a375e..195e1b4 100644
--- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.location;
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.eq;
@@ -32,7 +31,6 @@
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,13 +41,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LocationServicePreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -118,8 +114,8 @@
pref2.setTitle("Title2");
preferences.add(pref1);
preferences.add(pref2);
- doReturn(preferences).when(mSettingsInjector)
- .getInjectedSettings(any(Context.class), anyInt());
+ doReturn(preferences)
+ .when(mSettingsInjector).getInjectedSettings(any(Context.class), anyInt());
when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
mController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java b/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java
index acb2b84..83d14e4 100644
--- a/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationSettingsTest.java
@@ -15,24 +15,24 @@
*/
package com.android.settings.location;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.os.Bundle;
+
import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.SwitchBar;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LocationSettingsTest {
@Mock
@@ -47,7 +47,7 @@
MockitoAnnotations.initMocks(this);
mLocationSettings = spy(new LocationSettings());
doReturn(mActivity).when(mLocationSettings).getActivity();
- doReturn(mSwitchBar).when(mActivity).getSwitchBar();
+ when(mActivity.getSwitchBar()).thenReturn(mSwitchBar);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
index 88c243b..6aa6d51 100644
--- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
@@ -26,7 +26,6 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
@@ -39,11 +38,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LocationSwitchBarControllerTest {
@Mock
@@ -65,8 +62,7 @@
ReflectionHelpers.setField(mSwitchBar, "mSwitch", mSwitch);
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
- mController = spy(new LocationSwitchBarController(
- mContext, mSwitchBar, mLifecycle));
+ mController = spy(new LocationSwitchBarController(mContext, mSwitchBar, mLifecycle));
ReflectionHelpers.setField(mController, "mLocationEnabler", mEnabler);
}
@@ -153,5 +149,4 @@
verify(mSwitch).setChecked(false);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
index 3c90989..0b12506 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
@@ -36,7 +36,6 @@
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.AppPreference;
@@ -55,10 +54,8 @@
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RecentLocationRequestPreferenceControllerTest {
@Mock
@@ -118,8 +115,8 @@
mController.updateState(mCategory);
verify(mCategory).removeAll();
- verify(mCategory).addPreference(
- argThat(titleMatches(mContext.getString(R.string.location_no_recent_apps))));
+ final String title = mContext.getString(R.string.location_no_recent_apps);
+ verify(mCategory).addPreference(argThat(titleMatches(title)));
}
@Test
@@ -207,7 +204,7 @@
AppPreference appPreference = mock(AppPreference.class, "AppPreference" + i);
doReturn(title).when(appPreference).getTitle();
doReturn(appPreference)
- .when(mController).createAppPreference(any(Context.class), eq(req));
+ .when(mController).createAppPreference(any(Context.class), eq(req));
}
return requests;
}
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java
index 2b64dbc..6bd013e 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java
@@ -29,26 +29,25 @@
import android.provider.Settings.Secure;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.AppPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.location.RecentLocationApps;
import com.android.settingslib.location.RecentLocationApps.Request;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.Collections;
/** Unit tests for {@link RecentLocationRequestSeeAllPreferenceController} */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RecentLocationRequestSeeAllPreferenceControllerTest {
@Mock
@@ -115,7 +114,7 @@
doReturn(appPreference)
.when(mController).createAppPreference(any(Context.class), eq(request));
when(mRecentLocationApps.getAppListSorted())
- .thenReturn(new ArrayList<>(Arrays.asList(request)));
+ .thenReturn(new ArrayList<>(Collections.singletonList(request)));
mController.displayPreference(mScreen);
mController.updateState(mCategory);
diff --git a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java b/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
index 27430a9..a07a1c7 100644
--- a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
@@ -22,33 +22,28 @@
import android.provider.SearchIndexableResource;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ScanningSettingsTest {
private Context mContext;
- private ScanningSettings mSettings;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mSettings = new ScanningSettings();
}
@Test
public void searchProvider_shouldIndexDefaultXml() {
- final List<SearchIndexableResource> sir = mSettings.SEARCH_INDEX_DATA_PROVIDER
+ final List<SearchIndexableResource> sir = ScanningSettings.SEARCH_INDEX_DATA_PROVIDER
.getXmlResourcesToIndex(mContext, true /* enabled */);
assertThat(sir).hasSize(1);
diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java
index 75f7821..e7a69ea 100644
--- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java
@@ -16,15 +16,14 @@
package com.android.settings.location;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.Context;
+import android.content.ContentResolver;
import android.provider.Settings;
+import android.provider.Settings.Global;
import android.support.v14.preference.SwitchPreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -33,30 +32,27 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiScanningPreferenceControllerTest {
@Mock
private SwitchPreference mPreference;
- private Context mContext;
+ private ContentResolver mContentResolver;
private WifiScanningPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new WifiScanningPreferenceController(mContext);
+ mContentResolver = RuntimeEnvironment.application.getContentResolver();
+ mController = new WifiScanningPreferenceController(RuntimeEnvironment.application);
when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
}
@Test
public void updateState_wifiScanningEnabled_shouldCheckedPreference() {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1);
+ Settings.Global.putInt(mContentResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1);
mController.updateState(mPreference);
@@ -65,8 +61,7 @@
@Test
public void updateState_wifiScanningDisabled_shouldUncheckedPreference() {
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0);
+ Settings.Global.putInt(mContentResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0);
mController.updateState(mPreference);
@@ -79,9 +74,9 @@
mController.handlePreferenceTreeClick(mPreference);
- assertThat(Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0)).isEqualTo(1);
-
+ final int scanAlways =
+ Settings.Global.getInt(mContentResolver, Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0);
+ assertThat(scanAlways).isEqualTo(1);
}
@Test
@@ -90,8 +85,8 @@
mController.handlePreferenceTreeClick(mPreference);
- assertThat(Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1)).isEqualTo(0);
-
+ final int scanAlways =
+ Settings.Global.getInt(mContentResolver, Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1);
+ assertThat(scanAlways).isEqualTo(0);
}
}
diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
index 320ae9e..33eed3e 100644
--- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
@@ -24,10 +24,8 @@
import android.arch.lifecycle.LifecycleOwner;
import android.content.Context;
import android.content.pm.PackageManager;
-import android.content.res.Resources;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -35,14 +33,12 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AirplaneModePreferenceControllerTest {
@Mock
@@ -55,12 +51,11 @@
private AirplaneModePreferenceController mController;
private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
- private FakeFeatureFactory mFactory;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mFactory = FakeFeatureFactory.setupForTest();
+ FakeFeatureFactory.setupForTest();
mContext = spy(RuntimeEnvironment.application);
doReturn(mPackageManager).when(mContext).getPackageManager();
mController = spy(new AirplaneModePreferenceController(mContext, null));
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index bd55051..dfcd661 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -34,7 +34,6 @@
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsWrapper;
@@ -50,11 +49,10 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowRestrictedLockUtilsWrapper.class, ShadowConnectivityManager.class,
- ShadowUserManager.class}
+@Config(shadows = {
+ ShadowRestrictedLockUtilsWrapper.class,
+ ShadowConnectivityManager.class,
+ ShadowUserManager.class}
)
public class MobileNetworkPreferenceControllerTest {
@@ -74,8 +72,7 @@
mContext = spy(RuntimeEnvironment.application);
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
- when(mContext.getSystemService(Context.TELEPHONY_SERVICE))
- .thenReturn(mTelephonyManager);
+ when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
index a84179d..2574460 100644
--- a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
@@ -16,27 +16,24 @@
package com.android.settings.network;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MobilePlanPreferenceControllerTest {
@Test
public void testNoProvisionStringFormattedCorrectly() {
final String operator = "test_operator";
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
assertThat(context.getString(R.string.mobile_no_provisioning_url, operator, operator))
.contains(operator);
}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
index 548d144..19c9f87 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -24,12 +24,10 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.content.pm.UserInfo;
import android.provider.SearchIndexableResource;
import android.view.Menu;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.drawer.CategoryKey;
@@ -39,20 +37,16 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NetworkDashboardFragmentTest {
@Mock
private Context mContext;
- @Mock
- private UserInfo mUserInfo;
private NetworkDashboardFragment mFragment;
@@ -71,7 +65,7 @@
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
NetworkDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
- ShadowApplication.getInstance().getApplicationContext(),
+ RuntimeEnvironment.application,
true /* enabled */);
assertThat(indexRes).isNotNull();
@@ -144,5 +138,4 @@
verify(mContext).getString(R.string.network_dashboard_summary_data_usage);
verify(mContext).getString(R.string.join_many_items_middle, null, null);
}
-
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
index 896e802..3135c91 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetActionMenuControllerTest.java
@@ -16,19 +16,16 @@
package com.android.settings.network;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.content.Context;
import android.view.Menu;
import android.view.MenuItem;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -36,15 +33,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NetworkResetActionMenuControllerTest {
private static final int MENU_ID = Menu.FIRST;
- private Context mContext;
+
private NetworkResetActionMenuController mController;
@Mock
private Menu mMenu;
@@ -56,8 +51,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new NetworkResetActionMenuController(mContext, MENU_ID);
+ mController = new NetworkResetActionMenuController(RuntimeEnvironment.application, MENU_ID);
ReflectionHelpers.setField(mController, "mRestrictionChecker", mRestrictionChecker);
when(mMenu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mMenuItem);
}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
index 4d8c626..3a1833b 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
@@ -16,11 +16,12 @@
package com.android.settings.network;
-
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -28,28 +29,19 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NetworkResetPreferenceControllerTest {
@Mock
private NetworkResetRestrictionChecker mRestrictionChecker;
- private Context mContext;
private NetworkResetPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new NetworkResetPreferenceController(mContext);
+ mController = new NetworkResetPreferenceController(RuntimeEnvironment.application);
ReflectionHelpers.setField(mController, "mRestrictionChecker", mRestrictionChecker);
}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
index 792bdd3..92994e0 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
@@ -26,17 +26,14 @@
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NetworkResetRestrictionCheckerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
index 7ed7f3f..91d08e6 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,7 +28,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.wrapper.NetworkScoreManagerWrapper;
import org.junit.Before;
@@ -38,12 +36,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NetworkScorerPickerPreferenceControllerTest {
private static final String TEST_SCORER_PACKAGE = "Test Package";
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
index 7cfced8..d96f146 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
@@ -29,13 +29,13 @@
import android.net.NetworkScorerAppData;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settings.wrapper.NetworkScoreManagerWrapper;
-
import com.google.android.collect.Lists;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,12 +43,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NetworkScorerPickerTest {
private static final String TEST_SCORER_PACKAGE_1 = "Test Package 1";
@@ -112,8 +110,8 @@
mFragment.updateCandidates();
verify(mPreferenceScreen).addPreference(arg.capture());
- assertThat(arg.getValue().getTitle()).isEqualTo(
- mContext.getString(R.string.network_scorer_picker_none_preference));
+ assertThat(arg.getValue().getTitle())
+ .isEqualTo(mContext.getString(R.string.network_scorer_picker_none_preference));
assertThat(arg.getValue().isChecked()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsMenuControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsMenuControllerTest.java
index 0be66e0..fa824d6 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsMenuControllerTest.java
@@ -26,7 +26,6 @@
import android.view.MenuItem;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,10 +33,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PrivateDnsMenuControllerTest {
private static final int MENU_ID = 0;
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogFragmentTest.java
index bba689b..93a9669 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogFragmentTest.java
@@ -19,9 +19,7 @@
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -30,7 +28,6 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,11 +35,10 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PrivateDnsModeDialogFragmentTest {
+
private static final String HOST_NAME = "192.168.1.1";
private static final String INVALID_HOST_NAME = "...,";
@@ -115,5 +111,4 @@
mFragment.onCheckedChanged(null, R.id.private_dns_mode_off);
assertThat(mSaveButton.isEnabled()).isTrue();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index b8a6d28..6166d29 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -16,6 +16,14 @@
package com.android.settings.network;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile;
@@ -30,7 +38,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -38,21 +45,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.concurrent.atomic.AtomicReference;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TetherPreferenceControllerTest {
@Mock
@@ -80,8 +77,8 @@
public void lifeCycle_onCreate_shouldInitBluetoothPan() {
mController.onCreate(null);
- verify(mBluetoothAdapter).getProfileProxy(mContext, mController.mBtProfileServiceListener,
- BluetoothProfile.PAN);
+ verify(mBluetoothAdapter)
+ .getProfileProxy(mContext, mController.mBtProfileServiceListener, BluetoothProfile.PAN);
}
@Test
@@ -142,20 +139,19 @@
@Test
public void airplaneModeOn_shouldUpdateSummaryToOff() {
- ReflectionHelpers.setField(mController, "mContext", RuntimeEnvironment.application);
+ final Context context = RuntimeEnvironment.application;
+ ReflectionHelpers.setField(mController, "mContext", context);
- Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
- Settings.Global.AIRPLANE_MODE_ON, 0);
+ Settings.Global.putInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0);
mController.onResume();
verifyZeroInteractions(mPreference);
- Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
- Settings.Global.AIRPLANE_MODE_ON, 1);
+ Settings.Global.putInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
- final ContentObserver observer = ReflectionHelpers.getField(mController,
- "mAirplaneModeObserver");
+ final ContentObserver observer =
+ ReflectionHelpers.getField(mController, "mAirplaneModeObserver");
observer.onChange(true, Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON));
verify(mPreference).setSummary(R.string.switch_off_text);
@@ -179,8 +175,8 @@
mController.onPause();
- verify(mContext).unregisterReceiver(
- any(TetherPreferenceController.TetherBroadcastReceiver.class));
+ verify(mContext)
+ .unregisterReceiver(any(TetherPreferenceController.TetherBroadcastReceiver.class));
}
@Test
@@ -193,5 +189,4 @@
verify(mController).updateSummary();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
index d030531..c4bd245 100644
--- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
@@ -16,10 +16,8 @@
package com.android.settings.network;
-
import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
@@ -36,7 +34,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,11 +42,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowServiceManager;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VpnPreferenceControllerTest {
@Mock
@@ -86,7 +81,6 @@
@Test
public void displayPreference_available_shouldSetDependency() {
-
doReturn(true).when(mController).isAvailable();
mController.displayPreference(mScreen);
@@ -105,5 +99,4 @@
verify(mConnectivityManager).unregisterNetworkCallback(
any(ConnectivityManager.NetworkCallback.class));
}
-
}
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java
index 033c221..39c7d6c 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java
@@ -17,7 +17,6 @@
package com.android.settings.nfc;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -28,7 +27,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NfcForegroundPreferenceTest {
@Mock
private PaymentBackend mPaymentBackend;
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index a82daf3..6feed46 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -17,27 +17,25 @@
package com.android.settings.nfc;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.content.pm.PackageManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PaymentSettingsTest {
+
@Mock
Context mContext;
@@ -57,15 +55,17 @@
public void testNonIndexableKey_NoNFC_KeyAdded() {
when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(false);
- List<String> niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
- assertThat(niks).contains(mFragment.PAYMENT_KEY);
+ final List<String> niks =
+ PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+ assertThat(niks).contains(PaymentSettings.PAYMENT_KEY);
}
@Test
public void testNonIndexableKey_NFC_NoKeyAdded() {
when(mManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
- List<String> niks = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+ final List<String> niks =
+ PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
assertThat(niks).isEmpty();
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
index d33d734..999f83a 100644
--- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
@@ -16,23 +16,6 @@
package com.android.settings.notification;
-import android.content.Context;
-import android.os.UserManager;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.accounts.AccountRestrictionHelper;
-import com.android.settingslib.RestrictedPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -42,8 +25,22 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.content.Context;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.accounts.AccountRestrictionHelper;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AdjustVolumeRestrictedPreferenceControllerTest {
@Mock
@@ -55,8 +52,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- ShadowApplication shadowContext = ShadowApplication.getInstance();
- mContext = spy(shadowContext.getApplicationContext());
+ mContext = spy(RuntimeEnvironment.application);
mController =
new AdjustVolumeRestrictedPreferenceControllerTestable(mContext, mAccountHelper);
}
@@ -88,9 +84,10 @@
eq(UserManager.DISALLOW_ADJUST_VOLUME), anyInt());
}
- private class AdjustVolumeRestrictedPreferenceControllerTestable extends
- AdjustVolumeRestrictedPreferenceController {
- AdjustVolumeRestrictedPreferenceControllerTestable(Context context,
+ private class AdjustVolumeRestrictedPreferenceControllerTestable
+ extends AdjustVolumeRestrictedPreferenceController {
+
+ private AdjustVolumeRestrictedPreferenceControllerTestable(Context context,
AccountRestrictionHelper helper) {
super(context, helper);
}
@@ -110,5 +107,4 @@
return true;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
index f4bd522..9103cfa 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmRingtonePreferenceControllerTest.java
@@ -16,23 +16,20 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import android.media.RingtoneManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AlarmRingtonePreferenceControllerTest {
@Mock
@@ -49,5 +46,4 @@
public void getRingtoneType_shouldReturnAlarm() {
assertThat(mController.getRingtoneType()).isEqualTo(RingtoneManager.TYPE_ALARM);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
index b2fbb00..017a26a 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
@@ -16,11 +16,13 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.media.AudioManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -30,13 +32,7 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AlarmVolumePreferenceControllerTest {
@Mock
@@ -48,7 +44,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = RuntimeEnvironment.application;
mController = new AlarmVolumePreferenceController(mContext, null, null, mHelper);
}
@@ -76,5 +72,4 @@
public void getAudioStream_shouldReturnAlarm() {
assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_ALARM);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
index cd80986..0de0789 100644
--- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
@@ -20,10 +20,8 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -40,7 +38,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -52,11 +49,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AllowSoundPreferenceControllerTest {
private Context mContext;
@@ -70,7 +65,7 @@
private PreferenceScreen mScreen;
@Mock
- NotificationSettingsBase.ImportanceListener mImportanceListener;
+ private NotificationSettingsBase.ImportanceListener mImportanceListener;
private AllowSoundPreferenceController mController;
@@ -80,7 +75,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController =
spy(new AllowSoundPreferenceController(mContext, mImportanceListener, mBackend));
}
@@ -135,7 +130,7 @@
mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
RestrictedLockUtils.EnforcedAdmin.class));
- Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isEnabled());
@@ -150,7 +145,7 @@
when(channel.getId()).thenReturn(lockedId);
mController.onResume(appRow, channel, null, null);
- Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isEnabled());
@@ -163,7 +158,7 @@
when(channel.getId()).thenReturn("something");
mController.onResume(appRow, channel, null, null);
- Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertTrue(pref.isEnabled());
@@ -175,7 +170,7 @@
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
- RestrictedSwitchPreference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertTrue(pref.isChecked());
}
@@ -186,7 +181,7 @@
when(channel.getImportance()).thenReturn(IMPORTANCE_UNSPECIFIED);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
- RestrictedSwitchPreference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertTrue(pref.isChecked());
}
@@ -197,8 +192,7 @@
when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isChecked());
}
@@ -209,8 +203,7 @@
new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_LOW);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
mController.displayPreference(mScreen);
mController.updateState(pref);
@@ -227,8 +220,7 @@
new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
mController.displayPreference(mScreen);
mController.updateState(pref);
diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java
index f5f1a31..2a4ef73 100644
--- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java
@@ -19,10 +19,8 @@
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -35,7 +33,6 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -44,11 +41,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppLinkPreferenceControllerTest {
private Context mContext;
@@ -65,24 +60,24 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = spy(new AppLinkPreferenceController(mContext));
}
@Test
- public void testNoCrashIfNoOnResume() throws Exception {
+ public void testNoCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(Preference.class));
}
@Test
- public void testIsAvailable_notIfNull() throws Exception {
+ public void testIsAvailable_notIfNull() {
mController.onResume(null, null, null, null);
assertFalse(mController.isAvailable());
}
@Test
- public void testIsAvailable_notIfAppBlocked() throws Exception {
+ public void testIsAvailable_notIfAppBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, null, null, null);
@@ -90,7 +85,7 @@
}
@Test
- public void testIsAvailable_notIfChannelBlocked() throws Exception {
+ public void testIsAvailable_notIfChannelBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
@@ -99,7 +94,7 @@
}
@Test
- public void testIsAvailable_notNoIntent() throws Exception {
+ public void testIsAvailable_notNoIntent() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
@@ -109,7 +104,7 @@
}
@Test
- public void testIsAvailable() throws Exception {
+ public void testIsAvailable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.settingsIntent = new Intent("test");
NotificationChannel channel = mock(NotificationChannel.class);
@@ -120,7 +115,7 @@
}
@Test
- public void testUpdateState() throws Exception {
+ public void testUpdateState() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
Intent intent = new Intent("action");
appRow.settingsIntent = intent;
diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
index 912a4bd..c216875 100644
--- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
@@ -21,11 +21,8 @@
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
-import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -43,7 +40,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -55,11 +51,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BadgePreferenceControllerTest {
private Context mContext;
@@ -80,19 +74,19 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = spy(new BadgePreferenceController(mContext, mBackend));
}
@Test
- public void testNoCrashIfNoOnResume() throws Exception {
+ public void testNoCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(RestrictedSwitchPreference.class));
mController.onPreferenceChange(mock(RestrictedSwitchPreference.class), true);
}
@Test
- public void testIsAvailable_notIfAppBlocked() throws Exception {
+ public void testIsAvailable_notIfAppBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, mock(NotificationChannel.class), null, null);
@@ -100,7 +94,7 @@
}
@Test
- public void testIsAvailable_notIfChannelBlocked() throws Exception {
+ public void testIsAvailable_notIfChannelBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
@@ -109,7 +103,7 @@
}
@Test
- public void testIsAvailable_channel_notIfAppOff() throws Exception {
+ public void testIsAvailable_channel_notIfAppOff() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.showBadge = false;
NotificationChannel channel = mock(NotificationChannel.class);
@@ -120,7 +114,7 @@
}
@Test
- public void testIsAvailable_notIfOffGlobally() throws Exception {
+ public void testIsAvailable_notIfOffGlobally() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
@@ -131,7 +125,7 @@
}
@Test
- public void testIsAvailable_app() throws Exception {
+ public void testIsAvailable_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, null, null);
Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_BADGING, 1);
@@ -140,7 +134,7 @@
}
@Test
- public void testIsAvailable_channel() throws Exception {
+ public void testIsAvailable_channel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.showBadge = true;
NotificationChannel channel = mock(NotificationChannel.class);
@@ -152,20 +146,20 @@
}
@Test
- public void testUpdateState_disabledByAdmin() throws Exception {
+ public void testUpdateState_disabledByAdmin() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn("something");
- mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
- RestrictedLockUtils.EnforcedAdmin.class));
+ mController.onResume(
+ new NotificationBackend.AppRow(), channel, null, mock(RestrictedLockUtils.EnforcedAdmin.class));
- Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isEnabled());
}
@Test
- public void testUpdateState_channelNotConfigurable() throws Exception {
+ public void testUpdateState_channelNotConfigurable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -173,22 +167,21 @@
when(channel.getId()).thenReturn(lockedId);
mController.onResume(appRow, channel, null, null);
- Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isEnabled());
}
@Test
- public void testUpdateState_channel() throws Exception {
+ public void testUpdateState_channel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = "a";
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.canShowBadge()).thenReturn(true);
mController.onResume(appRow, channel, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertTrue(pref.isChecked());
@@ -201,13 +194,12 @@
}
@Test
- public void testUpdateState_app() throws Exception {
+ public void testUpdateState_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.showBadge = true;
mController.onResume(appRow, null, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertTrue(pref.isChecked());
@@ -227,8 +219,7 @@
channel.setShowBadge(false);
mController.onResume(appRow, channel, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
mController.displayPreference(mScreen);
mController.updateState(pref);
@@ -247,8 +238,7 @@
channel.setShowBadge(true);
mController.onResume(appRow, channel, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
mController.displayPreference(mScreen);
mController.updateState(pref);
@@ -264,8 +254,7 @@
appRow.showBadge = false;
mController.onResume(appRow, null, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
mController.displayPreference(mScreen);
mController.updateState(pref);
@@ -282,8 +271,7 @@
appRow.showBadge = true;
mController.onResume(appRow, null, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
mController.displayPreference(mScreen);
mController.updateState(pref);
diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
index 8d59fd2..d852aaa 100644
--- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
@@ -29,7 +29,6 @@
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.TwoStatePreference;
-import com.android.settings.TestConfig;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
@@ -43,10 +42,8 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BadgingNotificationPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -90,7 +87,7 @@
@Test
public void updateState_preferenceSetCheckedWhenSettingIsOn() {
final TwoStatePreference preference = mock(TwoStatePreference.class);
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
Settings.Secure.putInt(context.getContentResolver(), NOTIFICATION_BADGING, 1);
mController = new BadgingNotificationPreferenceController(context);
@@ -102,7 +99,7 @@
@Test
public void updateState_preferenceSetUncheckedWhenSettingIsOff() {
final TwoStatePreference preference = mock(TwoStatePreference.class);
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
Settings.Secure.putInt(context.getContentResolver(), NOTIFICATION_BADGING, 0);
mController = new BadgingNotificationPreferenceController(context);
@@ -119,13 +116,13 @@
@Test
@Config(shadows = ShadowSecureSettings.class)
public void testSetValue_updatesCorrectly() {
- int newValue = 0;
+ final int newValue = 0;
ContentResolver resolver = mContext.getContentResolver();
Settings.Secure.putInt(resolver, Settings.Secure.NOTIFICATION_BADGING, 1);
((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
- int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.NOTIFICATION_BADGING,
- 1);
+ final int updatedValue =
+ Settings.Secure.getInt(resolver, Settings.Secure.NOTIFICATION_BADGING, 1);
assertThat(updatedValue).isEqualTo(newValue);
}
@@ -133,11 +130,11 @@
@Test
@Config(shadows = ShadowSecureSettings.class)
public void testGetValue_correctValueReturned() {
- int currentValue = 1;
- ContentResolver resolver = mContext.getContentResolver();
+ final int currentValue = 1;
+ final ContentResolver resolver = mContext.getContentResolver();
Settings.Secure.putInt(resolver, Settings.Secure.NOTIFICATION_BADGING, currentValue);
- int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+ final int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
assertThat(newValue).isEqualTo(currentValue);
}
diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
index 7327d01..cd3fe28 100644
--- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
@@ -22,11 +22,9 @@
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -45,7 +43,6 @@
import android.os.UserManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.SwitchBar;
@@ -56,11 +53,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BlockPreferenceControllerTest {
private Context mContext;
@@ -72,7 +67,7 @@
private UserManager mUm;
@Mock
- NotificationSettingsBase.ImportanceListener mImportanceListener;
+ private NotificationSettingsBase.ImportanceListener mImportanceListener;
private BlockPreferenceController mController;
@Mock
@@ -92,20 +87,20 @@
}
@Test
- public void testNoCrashIfNoOnResume() throws Exception {
+ public void testNoCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(LayoutPreference.class));
mController.onSwitchChanged(null, false);
}
@Test
- public void testIsAvailable_notIfNull() throws Exception {
+ public void testIsAvailable_notIfNull() {
mController.onResume(null, null, null, null);
assertFalse(mController.isAvailable());
}
@Test
- public void testIsAvailable_notIfChannelNotBlockable() throws Exception {
+ public void testIsAvailable_notIfChannelNotBlockable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = true;
NotificationChannel channel = mock(NotificationChannel.class);
@@ -115,7 +110,7 @@
}
@Test
- public void testIsAvailable_notIfGroupNotBlockable() throws Exception {
+ public void testIsAvailable_notIfGroupNotBlockable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = true;
mController.onResume(appRow, null, mock(NotificationChannelGroupWrapper.class), null);
@@ -123,7 +118,7 @@
}
@Test
- public void testIsAvailable_notIfAppNotBlockable() throws Exception {
+ public void testIsAvailable_notIfAppNotBlockable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = true;
mController.onResume(appRow, null, null, null);
@@ -131,7 +126,7 @@
}
@Test
- public void testIsAvailable_systemApp() throws Exception {
+ public void testIsAvailable_systemApp() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = true;
NotificationChannel channel = mock(NotificationChannel.class);
@@ -141,7 +136,7 @@
}
@Test
- public void testIsAvailable_nonSystemApp() throws Exception {
+ public void testIsAvailable_nonSystemApp() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.systemApp = false;
NotificationChannel channel = mock(NotificationChannel.class);
@@ -151,7 +146,7 @@
}
@Test
- public void testUpdateState_app() throws Exception {
+ public void testUpdateState_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, null, null, null);
@@ -169,7 +164,7 @@
}
@Test
- public void testUpdateState_group() throws Exception {
+ public void testUpdateState_group() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
@@ -195,7 +190,7 @@
}
@Test
- public void testUpdateState_channelBlocked() throws Exception {
+ public void testUpdateState_channelBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_NONE);
mController.onResume(appRow, channel, null, null);
@@ -219,7 +214,7 @@
}
@Test
- public void testUpdateState_noCrashIfCalledTwice() throws Exception {
+ public void testUpdateState_noCrashIfCalledTwice() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_LOW);
mController.onResume(appRow, channel, null, null);
@@ -228,7 +223,7 @@
}
@Test
- public void testUpdateState_doesNotResetImportance() throws Exception {
+ public void testUpdateState_doesNotResetImportance() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_LOW);
mController.onResume(appRow, channel, null, null);
@@ -238,7 +233,7 @@
}
@Test
- public void testOnSwitchChanged_channel_default() throws Exception {
+ public void testOnSwitchChanged_channel_default() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.pkg = "pkg";
NotificationChannel channel =
@@ -263,7 +258,7 @@
}
@Test
- public void testOnSwitchChanged_channel_nonDefault() throws Exception {
+ public void testOnSwitchChanged_channel_nonDefault() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
index 58ba46b..a171068 100644
--- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
@@ -16,14 +16,16 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.Before;
import org.junit.Test;
@@ -31,14 +33,9 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import org.robolectric.shadows.ShadowSystemProperties;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BootSoundPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -53,7 +50,6 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- SettingsShadowSystemProperties.clear();
when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_boot_sounds))
.thenReturn(true);
mController = new BootSoundPreferenceController(mContext);
@@ -77,46 +73,41 @@
assertThat(mController.isAvailable()).isFalse();
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void displayPreference_bootSoundEnabled_shouldCheckedPreference() {
- SettingsShadowSystemProperties.set(BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, "1");
+ ShadowSystemProperties.native_set(BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, "1");
mController.displayPreference(mScreen);
verify(mPreference).setChecked(true);
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void displayPreference_bootSoundDisabled_shouldUncheckedPreference() {
- SettingsShadowSystemProperties.set(BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, "0");
+ ShadowSystemProperties.native_set(BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, "0");
mController.displayPreference(mScreen);
verify(mPreference).setChecked(false);
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void handlePreferenceTreeClick_preferenceChecked_shouldEnableBootSound() {
when(mPreference.isChecked()).thenReturn(true);
mController.handlePreferenceTreeClick(mPreference);
- assertThat(SystemProperties.getBoolean(
- BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, true)).isTrue();
+ assertThat(SystemProperties.get(
+ BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, null)).isEqualTo("1");
}
- @Config(shadows = {SettingsShadowSystemProperties.class})
@Test
public void handlePreferenceTreeClick_preferenceUnchecked_shouldDisableBootSound() {
when(mPreference.isChecked()).thenReturn(false);
mController.handlePreferenceTreeClick(mPreference);
- assertThat(SystemProperties.getBoolean(
- BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, true)).isFalse();
+ assertThat(SystemProperties.get(
+ BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, null)).isEqualTo("0");
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
index ed9cc98..badce88 100644
--- a/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/CastPreferenceControllerTest.java
@@ -16,33 +16,30 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import android.telephony.TelephonyManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class CastPreferenceControllerTest {
@Mock
private TelephonyManager mTelephonyManager;
- private Context mContext;
private CastPreferenceController mController;
@Before
@@ -50,8 +47,7 @@
MockitoAnnotations.initMocks(this);
ShadowApplication shadowContext = ShadowApplication.getInstance();
shadowContext.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
- mContext = shadowContext.getApplicationContext();
- mController = new CastPreferenceController(mContext);
+ mController = new CastPreferenceController(RuntimeEnvironment.application);
}
@Test
@@ -67,5 +63,4 @@
assertThat(keys).isEmpty();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
index c24f02e..4e9f007 100644
--- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
@@ -16,15 +16,19 @@
package com.android.settings.notification;
+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.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
+import android.provider.Settings.Global;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.Global;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -33,15 +37,8 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-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;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ChargingSoundPreferenceControllerTest {
@Mock
@@ -63,7 +60,7 @@
mContext = spy(RuntimeEnvironment.application);
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
- mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
+ mPreference = new SwitchPreference(RuntimeEnvironment.application);
mController = new ChargingSoundPreferenceController(mContext, mSetting, null);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
doReturn(mScreen).when(mSetting).getPreferenceScreen();
diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
index 8cf8f83..51f5a6a 100644
--- a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
@@ -17,21 +17,15 @@
package com.android.settings.notification;
import static com.android.settings.notification.ConfigureNotificationSettings.KEY_LOCKSCREEN;
-import static com.android.settings.notification.ConfigureNotificationSettings
- .KEY_LOCKSCREEN_WORK_PROFILE;
-import static com.android.settings.notification.ConfigureNotificationSettings
- .KEY_LOCKSCREEN_WORK_PROFILE_HEADER;
+import static com.android.settings.notification.ConfigureNotificationSettings.KEY_LOCKSCREEN_WORK_PROFILE;
+import static com.android.settings.notification.ConfigureNotificationSettings.KEY_LOCKSCREEN_WORK_PROFILE_HEADER;
import static com.android.settings.notification.ConfigureNotificationSettings.KEY_SWIPE_DOWN;
import static com.google.common.truth.Truth.assertThat;
-import android.content.Context;
-
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settings.testutils.shadow.ShadowUtils;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
@@ -40,16 +34,8 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ConfigureNotificationSettingsTest {
- private Context mContext;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- }
-
@Test
@Config(shadows = {
ShadowUtils.class,
@@ -57,7 +43,7 @@
})
public void getNonIndexableKeys_shouldContainLockScreenPrefs() {
final List<String> keys = ConfigureNotificationSettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(mContext);
+ .getNonIndexableKeys(RuntimeEnvironment.application);
assertThat(keys).containsAllOf(
KEY_SWIPE_DOWN, KEY_LOCKSCREEN, KEY_LOCKSCREEN_WORK_PROFILE,
diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java
index 0d8b430..5c55c52 100644
--- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java
@@ -18,7 +18,6 @@
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
@@ -32,7 +31,6 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.wrapper.NotificationChannelGroupWrapper;
import org.junit.Before;
@@ -42,11 +40,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DeletedChannelsPreferenceControllerTest {
private Context mContext;
@@ -70,13 +66,13 @@
}
@Test
- public void noCrashIfNoOnResume() throws Exception {
+ public void noCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(Preference.class));
}
@Test
- public void isAvailable_appScreen_notIfAppBlocked() throws Exception {
+ public void isAvailable_appScreen_notIfAppBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, null, null, null);
@@ -84,35 +80,35 @@
}
@Test
- public void isAvailable_groupScreen_never() throws Exception {
+ public void isAvailable_groupScreen_never() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
mController.onResume(appRow, null, mock(NotificationChannelGroupWrapper.class), null);
assertFalse(mController.isAvailable());
}
@Test
- public void isAvailable_channelScreen_never() throws Exception {
+ public void isAvailable_channelScreen_never() {
mController.onResume(
new NotificationBackend.AppRow(), mock(NotificationChannel.class), null, null);
assertFalse(mController.isAvailable());
}
@Test
- public void isAvailable_appScreen_notIfNoDeletedChannels() throws Exception {
+ public void isAvailable_appScreen_notIfNoDeletedChannels() {
when(mBackend.getDeletedChannelCount(any(), anyInt())).thenReturn(0);
mController.onResume(new NotificationBackend.AppRow(), null, null, null);
assertFalse(mController.isAvailable());
}
@Test
- public void isAvailable_appScreen() throws Exception {
+ public void isAvailable_appScreen() {
when(mBackend.getDeletedChannelCount(any(), anyInt())).thenReturn(1);
mController.onResume(new NotificationBackend.AppRow(), null, null, null);
assertTrue(mController.isAvailable());
}
@Test
- public void updateState() throws Exception {
+ public void updateState() {
when(mBackend.getDeletedChannelCount(any(), anyInt())).thenReturn(1);
mController.onResume(new NotificationBackend.AppRow(), null, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java
index 3065d99..a1b2837 100644
--- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java
@@ -18,10 +18,8 @@
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -34,7 +32,6 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.NotificationChannelGroupWrapper;
@@ -44,11 +41,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DescriptionPreferenceControllerTest {
private Context mContext;
@@ -70,19 +65,19 @@
}
@Test
- public void testNoCrashIfNoOnResume() throws Exception {
+ public void testNoCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(Preference.class));
}
@Test
- public void testIsAvailable_notIfNull() throws Exception {
+ public void testIsAvailable_notIfNull() {
mController.onResume(null, null, null, null);
assertFalse(mController.isAvailable());
}
@Test
- public void testIsAvailable_notIfChannelGroupBlocked() throws Exception {
+ public void testIsAvailable_notIfChannelGroupBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
when(group.isBlocked()).thenReturn(true);
@@ -91,7 +86,7 @@
}
@Test
- public void testIsAvailable_notIfChannelBlocked() throws Exception {
+ public void testIsAvailable_notIfChannelBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
@@ -100,7 +95,7 @@
}
@Test
- public void testIsAvailable_notIfNoChannelDesc() throws Exception {
+ public void testIsAvailable_notIfNoChannelDesc() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
@@ -109,7 +104,7 @@
}
@Test
- public void testIsAvailable_notIfNoChannelGroupDesc() throws Exception {
+ public void testIsAvailable_notIfNoChannelGroupDesc() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
@@ -118,7 +113,7 @@
}
@Test
- public void testIsAvailable_channel() throws Exception {
+ public void testIsAvailable_channel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
@@ -128,7 +123,7 @@
}
@Test
- public void testIsAvailable_channelGroup() throws Exception {
+ public void testIsAvailable_channelGroup() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
@@ -139,7 +134,7 @@
}
@Test
- public void testUpdateState_channel() throws Exception {
+ public void testUpdateState_channel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
@@ -155,7 +150,7 @@
}
@Test
- public void testUpdateState_channelGroup() throws Exception {
+ public void testUpdateState_channelGroup() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
when(group.getGroup()).thenReturn(mock(NotificationChannelGroup.class));
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
index 4ec67e6..f6bc178 100644
--- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
@@ -16,31 +16,28 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
+import android.provider.Settings.System;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.System;
import android.telephony.TelephonyManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DialPadTonePreferenceControllerTest {
@Mock
@@ -67,7 +64,7 @@
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
- mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
+ mPreference = new SwitchPreference(RuntimeEnvironment.application);
mController = new DialPadTonePreferenceController(mContext, mSetting, null);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
doReturn(mScreen).when(mSetting).getPreferenceScreen();
diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
index f52cb2e..453a2c8 100644
--- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
@@ -21,11 +21,8 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_MIN;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
-import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -41,7 +38,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -54,11 +50,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DndPreferenceControllerTest {
private Context mContext;
@@ -81,12 +75,12 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = spy(new DndPreferenceController(mContext, mLifecycle, mBackend));
}
@Test
- public void testNoCrashIfNoOnResume() throws Exception {
+ public void testNoCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(RestrictedSwitchPreference.class));
mController.onPreferenceChange(mock(RestrictedSwitchPreference.class), true);
@@ -94,7 +88,7 @@
}
@Test
- public void testIsAvailable_notIfNotImportant_noVisEffects() throws Exception {
+ public void testIsAvailable_notIfNotImportant_noVisEffects() {
when(mNm.getNotificationPolicy()).thenReturn(new NotificationManager.Policy(0, 0, 0, 0));
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_LOW);
@@ -104,7 +98,7 @@
}
@Test
- public void testIsAvailable_notIfNotImportant_visEffects() throws Exception {
+ public void testIsAvailable_notIfNotImportant_visEffects() {
when(mNm.getNotificationPolicy()).thenReturn(new NotificationManager.Policy(0, 0, 0, 1));
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_MIN);
@@ -114,7 +108,7 @@
}
@Test
- public void testIsAvailable_importance_noVisEffects() throws Exception {
+ public void testIsAvailable_importance_noVisEffects() {
when(mNm.getNotificationPolicy()).thenReturn(new NotificationManager.Policy(0, 0, 0, 0));
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
@@ -124,7 +118,7 @@
}
@Test
- public void testIsAvailable_important_visEffects() throws Exception {
+ public void testIsAvailable_important_visEffects() {
when(mNm.getNotificationPolicy()).thenReturn(new NotificationManager.Policy(0, 0, 0, 1));
assertTrue(mNm.getNotificationPolicy().suppressedVisualEffects != 0);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
@@ -135,7 +129,7 @@
}
@Test
- public void testUpdateState_disabledByAdmin() throws Exception {
+ public void testUpdateState_disabledByAdmin() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn("something");
mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
@@ -148,7 +142,7 @@
}
@Test
- public void testUpdateState_notConfigurable() throws Exception {
+ public void testUpdateState_notConfigurable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -163,7 +157,7 @@
}
@Test
- public void testUpdateState_configurable() throws Exception {
+ public void testUpdateState_configurable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn("something");
@@ -176,7 +170,7 @@
}
@Test
- public void testUpdateState_bypassDnd() throws Exception {
+ public void testUpdateState_bypassDnd() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.canBypassDnd()).thenReturn(true);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
@@ -188,7 +182,7 @@
}
@Test
- public void testUpdateState_noBypassDnd() throws Exception {
+ public void testUpdateState_noBypassDnd() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.canBypassDnd()).thenReturn(false);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
index 58e5636..ba7720a 100644
--- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
@@ -16,32 +16,29 @@
package com.android.settings.notification;
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.support.v7.preference.DropDownPreference;
-import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.Global;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings.Global;
+import android.support.v7.preference.DropDownPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DockAudioMediaPreferenceControllerTest {
@Mock
@@ -61,13 +58,12 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- final Context appContext = ShadowApplication.getInstance().getApplicationContext();
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
when(mActivity.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
.thenReturn(true);
when(mActivity.getResources().getString(anyInt())).thenReturn("test string");
- mPreference = new DropDownPreference(appContext);
+ mPreference = new DropDownPreference(RuntimeEnvironment.application);
mController = new DockAudioMediaPreferenceController(mContext, mSetting, null);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
doReturn(mScreen).when(mSetting).getPreferenceScreen();
diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
index d6a277f..c242cd0 100644
--- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
@@ -16,31 +16,28 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
+import android.provider.Settings.Global;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.Global;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Answers.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DockingSoundPreferenceControllerTest {
@Mock
@@ -62,7 +59,7 @@
MockitoAnnotations.initMocks(this);
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
- mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
+ mPreference = new SwitchPreference(RuntimeEnvironment.application);
when(mActivity.getResources().getBoolean(com.android.settings.R.bool.has_dock_settings))
.thenReturn(true);
mController = new DockingSoundPreferenceController(mContext, mSetting, null);
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
index 24f4b6c..93273c8 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
@@ -16,13 +16,19 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.UserManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.accounts.AccountRestrictionHelper;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedPreference;
import org.junit.Before;
@@ -31,17 +37,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EmergencyBroadcastPreferenceControllerTest {
private static final String PREF_TEST_KEY = "test_key";
@@ -64,8 +61,8 @@
MockitoAnnotations.initMocks(this);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
- mController = new EmergencyBroadcastPreferenceController(mContext, mAccountHelper,
- PREF_TEST_KEY);
+ mController =
+ new EmergencyBroadcastPreferenceController(mContext, mAccountHelper, PREF_TEST_KEY);
}
@Test
@@ -128,5 +125,4 @@
assertThat(mController.isAvailable()).isFalse();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
index c3e887f..5bfcb40 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
@@ -16,31 +16,28 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
+import android.provider.Settings.Global;
import android.support.v7.preference.DropDownPreference;
import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.Global;
import android.telephony.TelephonyManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EmergencyTonePreferenceControllerTest {
@Mock
@@ -62,7 +59,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- final Context appContext = ShadowApplication.getInstance().getApplicationContext();
+ final Context appContext = RuntimeEnvironment.application;
when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
when(mTelephonyManager.getCurrentPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
when(mSetting.getActivity()).thenReturn(mActivity);
diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
index ab7e384..7e34f89 100644
--- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
@@ -17,15 +17,12 @@
package com.android.settings.notification;
import static android.app.NotificationManager.IMPORTANCE_NONE;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.Activity;
@@ -37,7 +34,6 @@
import android.support.v14.preference.PreferenceFragment;
import android.view.View;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.NotificationChannelGroupWrapper;
@@ -47,11 +43,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HeaderPreferenceControllerTest {
private Context mContext;
@@ -83,19 +77,19 @@
}
@Test
- public void testNoCrashIfNoOnResume() throws Exception {
+ public void testNoCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(LayoutPreference.class));
}
@Test
- public void testIsAvailable_notIfNull() throws Exception {
+ public void testIsAvailable_notIfNull() {
mController.onResume(null, null, null, null);
assertFalse(mController.isAvailable());
}
@Test
- public void testIsAvailable() throws Exception {
+ public void testIsAvailable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, null, null, null);
@@ -103,7 +97,7 @@
}
@Test
- public void testGetLabel() throws Exception {
+ public void testGetLabel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.label = "bananas";
mController.onResume(appRow, null, null, null);
@@ -120,7 +114,7 @@
}
@Test
- public void testGetSummary() throws Exception {
+ public void testGetSummary() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.label = "bananas";
mController.onResume(appRow, null, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
index 229a212..8ece321 100644
--- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
@@ -20,12 +20,10 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
-
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;
-
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -41,7 +39,6 @@
import android.text.TextUtils;
import com.android.settings.RestrictedListPreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
@@ -52,11 +49,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ImportancePreferenceControllerTest {
private Context mContext;
@@ -65,7 +60,7 @@
@Mock
private NotificationBackend mBackend;
@Mock
- NotificationSettingsBase.ImportanceListener mImportanceListener;
+ private NotificationSettingsBase.ImportanceListener mImportanceListener;
@Mock
private UserManager mUm;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -79,25 +74,25 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = spy(new ImportancePreferenceController(
mContext, mImportanceListener, mBackend));
}
@Test
- public void testNoCrashIfNoOnResume() throws Exception {
+ public void testNoCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(Preference.class));
}
@Test
- public void testIsAvailable_notIfNull() throws Exception {
+ public void testIsAvailable_notIfNull() {
mController.onResume(null, null, null, null);
assertFalse(mController.isAvailable());
}
@Test
- public void testIsAvailable_notIfAppBlocked() throws Exception {
+ public void testIsAvailable_notIfAppBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, mock(NotificationChannel.class), null, null);
@@ -105,7 +100,7 @@
}
@Test
- public void testIsAvailable_notIfChannelBlocked() throws Exception {
+ public void testIsAvailable_notIfChannelBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
@@ -114,7 +109,7 @@
}
@Test
- public void testIsAvailable_notForDefaultChannel() throws Exception {
+ public void testIsAvailable_notForDefaultChannel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
@@ -124,7 +119,7 @@
}
@Test
- public void testIsAvailable() throws Exception {
+ public void testIsAvailable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
@@ -133,13 +128,13 @@
}
@Test
- public void testUpdateState_disabledByAdmin() throws Exception {
+ public void testUpdateState_disabledByAdmin() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
RestrictedLockUtils.EnforcedAdmin.class));
- Preference pref = new RestrictedListPreference(RuntimeEnvironment.application, null);
+ Preference pref = new RestrictedListPreference(mContext, null);
mController.updateState(pref);
assertFalse(pref.isEnabled());
@@ -147,7 +142,7 @@
}
@Test
- public void testUpdateState_notConfigurable() throws Exception {
+ public void testUpdateState_notConfigurable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -156,7 +151,7 @@
when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
- Preference pref = new RestrictedListPreference(RuntimeEnvironment.application, null);
+ Preference pref = new RestrictedListPreference(mContext, null);
mController.updateState(pref);
assertFalse(pref.isEnabled());
@@ -164,12 +159,12 @@
}
@Test
- public void testUpdateState() throws Exception {
+ public void testUpdateState() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
mController.onResume(appRow, channel, null, null);
- Preference pref = new RestrictedListPreference(RuntimeEnvironment.application, null);
+ Preference pref = new RestrictedListPreference(mContext, null);
mController.updateState(pref);
assertTrue(pref.isEnabled());
@@ -183,8 +178,7 @@
channel.setSound(null, Notification.AUDIO_ATTRIBUTES_DEFAULT);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
- RestrictedListPreference pref =
- new RestrictedListPreference(RuntimeEnvironment.application, null);
+ RestrictedListPreference pref = new RestrictedListPreference(mContext, null);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
mController.displayPreference(mScreen);
mController.updateState(pref);
@@ -203,8 +197,7 @@
channel.setSound(null, Notification.AUDIO_ATTRIBUTES_DEFAULT);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
- RestrictedListPreference pref =
- new RestrictedListPreference(RuntimeEnvironment.application, null);
+ RestrictedListPreference pref = new RestrictedListPreference(mContext, null);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
mController.displayPreference(mScreen);
mController.updateState(pref);
diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
index 1a96b40..66b993e 100644
--- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
@@ -21,10 +21,8 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -41,7 +39,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.RestrictedLockUtils;
@@ -58,9 +55,7 @@
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- SettingsShadowResources.class,
-})
+@Config(shadows = SettingsShadowResources.class)
public class LightsPreferenceControllerTest {
private Context mContext;
@@ -81,7 +76,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = spy(new LightsPreferenceController(mContext, mBackend));
// By default allow lights
@@ -91,14 +86,14 @@
}
@Test
- public void testNoCrashIfNoOnResume() throws Exception {
+ public void testNoCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(RestrictedSwitchPreference.class));
mController.onPreferenceChange(mock(RestrictedSwitchPreference.class), true);
}
@Test
- public void testIsAvailable_notIfConfigNotAllowed() throws Exception {
+ public void testIsAvailable_notIfConfigNotAllowed() {
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_intrusiveNotificationLed, false);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
@@ -108,7 +103,7 @@
}
@Test
- public void testIsAvailable_notIfSettingNotAllowed() throws Exception {
+ public void testIsAvailable_notIfSettingNotAllowed() {
Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 0);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
@@ -117,7 +112,7 @@
}
@Test
- public void testIsAvailable_notIfNotImportant() throws Exception {
+ public void testIsAvailable_notIfNotImportant() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_LOW);
mController.onResume(appRow, channel, null, null);
@@ -125,7 +120,7 @@
}
@Test
- public void testIsAvailable_notIfDefaultChannel() throws Exception {
+ public void testIsAvailable_notIfDefaultChannel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel =
new NotificationChannel(DEFAULT_CHANNEL_ID, "", IMPORTANCE_DEFAULT);
@@ -134,7 +129,7 @@
}
@Test
- public void testIsAvailable() throws Exception {
+ public void testIsAvailable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
mController.onResume(appRow, channel, null, null);
@@ -142,20 +137,20 @@
}
@Test
- public void testUpdateState_disabledByAdmin() throws Exception {
+ public void testUpdateState_disabledByAdmin() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn("something");
- mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
- RestrictedLockUtils.EnforcedAdmin.class));
+ mController.onResume(new NotificationBackend.AppRow(), channel, null,
+ mock(RestrictedLockUtils.EnforcedAdmin.class));
- Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isEnabled());
}
@Test
- public void testUpdateState_notConfigurable() throws Exception {
+ public void testUpdateState_notConfigurable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -163,45 +158,43 @@
when(channel.getId()).thenReturn(lockedId);
mController.onResume(appRow, channel, null, null);
- Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isEnabled());
}
@Test
- public void testUpdateState_configurable() throws Exception {
+ public void testUpdateState_configurable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn("something");
mController.onResume(appRow, channel, null, null);
- Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertTrue(pref.isEnabled());
}
@Test
- public void testUpdateState_lightsOn() throws Exception {
+ public void testUpdateState_lightsOn() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.shouldShowLights()).thenReturn(true);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertTrue(pref.isChecked());
}
@Test
- public void testUpdateState_lightsOff() throws Exception {
+ public void testUpdateState_lightsOff() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.shouldShowLights()).thenReturn(false);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isChecked());
}
@@ -212,8 +205,7 @@
new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_DEFAULT);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
- RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ RestrictedSwitchPreference pref = new RestrictedSwitchPreference(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
mController.displayPreference(mScreen);
mController.updateState(pref);
@@ -231,7 +223,7 @@
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
RestrictedSwitchPreference pref =
- new RestrictedSwitchPreference(RuntimeEnvironment.application);
+ new RestrictedSwitchPreference(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(pref);
mController.displayPreference(mScreen);
mController.updateState(pref);
diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
index 688575a..65680b1 100644
--- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
@@ -16,36 +16,27 @@
package com.android.settings.notification;
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
+
import android.media.AudioManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MediaVolumePreferenceControllerTest {
- private Context mContext;
private MediaVolumePreferenceController mController;
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- mController = new MediaVolumePreferenceController(mContext, null, null);
+ mController =
+ new MediaVolumePreferenceController(RuntimeEnvironment.application, null, null);
}
@Test
@@ -63,5 +54,4 @@
public void getAudioStream_shouldReturnMusic() {
assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_MUSIC);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
index 619c472..58b5ea3 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
@@ -23,7 +23,6 @@
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,10 +30,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotificationAccessSettingsTest {
private FakeFeatureFactory mFeatureFactory;
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java
index dc8ee13..4ac7527 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java
@@ -17,7 +17,6 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -30,7 +29,6 @@
import android.widget.Switch;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
@@ -38,11 +36,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotificationAppPreferenceTest {
private Context mContext;
@@ -117,6 +112,8 @@
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_app, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
+ assertThat(widgetView).isNotNull();
+
inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true);
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
preference.onBindViewHolder(holder);
@@ -135,6 +132,8 @@
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_app, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
+ assertThat(widgetView).isNotNull();
+
inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true);
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
preference.onBindViewHolder(holder);
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
index 089e330..4d7b07c 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
@@ -16,22 +16,18 @@
package com.android.settings.notification;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+
import com.android.settings.notification.NotificationBackend.AppRow;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.robolectric.annotation.Config;
import org.junit.Test;
import org.junit.runner.RunWith;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNull;
-
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotificationBackendTest {
@Test
@@ -109,7 +105,6 @@
assertEquals(channelName, appRow.lockedChannelId);
}
-
@Test
public void testMarkAppRow_blocklistWithNullEntries() {
AppRow appRow = new AppRow();
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
index 8f91806..4b6c76e 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
@@ -22,10 +22,8 @@
import static android.app.NotificationManager.IMPORTANCE_MIN;
import static android.app.NotificationManager.IMPORTANCE_NONE;
import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.any;
@@ -41,7 +39,6 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.NotificationChannelGroupWrapper;
import com.android.settingslib.RestrictedLockUtils;
@@ -52,11 +49,9 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotificationPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -305,8 +300,7 @@
private final class TestPreferenceController extends NotificationPreferenceController {
- public TestPreferenceController(Context context,
- NotificationBackend backend) {
+ private TestPreferenceController(Context context, NotificationBackend backend) {
super(context, backend);
}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
index f712ec8..21737c1 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationRingtonePreferenceControllerTest.java
@@ -16,36 +16,28 @@
package com.android.settings.notification;
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
+
import android.media.RingtoneManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotificationRingtonePreferenceControllerTest {
- private Context mContext;
private NotificationRingtonePreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- mController = new NotificationRingtonePreferenceController(mContext);
+ mController = new NotificationRingtonePreferenceController(RuntimeEnvironment.application);
}
@Test
@@ -63,5 +55,4 @@
public void getRingtoneType_shouldReturnNotification() {
assertThat(mController.getRingtoneType()).isEqualTo(RingtoneManager.TYPE_NOTIFICATION);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
index 131fb18..1c605b9 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
@@ -16,13 +16,16 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.media.AudioManager;
import android.os.Vibrator;
import android.telephony.TelephonyManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -32,13 +35,7 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotificationVolumePreferenceControllerTest {
@Mock
@@ -97,5 +94,4 @@
public void getAudioStream_shouldReturnNotification() {
assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_NOTIFICATION);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java
index 82ef6fd..dcf3b7b 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java
@@ -17,11 +17,8 @@
package com.android.settings.notification;
import static android.app.NotificationManager.IMPORTANCE_NONE;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -32,7 +29,6 @@
import android.os.UserManager;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.NotificationChannelGroupWrapper;
@@ -42,14 +38,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotificationsOffPreferenceControllerTest {
- private Context mContext;
@Mock
private NotificationManager mNm;
@Mock
@@ -63,18 +56,17 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
- mController = spy(new NotificationsOffPreferenceController(mContext));
+ mController = spy(new NotificationsOffPreferenceController(RuntimeEnvironment.application));
}
@Test
- public void testNoCrashIfNoOnResume() throws Exception {
+ public void testNoCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(Preference.class));
}
@Test
- public void testIsAvailable_yesIfAppBlocked() throws Exception {
+ public void testIsAvailable_yesIfAppBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, null, null, null);
@@ -82,7 +74,7 @@
}
@Test
- public void testIsAvailable_yesIfChannelGroupBlocked() throws Exception {
+ public void testIsAvailable_yesIfChannelGroupBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
when(group.isBlocked()).thenReturn(true);
@@ -91,7 +83,7 @@
}
@Test
- public void testIsAvailable_yesIfChannelBlocked() throws Exception {
+ public void testIsAvailable_yesIfChannelBlocked() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
@@ -100,7 +92,7 @@
}
@Test
- public void testUpdateState_channel() throws Exception {
+ public void testUpdateState_channel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_NONE);
@@ -114,7 +106,7 @@
}
@Test
- public void testUpdateState_channelGroup() throws Exception {
+ public void testUpdateState_channelGroup() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannelGroupWrapper group = mock(NotificationChannelGroupWrapper.class);
when(group.isBlocked()).thenReturn(true);
@@ -128,7 +120,7 @@
}
@Test
- public void testUpdateState_app() throws Exception {
+ public void testUpdateState_app() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.banned = true;
mController.onResume(appRow, null, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
index 57ab4d3..98cbc76 100644
--- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
@@ -16,26 +16,24 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.media.RingtoneManager;
import android.telephony.TelephonyManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PhoneRingtonePreferenceControllerTest {
@Mock
@@ -49,7 +47,7 @@
MockitoAnnotations.initMocks(this);
ShadowApplication shadowContext = ShadowApplication.getInstance();
shadowContext.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
- mContext = shadowContext.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = new PhoneRingtonePreferenceController(mContext);
}
@@ -71,5 +69,4 @@
public void getRingtoneType_shouldReturnRingtone() {
assertThat(mController.getRingtoneType()).isEqualTo(RingtoneManager.TYPE_RINGTONE);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
index 43833fd..0d4e6c4 100644
--- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
@@ -28,8 +28,6 @@
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.TwoStatePreference;
-import com.android.settings.TestConfig;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,11 +36,8 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
@RunWith(RobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PulseNotificationPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -86,7 +81,7 @@
@Test
public void updateState_preferenceSetCheckedWhenSettingIsOn() {
final TwoStatePreference preference = mock(TwoStatePreference.class);
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
Settings.System.putInt(context.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1);
mController = new PulseNotificationPreferenceController(context);
@@ -98,7 +93,7 @@
@Test
public void updateState_preferenceSetUncheckedWhenSettingIsOff() {
final TwoStatePreference preference = mock(TwoStatePreference.class);
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
Settings.System.putInt(context.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 0);
mController = new PulseNotificationPreferenceController(context);
diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
index 1aa963d..13ac868 100644
--- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.notification;
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;
@@ -32,7 +31,6 @@
import static org.mockito.Mockito.when;
import android.app.Activity;
-import android.app.Application;
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
@@ -48,7 +46,6 @@
import android.text.TextUtils;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
@@ -69,7 +66,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RecentNotifyingAppsPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
index 1a6d3d7..f5e87e7 100644
--- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
@@ -16,6 +16,9 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.app.NotificationManager;
import android.content.ComponentName;
import android.content.Context;
@@ -24,21 +27,16 @@
import android.telephony.TelephonyManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RingVolumePreferenceControllerTest {
@Mock
@@ -65,7 +63,7 @@
shadowContext.setSystemService(Context.AUDIO_SERVICE, mAudioManager);
shadowContext.setSystemService(Context.VIBRATOR_SERVICE, mVibrator);
shadowContext.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowContext.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
when(mNotificationManager.getEffectsSuppressor()).thenReturn(mSuppressor);
mController = new RingVolumePreferenceController(mContext, null, null, mHelper);
}
@@ -98,5 +96,4 @@
public void getAudioStream_shouldReturnRing() {
assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_RING);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
index e72ef53..4494dd1 100644
--- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
@@ -16,27 +16,24 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
import android.content.Context;
-import android.support.v7.preference.Preference;
import android.media.RingtoneManager;
+import android.support.v7.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RingtonePreferenceControllerBaseTest {
@Mock
@@ -55,7 +52,6 @@
assertThat(mController.isAvailable()).isTrue();
}
-
@Test
public void updateState_shouldSetSummary() {
Preference preference = mock(Preference.class);
@@ -65,8 +61,8 @@
verify(preference).setSummary(anyString());
}
- private class RingtonePreferenceControllerBaseTestable extends
- RingtonePreferenceControllerBase {
+ private class RingtonePreferenceControllerBaseTestable
+ extends RingtonePreferenceControllerBase {
RingtonePreferenceControllerBaseTestable(Context context) {
super(context);
}
@@ -81,5 +77,4 @@
return RingtoneManager.TYPE_RINGTONE;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
index e6a8718..f15e2b7 100644
--- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
@@ -16,15 +16,19 @@
package com.android.settings.notification;
+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.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
+import android.provider.Settings.System;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.System;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -33,15 +37,8 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-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;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ScreenLockSoundPreferenceControllerTest {
@Mock
@@ -63,7 +60,7 @@
mContext = spy(RuntimeEnvironment.application);
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
- mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
+ mPreference = new SwitchPreference(RuntimeEnvironment.application);
mController = new ScreenLockSoundPreferenceController(mContext, mSetting, null);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
doReturn(mScreen).when(mSetting).getPreferenceScreen();
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
index 307536d..ec12461 100644
--- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
@@ -16,6 +16,13 @@
package com.android.settings.notification;
+import static com.android.settings.notification.SettingPref.TYPE_GLOBAL;
+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.verify;
+import static org.mockito.Mockito.when;
+
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
@@ -24,30 +31,19 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import java.util.ArrayList;
-import java.util.List;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
-import static com.android.settings.notification.SettingPref.TYPE_GLOBAL;
-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.verify;
-import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingPrefControllerTest {
@Mock
@@ -66,7 +62,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(ShadowApplication.getInstance().getApplicationContext());
+ mContext = spy(RuntimeEnvironment.application);
when(mContext.getContentResolver()).thenReturn(mContentResolver);
when(mSetting.getActivity()).thenReturn(mActivity);
doReturn(mScreen).when(mSetting).getPreferenceScreen();
@@ -90,7 +86,7 @@
@Test
public void getPreferenceKey_shouldReturnPrefKey() {
- assertThat(mController.getPreferenceKey()).isEqualTo(mController.KEY_TEST);
+ assertThat(mController.getPreferenceKey()).isEqualTo(PreferenceControllerTestable.KEY_TEST);
}
@Test
@@ -150,7 +146,7 @@
private static final String KEY_TEST = "key1";
private boolean mApplicable = true;
- public PreferenceControllerTestable(Context context, SettingsPreferenceFragment parent,
+ private PreferenceControllerTestable(Context context, SettingsPreferenceFragment parent,
Lifecycle lifecycle) {
super(context, parent, lifecycle);
mPreference = spy(new SettingPref(
@@ -173,7 +169,5 @@
void setApplicable(boolean applicable) {
mApplicable = applicable;
}
-
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
index 33d5073..d707f4d 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
@@ -45,7 +45,6 @@
import android.util.AttributeSet;
import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.RestrictedLockUtils;
@@ -61,9 +60,7 @@
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- SettingsShadowResources.class
-})
+@Config(shadows = SettingsShadowResources.class)
public class SoundPreferenceControllerTest {
private Context mContext;
@@ -107,7 +104,7 @@
mController.onPreferenceChange(mock(NotificationSoundPreference.class), Uri.EMPTY);
mController.handlePreferenceTreeClick(mock(NotificationSoundPreference.class));
mController.onActivityResult(1, 1, null);
- mController.hasValidSound(null);
+ SoundPreferenceController.hasValidSound(null);
}
@Test
@@ -224,7 +221,6 @@
verify(mFragment, never()).startActivityForResult(any(), anyInt());
}
-
@Test
public void testOnPreferenceTreeClick_correctPref() throws Exception {
NotificationSoundPreference pref =
@@ -251,12 +247,12 @@
public void testHasValidSound() {
NotificationChannel channel =
new NotificationChannel(DEFAULT_CHANNEL_ID, "a", IMPORTANCE_HIGH);
- assertTrue(mController.hasValidSound(channel));
+ assertTrue(SoundPreferenceController.hasValidSound(channel));
channel.setSound(Uri.EMPTY, Notification.AUDIO_ATTRIBUTES_DEFAULT);
- assertFalse(mController.hasValidSound(channel));
+ assertFalse(SoundPreferenceController.hasValidSound(channel));
channel.setSound(null, Notification.AUDIO_ATTRIBUTES_DEFAULT);
- assertFalse(mController.hasValidSound(channel));
+ assertFalse(SoundPreferenceController.hasValidSound(channel));
}
}
diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
index 3f17e1d..7d192e7 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
@@ -16,16 +16,22 @@
package com.android.settings.notification;
-import android.content.Context;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import android.content.Context;
import android.media.AudioManager;
import android.os.UserManager;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowAudioHelper;
import com.android.settings.testutils.shadow.ShadowUserManager;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
@@ -33,21 +39,11 @@
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SoundSettingsTest {
@Test
- @Config( shadows = {
- ShadowUserManager.class,
- ShadowAudioHelper.class,
- })
+ @Config(shadows = {ShadowUserManager.class, ShadowAudioHelper.class})
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = spy(RuntimeEnvironment.application);
AudioManager audioManager = mock(AudioManager.class);
@@ -57,13 +53,12 @@
when(userManager.isAdminUser()).thenReturn(false);
doReturn(userManager).when(context).getSystemService(Context.USER_SERVICE);
- final List<String> niks = SoundSettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(context);
+ final List<String> niks =
+ SoundSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(context);
SoundSettings settings = new SoundSettings();
final int xmlId = settings.getPreferenceScreenResId();
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
- keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
- R.xml.zen_mode_settings));
+ keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.zen_mode_settings));
// Add keys with hidden resources
keys.add("alarm_volume");
keys.add("ring_volume");
diff --git a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
index 74c41f3..622d5cd 100644
--- a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
@@ -15,25 +15,23 @@
*/
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SuppressorHelperTest {
private static final String SUPPRESSOR_NAME = "wear";
@@ -53,7 +51,7 @@
try {
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mPackageManager.getServiceInfo(mSuppressor, 0)).thenReturn(mServiceInfo);
- when(mServiceInfo.loadLabel(mPackageManager)).thenReturn(new String(SUPPRESSOR_NAME));
+ when(mServiceInfo.loadLabel(mPackageManager)).thenReturn(SUPPRESSOR_NAME);
} catch (PackageManager.NameNotFoundException e) {
// Do nothing. This exception will never happen in mock
}
@@ -61,13 +59,13 @@
@Test
public void testGetSuppressionText_SuppressorNull_ReturnNull() {
- String text = SuppressorHelper.getSuppressionText(mContext, null);
+ final String text = SuppressorHelper.getSuppressionText(mContext, null);
assertThat(text).isNull();
}
@Test
public void testGetSuppressorCaption_SuppressorNotNull_ReturnSuppressorName() {
- String text = SuppressorHelper.getSuppressorCaption(mContext, mSuppressor);
+ final String text = SuppressorHelper.getSuppressorCaption(mContext, mSuppressor);
assertThat(text).isEqualTo(SUPPRESSOR_NAME);
}
}
diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
index d9145ff..1e2a2d9 100644
--- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
@@ -16,16 +16,20 @@
package com.android.settings.notification;
+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.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.media.AudioManager;
+import android.provider.Settings.System;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.System;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -34,16 +38,8 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-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.verify;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TouchSoundPreferenceControllerTest {
@Mock
@@ -68,7 +64,7 @@
when(mActivity.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
- mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
+ mPreference = new SwitchPreference(RuntimeEnvironment.application);
mController = new TouchSoundPreferenceController(mContext, mSetting, null);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
doReturn(mScreen).when(mSetting).getPreferenceScreen();
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
index b0ab54b..d6fd1f4 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
@@ -16,32 +16,28 @@
package com.android.settings.notification;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.os.Vibrator;
+import android.provider.Settings.System;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import android.provider.Settings.System;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VibrateOnTouchPreferenceControllerTest {
@Mock
@@ -68,7 +64,7 @@
when(mVibrator.hasVibrator()).thenReturn(true);
when(mSetting.getActivity()).thenReturn(mActivity);
when(mActivity.getContentResolver()).thenReturn(mContentResolver);
- mPreference = new SwitchPreference(ShadowApplication.getInstance().getApplicationContext());
+ mPreference = new SwitchPreference(RuntimeEnvironment.application);
mController = new VibrateOnTouchPreferenceController(mContext, mSetting, null);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
doReturn(mScreen).when(mSetting).getPreferenceScreen();
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
index 8787a73..9314109 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
@@ -29,7 +29,6 @@
import android.support.v7.preference.TwoStatePreference;
import android.telephony.TelephonyManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,11 +37,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VibrateWhenRingPreferenceControllerTest {
@Mock
@@ -86,7 +82,7 @@
@Test
public void updateState_settingIsOn_preferenceShouldBeChecked() {
final TwoStatePreference preference = mock(TwoStatePreference.class);
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
Settings.System.putInt(context.getContentResolver(), VIBRATE_WHEN_RINGING, 1);
mController = new VibrateWhenRingPreferenceController(context);
@@ -98,7 +94,7 @@
@Test
public void updateState_settingIsOff_preferenceShouldNotBeChecked() {
final TwoStatePreference preference = mock(TwoStatePreference.class);
- final Context context = ShadowApplication.getInstance().getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
Settings.System.putInt(context.getContentResolver(), VIBRATE_WHEN_RINGING, 0);
mController = new VibrateWhenRingPreferenceController(context);
diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
index 72c5beb..fba065c 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
@@ -20,10 +20,8 @@
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -40,7 +38,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -52,11 +49,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VibrationPreferenceControllerTest {
private Context mContext;
@@ -65,7 +60,7 @@
@Mock
private NotificationManager mNm;
@Mock
- Vibrator mVibrator;
+ private Vibrator mVibrator;
@Mock
private UserManager mUm;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -80,7 +75,7 @@
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
shadowApplication.setSystemService(Context.VIBRATOR_SERVICE, mVibrator);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = spy(new VibrationPreferenceController(mContext, mBackend));
// by default allow vibration
@@ -88,14 +83,14 @@
}
@Test
- public void testNoCrashIfNoOnResume() throws Exception {
+ public void testNoCrashIfNoOnResume() {
mController.isAvailable();
mController.updateState(mock(RestrictedSwitchPreference.class));
mController.onPreferenceChange(mock(RestrictedSwitchPreference.class), true);
}
@Test
- public void testIsAvailable_notSystemDoesNotHave() throws Exception {
+ public void testIsAvailable_notSystemDoesNotHave() {
when(mVibrator.hasVibrator()).thenReturn(false);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
@@ -104,7 +99,7 @@
}
@Test
- public void testIsAvailable_notIfNotImportant() throws Exception {
+ public void testIsAvailable_notIfNotImportant() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_LOW);
mController.onResume(appRow, channel, null, null);
@@ -112,7 +107,7 @@
}
@Test
- public void testIsAvailable_notIfDefaultChannel() throws Exception {
+ public void testIsAvailable_notIfDefaultChannel() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel =
new NotificationChannel(DEFAULT_CHANNEL_ID, "", IMPORTANCE_DEFAULT);
@@ -121,7 +116,7 @@
}
@Test
- public void testIsAvailable() throws Exception {
+ public void testIsAvailable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
mController.onResume(appRow, channel, null, null);
@@ -129,7 +124,7 @@
}
@Test
- public void testUpdateState_disabledByAdmin() throws Exception {
+ public void testUpdateState_disabledByAdmin() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn("something");
mController.onResume(new NotificationBackend.AppRow(), channel, null, mock(
@@ -142,7 +137,7 @@
}
@Test
- public void testUpdateState_notConfigurable() throws Exception {
+ public void testUpdateState_notConfigurable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -157,7 +152,7 @@
}
@Test
- public void testUpdateState_configurable() throws Exception {
+ public void testUpdateState_configurable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn("something");
@@ -170,7 +165,7 @@
}
@Test
- public void testUpdateState_vibrateOn() throws Exception {
+ public void testUpdateState_vibrateOn() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.shouldVibrate()).thenReturn(true);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
@@ -182,7 +177,7 @@
}
@Test
- public void testUpdateState_vibrateOff() throws Exception {
+ public void testUpdateState_vibrateOff() {
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.shouldVibrate()).thenReturn(false);
mController.onResume(new NotificationBackend.AppRow(), channel, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
index d3863db..e37c852 100644
--- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
@@ -23,10 +23,8 @@
import static android.app.NotificationManager.VISIBILITY_NO_OVERRIDE;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
-
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
-
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -45,11 +43,9 @@
import android.content.pm.UserInfo;
import android.os.UserManager;
import android.provider.Settings;
-import android.support.v7.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.RestrictedListPreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowRestrictionUtils;
import com.android.settingslib.RestrictedLockUtils;
@@ -65,13 +61,10 @@
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- ShadowRestrictionUtils.class,
-})
+@Config(shadows = ShadowRestrictionUtils.class)
public class VisibilityPreferenceControllerTest {
private Context mContext;
@@ -86,7 +79,6 @@
@Mock
private DevicePolicyManager mDm;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private PreferenceScreen mScreen;
private VisibilityPreferenceController mController;
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
index a1d9205..a6addb3 100644
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
@@ -28,17 +28,14 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VolumeSeekBarPreferenceControllerTest {
@Mock
@@ -56,8 +53,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mScreen.findPreference(nullable(String.class))).thenReturn(mPreference);
- mController =
- new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback);
+ mController = new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback);
}
@Test
@@ -65,14 +61,13 @@
mController.displayPreference(mScreen);
verify(mPreference).setCallback(mCallback);
- verify(mPreference).setStream(mController.AUDIO_STREAM);
- verify(mPreference).setMuteIcon(mController.MUTE_ICON);
+ verify(mPreference).setStream(VolumeSeekBarPreferenceControllerTestable.AUDIO_STREAM);
+ verify(mPreference).setMuteIcon(VolumeSeekBarPreferenceControllerTestable.MUTE_ICON);
}
@Test
public void displayPreference_notAvailable_shouldNotUpdatePreference() {
- mController =
- new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback, false);
+ mController = new VolumeSeekBarPreferenceControllerTestable(mContext, mCallback, false);
mController.displayPreference(mScreen);
@@ -99,8 +94,8 @@
verify(mPreference).onActivityPause();
}
- private class VolumeSeekBarPreferenceControllerTestable extends
- VolumeSeekBarPreferenceController {
+ private class VolumeSeekBarPreferenceControllerTestable
+ extends VolumeSeekBarPreferenceController {
private final static int AUDIO_STREAM = 1;
private final static int MUTE_ICON = 2;
@@ -142,10 +137,5 @@
public int getMuteIcon() {
return MUTE_ICON;
}
-
- private void setAvailable(boolean available) {
-
- }
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
index b091cd3..c32f96a 100644
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
@@ -24,7 +24,6 @@
import android.content.Context;
import android.media.AudioManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,10 +31,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VolumeSeekBarPreferenceTest {
@Mock
@@ -66,5 +63,4 @@
verify(mPreference).setMax(max);
verify(mPreference).setProgress(progress);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
index 0c826ed..1e59fed 100644
--- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -39,17 +38,14 @@
import com.android.settings.R;
import com.android.settings.RingtonePreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WorkSoundPreferenceControllerTest {
private static final String KEY_WORK_CATEGORY = "sound_work_settings_section";
@@ -273,5 +269,4 @@
verify((RingtonePreference) mWorkCategory.findPreference(KEY_WORK_ALARM_RINGTONE))
.setUserId(managedProfileUserId);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
index ff1356e..c902828 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenAccessSettingsTest.java
@@ -23,7 +23,6 @@
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,10 +32,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenAccessSettingsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java
index 4b981f3..7525942 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java
@@ -20,9 +20,6 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
-
-import static junit.framework.Assert.assertEquals;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -34,7 +31,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,14 +39,15 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeAlarmsPreferenceControllerTest {
+
+ private static final boolean ALARMS_SETTINGS = true;
+
private ZenModeAlarmsPreferenceController mController;
@Mock
@@ -67,8 +64,6 @@
private Context mContext;
private ContentResolver mContentResolver;
- private final boolean ALARMS_SETTINGS = true;
-
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
@@ -81,8 +76,8 @@
mController = new ZenModeAlarmsPreferenceController(mContext, mock(Lifecycle.class));
ReflectionHelpers.setField(mController, "mBackend", mBackend);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mockPref);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mockPref);
mController.displayPreference(mPreferenceScreen);
}
@@ -126,8 +121,8 @@
boolean allowAlarms = true;
mController.onPreferenceChange(mockPref, allowAlarms);
- verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS,
- allowAlarms);
+ verify(mBackend)
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS, allowAlarms);
}
@Test
@@ -135,7 +130,7 @@
boolean allowAlarms = false;
mController.onPreferenceChange(mockPref, allowAlarms);
- verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS,
- allowAlarms);
+ verify(mBackend)
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS, allowAlarms);
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java
index 20f9e62..b7f80ad 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.notification;
import static junit.framework.Assert.assertEquals;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,7 +28,6 @@
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -39,7 +37,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@@ -49,12 +46,13 @@
import java.util.Map;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeAutomaticRulesPreferenceControllerTest {
+
+ private static final String GENERIC_RULE_NAME = "test";
+ private static final String DEFAULT_ID_1 = "DEFAULT_1";
+ private static final String DEFAULT_ID_2 = "DEFAULT_2";
+
private ZenModeAutomaticRulesPreferenceController mController;
- private final String GENERIC_RULE_NAME = "test";
- final String DEFAULT_ID_1 = "DEFAULT_1";
- final String DEFAULT_ID_2 = "DEFAULT_2";
private final List<String> mDefaultIds = Arrays.asList(DEFAULT_ID_1, DEFAULT_ID_2);
@Mock
@@ -76,7 +74,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
mController = new ZenModeAutomaticRulesPreferenceController(mContext, mock(Fragment.class),
mock(Lifecycle.class));
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java
index 3786101..2de559e 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java
@@ -21,54 +21,47 @@
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_OFF;
-
-import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
-
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.NotificationManager;
+import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
-import android.content.ComponentName;
import android.provider.Settings;
import android.service.notification.ZenModeConfig;
import android.service.notification.ZenModeConfig.ZenRule;
-import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.util.ArrayMap;
import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeBehaviorFooterPreferenceControllerTest {
- private ZenModeBehaviorFooterPreferenceController mController;
- private final String TEST_APP_NAME = "test_app";
- private final String MANUAL_RULE_FIELD = "manualRule";
- private final String AUTOMATIC_RULES_FIELD = "automaticRules";
+ private static final String TEST_APP_NAME = "test_app";
+ private static final String MANUAL_RULE_FIELD = "manualRule";
+ private static final String AUTOMATIC_RULES_FIELD = "automaticRules";
+
+ private ZenModeBehaviorFooterPreferenceController mController;
@Mock
private NotificationManager mNotificationManager;
@Mock
@@ -95,12 +88,12 @@
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getZenModeConfig()).thenReturn(mZenModeConfig);
- mController = new ZenModeBehaviorFooterPreferenceController(mContext,
- mock(Lifecycle.class));
+ mController =
+ new ZenModeBehaviorFooterPreferenceController(mContext, mock(Lifecycle.class));
ReflectionHelpers.setField(mController, "mZenModeConfigWrapper", mConfigWrapper);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mockPref);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mockPref);
mController.displayPreference(mPreferenceScreen);
}
@@ -243,5 +236,4 @@
verify(mockPref).setTitle(mContext.getString(
com.android.settings.R.string.zen_mode_app_set_behavior, TEST_APP_NAME));
}
-
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
index ed42890..e0245ad 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
@@ -21,7 +21,6 @@
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_OFF;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -36,7 +35,6 @@
import android.view.View;
import android.widget.Button;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,14 +43,13 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeButtonPreferenceControllerTest {
+
private ZenModeButtonPreferenceController mController;
@Mock
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
index 18f9e71..76c816c 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
@@ -33,7 +33,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,13 +42,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeCallsPreferenceControllerTest {
+
private ZenModeCallsPreferenceController mController;
@Mock
@@ -74,10 +72,6 @@
*/
private String[] mValues;
- private final boolean CALLS_SETTINGS = true;
- private final int MOCK_CALLS_SENDERS = NotificationManager.Policy.PRIORITY_SENDERS_STARRED;
- private final int SUMMARY_ID_MOCK_CALLS_SENDERS = R.string.zen_mode_from_starred;
-
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
@@ -89,7 +83,8 @@
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
- when(mBackend.getPriorityCallSenders()).thenReturn(MOCK_CALLS_SENDERS);
+ when(mBackend.getPriorityCallSenders())
+ .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
when(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE))
.thenCallRealMethod();
when(mBackend.getContactsSummary(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
@@ -134,12 +129,12 @@
when(mBackend.isPriorityCategoryEnabled(
NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
- .thenReturn(CALLS_SETTINGS);
+ .thenReturn(true);
mController.updateState(mockPref);
verify(mockPref).setEnabled(true);
- verify(mockPref).setSummary(SUMMARY_ID_MOCK_CALLS_SENDERS);
+ verify(mockPref).setSummary(R.string.zen_mode_from_starred);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java
index 7bd37e0..f1c4585 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java
@@ -20,9 +20,6 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
-
-import static junit.framework.Assert.assertEquals;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -34,7 +31,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,12 +41,13 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeEventsPreferenceControllerTest {
+
+ private static final boolean EVENTS_SETTINGS = true;
+
private ZenModeEventsPreferenceController mController;
@Mock
@@ -66,23 +63,21 @@
private ContentResolver mContentResolver;
private Context mContext;
- private final boolean EVENTS_SETTINGS = true;
-
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
mController = new ZenModeEventsPreferenceController(mContext, mock(Lifecycle.class));
ReflectionHelpers.setField(mController, "mBackend", mBackend);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mockPref);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mockPref);
mController.displayPreference(mPreferenceScreen);
}
@@ -126,8 +121,8 @@
boolean allow = true;
mController.onPreferenceChange(mockPref, allow);
- verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS,
- allow);
+ verify(mBackend)
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS, allow);
}
@Test
@@ -135,7 +130,7 @@
boolean allow = false;
mController.onPreferenceChange(mockPref, allow);
- verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS,
- allow);
+ verify(mBackend)
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS, allow);
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java
index e98f17d..db0a2e9 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java
@@ -20,9 +20,6 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
-
-import static junit.framework.Assert.assertEquals;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -34,7 +31,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -44,14 +40,15 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeMediaPreferenceControllerTest {
+
+ private static final boolean MEDIA_SETTINGS = true;
+
private ZenModeMediaSystemOtherPreferenceController mController;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -68,8 +65,6 @@
private PreferenceScreen mPreferenceScreen;
private ContentResolver mContentResolver;
- private final boolean MEDIA_SETTINGS = true;
-
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
@@ -84,8 +79,8 @@
mock(Lifecycle.class));
ReflectionHelpers.setField(mController, "mBackend", mBackend);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mockPref);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mockPref);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
index 460534e..a0cfba3 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
@@ -20,7 +20,6 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -30,11 +29,9 @@
import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -44,13 +41,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeMessagesPreferenceControllerTest {
+
private ZenModeMessagesPreferenceController mController;
@Mock
@@ -75,10 +71,6 @@
*/
private String[] mValues;
- private final boolean MESSAGES_SETTINGS = true;
- private final int MOCK_MESSAGES_SENDERS = NotificationManager.Policy.PRIORITY_SENDERS_STARRED;
- private final int SUMMARY_ID_MOCK_MESSAGES_SENDERS = R.string.zen_mode_from_starred;
-
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
@@ -90,7 +82,8 @@
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
- when(mBackend.getPriorityMessageSenders()).thenReturn(MOCK_MESSAGES_SENDERS);
+ when(mBackend.getPriorityMessageSenders())
+ .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
when(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE))
.thenCallRealMethod();
when(mBackend.getContactsSummary(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
@@ -135,12 +128,12 @@
when(mBackend.isPriorityCategoryEnabled(
NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
- .thenReturn(MESSAGES_SETTINGS);
+ .thenReturn(true);
mController.updateState(mockPref);
verify(mockPref).setEnabled(true);
- verify(mockPref).setSummary(SUMMARY_ID_MOCK_MESSAGES_SENDERS);
+ verify(mockPref).setSummary(R.string.zen_mode_from_starred);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
index 86f0f2d..bcf1cd4 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
@@ -16,25 +16,6 @@
package com.android.settings.notification;
-import android.app.NotificationManager;
-import android.app.NotificationManager.Policy;
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
@@ -43,8 +24,23 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.NotificationManager;
+import android.app.NotificationManager.Policy;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModePreferenceControllerTest {
@Mock
@@ -81,8 +77,7 @@
when(mPreference.isEnabled()).thenReturn(true);
mController.updateState(mPreference);
- verify(mPreference).setSummary(mContext.getResources().getString(
- R.string.zen_mode_sound_summary_off));
+ verify(mPreference).setSummary(mContext.getString(R.string.zen_mode_sound_summary_off));
doReturn(1).when(mSummaryBuilder).getEnabledAutomaticRulesCount();
mController.updateState(mPreference);
@@ -97,5 +92,4 @@
verify(mPreference, never()).setSummary(anyString());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java
index d8d95b6..af421b8 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java
@@ -20,9 +20,6 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
-
-import static junit.framework.Assert.assertEquals;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -34,7 +31,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,14 +39,15 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeRemindersPreferenceControllerTest {
+
+ private static final boolean REMINDERS_SETTINGS = true;
+
private ZenModeRemindersPreferenceController mController;
@Mock
@@ -66,7 +63,6 @@
private ContentResolver mContentResolver;
private Context mContext;
- private final boolean REMINDERS_SETTINGS = true;
@Before
public void setup() {
@@ -81,8 +77,8 @@
mController = new ZenModeRemindersPreferenceController(mContext, mock(Lifecycle.class));
ReflectionHelpers.setField(mController, "mBackend", mBackend);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mockPref);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mockPref);
mController.displayPreference(mPreferenceScreen);
}
@@ -128,8 +124,8 @@
boolean allow = true;
mController.onPreferenceChange(mockPref, allow);
- verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
- allow);
+ verify(mBackend)
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS, allow);
}
@Test
@@ -137,7 +133,7 @@
boolean allow = false;
mController.onPreferenceChange(mockPref, allow);
- verify(mBackend).saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
- allow);
+ verify(mBackend)
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS, allow);
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
index a7ea4c9..52805b3 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
@@ -20,9 +20,6 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
-
-import static junit.framework.Assert.assertEquals;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -34,7 +31,6 @@
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,14 +39,15 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeRepeatCallersPreferenceControllerTest {
+
+ private static final boolean REPEAT_CALLERS_SETTINGS = true;
+
private ZenModeRepeatCallersPreferenceController mController;
@Mock
@@ -66,8 +63,6 @@
private ContentResolver mContentResolver;
private Context mContext;
- private final boolean REPEAT_CALLERS_SETTINGS = true;
-
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
@@ -124,7 +119,6 @@
@Test
public void updateState_Priority_anyCallers() {
- boolean mockPriorityState = false;
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
when(mBackend.isPriorityCategoryEnabled(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
.thenReturn(true);
@@ -132,7 +126,7 @@
NotificationManager.Policy.PRIORITY_SENDERS_ANY);
when(mBackend.isPriorityCategoryEnabled(
NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS))
- .thenReturn(mockPriorityState);
+ .thenReturn(false);
mController.updateState(mockPref);
@@ -145,8 +139,8 @@
boolean allow = true;
mController.onPreferenceChange(mockPref, allow);
- verify(mBackend).saveSoundPolicy(
- NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allow);
+ verify(mBackend)
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allow);
}
@Test
@@ -154,7 +148,7 @@
boolean allow = false;
mController.onPreferenceChange(mockPref, allow);
- verify(mBackend).saveSoundPolicy(
- NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allow);
+ verify(mBackend)
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allow);
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
index 070aa38..23b242a 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
@@ -16,14 +16,20 @@
package com.android.settings.notification;
+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.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.RuntimeEnvironment.application;
+
import android.app.Activity;
import android.app.NotificationManager;
import android.content.Context;
-import android.content.res.Resources;
import android.content.Intent;
+import android.content.res.Resources;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -33,24 +39,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowToast;
import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.RuntimeEnvironment;
-
-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.verify;
-import static org.mockito.Mockito.when;
-import static org.robolectric.RuntimeEnvironment.application;
+import org.robolectric.shadows.ShadowToast;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- })
+@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public class ZenModeScheduleRuleSettingsTest {
@Mock
@@ -89,8 +82,7 @@
@Test
public void onCreate_noRuleId_shouldToastAndFinishAndNoCrash() {
- final String expected = mContext.getResources().getString(
- R.string.zen_mode_rule_not_found_text);
+ final String expected = mContext.getString(R.string.zen_mode_rule_not_found_text);
mFragment.onCreate(null);
@@ -110,5 +102,4 @@
return null;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScreenOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScreenOffPreferenceControllerTest.java
index 870452e..6dd3c178 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeScreenOffPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeScreenOffPreferenceControllerTest.java
@@ -24,7 +24,6 @@
import android.content.Context;
import android.support.v14.preference.SwitchPreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -33,13 +32,14 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeScreenOffPreferenceControllerTest {
+
+ private static final boolean MOCK_PRIORITY_SCREEN_OFF_SETTING = false;
+
private ZenModeScreenOffPreferenceController mController;
@Mock
@@ -52,7 +52,6 @@
private NotificationManager.Policy mPolicy;
private Context mContext;
- private final boolean MOCK_PRIORITY_SCREEN_OFF_SETTING = false;
@Before
public void setup() {
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScreenOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScreenOnPreferenceControllerTest.java
index 58ccf3e..2fd1380 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeScreenOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeScreenOnPreferenceControllerTest.java
@@ -24,7 +24,6 @@
import android.content.Context;
import android.support.v14.preference.SwitchPreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -33,13 +32,15 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeScreenOnPreferenceControllerTest {
+
+ private static final boolean MOCK_PRIORITY_SCREEN_ON_SETTING = false;
+
private ZenModeScreenOnPreferenceController mController;
@Mock
@@ -52,7 +53,6 @@
private NotificationManager.Policy mPolicy;
private Context mContext;
- private final boolean MOCK_PRIORITY_SCREEN_ON_SETTING = false;
@Before
public void setup() {
@@ -60,7 +60,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
mController = new ZenModeScreenOnPreferenceController(mContext, mock(Lifecycle.class));
@@ -82,8 +82,8 @@
boolean allow = true;
mController.onPreferenceChange(mockPref, allow);
- verify(mBackend).saveVisualEffectsPolicy(
- NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON, allow);
+ verify(mBackend)
+ .saveVisualEffectsPolicy(NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON, allow);
}
@Test
@@ -91,7 +91,7 @@
boolean allow = false;
mController.onPreferenceChange(mockPref, allow);
- verify(mBackend).saveVisualEffectsPolicy(
- NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON, allow);
+ verify(mBackend)
+ .saveVisualEffectsPolicy(NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON, allow);
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java
index 10bdbb6..2ec7514 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java
@@ -21,20 +21,17 @@
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_OFF;
-
-import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
-
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.NotificationManager;
+import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
-import android.content.ComponentName;
import android.net.Uri;
import android.provider.Settings;
import android.service.notification.ZenModeConfig;
@@ -44,7 +41,6 @@
import android.util.ArrayMap;
import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -53,22 +49,21 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeSettingsFooterPreferenceControllerTest {
+
+ private static final String TEST_APP_NAME = "test_app";
+ private static final String TEST_RULE_NAME = "test_rule_name";
+ private static final String MANUAL_RULE_FIELD = "manualRule";
+ private static final String AUTOMATIC_RULES_FIELD = "automaticRules";
+
private ZenModeSettingsFooterPreferenceController mController;
- private final String TEST_APP_NAME = "test_app";
- private final String TEST_RULE_NAME = "test_rule_name";
- private final String MANUAL_RULE_FIELD = "manualRule";
- private final String AUTOMATIC_RULES_FIELD = "automaticRules";
private final ArrayMap<String, ZenRule> mInjectedAutomaticRules = new ArrayMap<>();
- ;
@Mock
private NotificationManager mNotificationManager;
@@ -94,13 +89,12 @@
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getZenModeConfig()).thenReturn(mZenModeConfig);
- mController = new ZenModeSettingsFooterPreferenceController(mContext,
- mock(Lifecycle.class));
+ mController =
+ new ZenModeSettingsFooterPreferenceController(mContext, mock(Lifecycle.class));
ReflectionHelpers.setField(mZenModeConfig, AUTOMATIC_RULES_FIELD, mInjectedAutomaticRules);
ReflectionHelpers.setField(mController, "mZenModeConfigWrapper", mConfigWrapper);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mockPref);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
mController.displayPreference(mPreferenceScreen);
}
@@ -176,7 +170,6 @@
TEST_RULE_NAME));
}
-
@Test
public void manualRuleEndsLast_hasAutomaticRule_setFooterTitle() {
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
@@ -193,7 +186,6 @@
com.android.settings.R.string.zen_mode_settings_dnd_manual_indefinite));
}
-
@Test
public void automaticRuleEndsLast_hasManualRule_setFooterTitle() {
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
@@ -202,8 +194,7 @@
// automatic rule that ends after manual rule ends
ZenRule rule = injectNewAutomaticRule(TEST_RULE_NAME, true, false);
- when(mConfigWrapper.parseAutomaticRuleEndTime(rule.conditionId)).thenReturn(
- (long) 2000);
+ when(mConfigWrapper.parseAutomaticRuleEndTime(rule.conditionId)).thenReturn(2000L);
mController.updateState(mockPref);
@@ -218,18 +209,13 @@
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
// automatic rule that ends after manual rule ends
- ZenRule rule1 = injectNewAutomaticRule(TEST_RULE_NAME + "1", false,
- false);
- when(mConfigWrapper.parseAutomaticRuleEndTime(rule1.conditionId)).thenReturn(
- (long) 10000);
+ ZenRule rule1 = injectNewAutomaticRule(TEST_RULE_NAME + "1", false, false);
+ when(mConfigWrapper.parseAutomaticRuleEndTime(rule1.conditionId)).thenReturn(10000L);
- ZenRule rule2 = injectNewAutomaticRule(TEST_RULE_NAME + "2", true,
- true);
+ ZenRule rule2 = injectNewAutomaticRule(TEST_RULE_NAME + "2", true, true);
- ZenRule rule3 = injectNewAutomaticRule(TEST_RULE_NAME + "3", true,
- false);
- when(mConfigWrapper.parseAutomaticRuleEndTime(rule3.conditionId)).thenReturn(
- (long) 9000);
+ ZenRule rule3 = injectNewAutomaticRule(TEST_RULE_NAME + "3", true, false);
+ when(mConfigWrapper.parseAutomaticRuleEndTime(rule3.conditionId)).thenReturn(9000L);
mController.updateState(mockPref);
@@ -244,20 +230,14 @@
Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
// automatic rule that ends after manual rule ends
- ZenRule rule1 = injectNewAutomaticRule(TEST_RULE_NAME + "1", true,
- false);
- when(mConfigWrapper.parseAutomaticRuleEndTime(rule1.conditionId)).thenReturn(
- (long) 2000);
+ ZenRule rule1 = injectNewAutomaticRule(TEST_RULE_NAME + "1", true, false);
+ when(mConfigWrapper.parseAutomaticRuleEndTime(rule1.conditionId)).thenReturn(2000L);
- ZenRule rule2 = injectNewAutomaticRule(TEST_RULE_NAME + "2", true,
- false);
- when(mConfigWrapper.parseAutomaticRuleEndTime(rule2.conditionId)).thenReturn(
- (long) 8000);
+ ZenRule rule2 = injectNewAutomaticRule(TEST_RULE_NAME + "2", true, false);
+ when(mConfigWrapper.parseAutomaticRuleEndTime(rule2.conditionId)).thenReturn(8000L);
- ZenRule rule3 = injectNewAutomaticRule(TEST_RULE_NAME + "3", false,
- false);
- when(mConfigWrapper.parseAutomaticRuleEndTime(rule3.conditionId)).thenReturn(
- (long) 12000);
+ ZenRule rule3 = injectNewAutomaticRule(TEST_RULE_NAME + "3", false, false);
+ when(mConfigWrapper.parseAutomaticRuleEndTime(rule3.conditionId)).thenReturn(12000L);
mController.updateState(mockPref);
@@ -291,10 +271,9 @@
injectedManualRule.zenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS;
injectedManualRule.enabler = null;
injectedManualRule.conditionId = mock(Uri.class);
- when(mConfigWrapper.parseManualRuleTime(injectedManualRule.conditionId)).thenReturn(
- time);
- when(mConfigWrapper.getFormattedTime(time, mContext.getUserId())).thenReturn(
- timePlaceholder);
+ when(mConfigWrapper.parseManualRuleTime(injectedManualRule.conditionId)).thenReturn(time);
+ when(mConfigWrapper.getFormattedTime(time, mContext.getUserId()))
+ .thenReturn(timePlaceholder);
ReflectionHelpers.setField(mZenModeConfig, MANUAL_RULE_FIELD, injectedManualRule);
}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
index 80233d8..66b11a6 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
@@ -17,9 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
-
import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
import android.app.NotificationManager;
import android.content.Context;
@@ -27,29 +25,24 @@
import android.provider.Settings;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ZenModeSettingsTest {
private ZenModeSettings.SummaryBuilder mBuilder;
private Context mContext;
- private ZenModeSettings mSettings;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application.getApplicationContext();
- mSettings = new ZenModeSettings();
mBuilder = new ZenModeSettings.SummaryBuilder(mContext);
}
@@ -93,11 +86,10 @@
@Test
public void searchProvider_shouldIndexDefaultXml() {
- final List<SearchIndexableResource> sir = mSettings.SEARCH_INDEX_DATA_PROVIDER
+ final List<SearchIndexableResource> sir = ZenModeSettings.SEARCH_INDEX_DATA_PROVIDER
.getXmlResourcesToIndex(mContext, true /* enabled */);
assertThat(sir).hasSize(1);
assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.zen_mode_settings);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
index 28b0264..609b3a5 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -17,9 +17,7 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -30,7 +28,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.After;
@@ -45,12 +42,7 @@
import java.util.regex.Pattern;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class
- })
+@Config(shadows = SettingsShadowResources.class)
public class ChooseLockGenericControllerTest {
private ChooseLockGenericController mController;
@@ -213,8 +205,8 @@
.when(mDevicePolicyManager)
.getPasswordQuality(nullable(ComponentName.class), anyInt());
- int upgradedQuality = mController.upgradeQuality(
- DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
+ final int upgradedQuality =
+ mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
assertThat(upgradedQuality).named("upgradedQuality")
.isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
}
@@ -225,8 +217,8 @@
.when(mDevicePolicyManager)
.getPasswordQuality(nullable(ComponentName.class), anyInt());
- int upgradedQuality = mController.upgradeQuality(
- DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+ final int upgradedQuality =
+ mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
assertThat(upgradedQuality).named("upgradedQuality")
.isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index 70e68fe..5c32e6f 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -17,7 +17,6 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
-
import static org.robolectric.RuntimeEnvironment.application;
import android.app.admin.DevicePolicyManager;
@@ -26,13 +25,11 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment;
import com.android.settings.password.ChooseLockPassword.IntentBuilder;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.setupwizardlib.GlifLayout;
@@ -46,16 +43,12 @@
import org.robolectric.shadows.ShadowDrawable;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResourcesImpl.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- ShadowEventLogWriter.class,
- ShadowUtils.class
- })
+@Config(shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowResourcesImpl.class,
+ SettingsShadowResources.SettingsShadowTheme.class,
+ ShadowUtils.class
+})
public class ChooseLockPasswordTest {
@Before
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index f3af2df..c63f1c2 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -17,7 +17,6 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
-
import static org.robolectric.RuntimeEnvironment.application;
import android.content.Intent;
@@ -25,13 +24,11 @@
import android.view.View;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
import com.android.settings.password.ChooseLockPattern.IntentBuilder;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.setupwizardlib.GlifLayout;
@@ -43,16 +40,12 @@
import org.robolectric.shadows.ShadowDrawable;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResourcesImpl.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- ShadowEventLogWriter.class,
- ShadowUtils.class
- })
+@Config(shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowResourcesImpl.class,
+ SettingsShadowResources.SettingsShadowTheme.class,
+ ShadowUtils.class
+})
public class ChooseLockPatternTest {
@Test
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
index 8628678..f1c8a54 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
@@ -1,7 +1,6 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -16,7 +15,6 @@
import android.os.UserHandle;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -31,32 +29,21 @@
import org.robolectric.shadows.ShadowActivity.IntentForResult;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowUserManager.class,
- ShadowUtils.class
- })
+@Config(shadows = {ShadowUserManager.class, ShadowUtils.class})
public class ChooseLockSettingsHelperTest {
@Test
public void testLaunchConfirmationActivityWithExternalAndChallenge() {
-
- final int userId = UserHandle.myUserId();
- final int request = 100;
- final long challenge = 10000L;
-
final Activity activity = Robolectric.setupActivity(Activity.class);
ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
helper.launchConfirmationActivityWithExternalAndChallenge(
- request, // request
- "title",
- "header",
- "description",
- true, // external
- challenge,
- userId
+ 100, // request
+ "title",
+ "header",
+ "description",
+ true, // external
+ 10000L,
+ UserHandle.myUserId()
);
ShadowActivity shadowActivity = Shadows.shadowOf(activity);
@@ -69,7 +56,7 @@
ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
assertTrue(startedIntent.getBooleanExtra(
ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
- assertEquals(challenge, startedIntent.getLongExtra(
+ assertEquals(10000L, startedIntent.getLongExtra(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
assertEquals(
true,
@@ -86,21 +73,16 @@
@Test
public void testLaunchConfirmationActivityInternalAndChallenge() {
-
- final int userId = UserHandle.myUserId();
- final int request = 100;
- final long challenge = 10000L;
-
final Activity activity = Robolectric.setupActivity(Activity.class);
ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
helper.launchConfirmationActivityWithExternalAndChallenge(
- request,
- "title",
- "header",
- "description",
- false, // external
- challenge,
- userId
+ 100,
+ "title",
+ "header",
+ "description",
+ false, // external
+ 10000L,
+ UserHandle.myUserId()
);
ShadowActivity shadowActivity = Shadows.shadowOf(activity);
Intent startedIntent = shadowActivity.getNextStartedActivity();
@@ -112,7 +94,7 @@
ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
assertTrue(startedIntent.getBooleanExtra(
ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
- assertEquals(challenge, startedIntent.getLongExtra(
+ assertEquals(10000L, startedIntent.getLongExtra(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
assertEquals(
false,
@@ -142,7 +124,6 @@
.isEqualTo(WizardManagerHelper.THEME_GLIF_V2);
}
-
private ChooseLockSettingsHelper getChooseLockSettingsHelper(Activity activity) {
LockPatternUtils mockLockPatternUtils = mock(LockPatternUtils.class);
when(mockLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt()))
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
index 0a0734f..0ec4700 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
@@ -29,10 +29,8 @@
import android.content.Context;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -47,15 +45,9 @@
import org.robolectric.util.FragmentTestUtil;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowEventLogWriter.class,
- ShadowUserManager.class,
- ShadowUtils.class
- })
+@Config(shadows = {ShadowUserManager.class, ShadowUtils.class})
public class ChooseLockTypeDialogFragmentTest {
+
private Context mContext;
private TestFragment mFragment;
@@ -101,10 +93,10 @@
return ShadowAlertDialog.getLatestAlertDialog();
}
+ public static class TestFragment extends Fragment implements OnLockTypeSelectedListener {
- public static class TestFragment extends Fragment
- implements OnLockTypeSelectedListener{
- OnLockTypeSelectedListener mDelegate;
+ private OnLockTypeSelectedListener mDelegate;
+
@Override
public void onLockTypeSelected(ScreenLockType lock) {
if (mDelegate != null) {
diff --git a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
index d76968e..73d8452 100644
--- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
@@ -18,13 +18,11 @@
import static com.google.common.truth.Truth.assertThat;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog;
-
import android.app.Activity;
import android.app.FragmentManager;
+import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.Test;
@@ -33,13 +31,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- })
+@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public class ConfirmCredentialTest {
@Test
public void testLastTryDialogShownExactlyOnce() {
diff --git a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
index 8beefa8..5fa3edb 100644
--- a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
+++ b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
@@ -21,16 +21,11 @@
import android.app.admin.DevicePolicyManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION)
public class ScreenLockTypeTest {
@Test
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
index cb863a0..9d72bd8 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
@@ -17,7 +17,6 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
-
import static org.robolectric.Shadows.shadowOf;
import android.content.ComponentName;
@@ -26,7 +25,6 @@
import android.provider.Settings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.After;
import org.junit.Before;
@@ -34,11 +32,9 @@
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowActivity;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SetNewPasswordActivityTest {
private int mProvisioned;
@@ -81,6 +77,5 @@
assertThat(intent.getComponent())
.isEqualTo(new ComponentName(activity, SetupChooseLockGeneric.class));
-
}
}
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
index 52678fb..c8c3324 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
@@ -17,17 +17,12 @@
package com.android.settings.password;
import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
-
-import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
- .HIDE_DISABLED_PREFS;
-import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
- .MINIMUM_QUALITY_KEY;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
@@ -42,7 +37,6 @@
import android.os.Bundle;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.wrapper.FingerprintManagerWrapper;
import org.junit.Before;
@@ -51,22 +45,22 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-/**
- * Tests for {@link SetNewPasswordController}.
- */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class SetNewPasswordControllerTest {
+
private static final int CURRENT_USER_ID = 101;
private static final long FINGERPRINT_CHALLENGE = -9876512313131L;
- @Mock PackageManager mPackageManager;
- @Mock FingerprintManagerWrapper mFingerprintManager;
- @Mock DevicePolicyManager mDevicePolicyManager;
+ @Mock
+ PackageManager mPackageManager;
+ @Mock
+ FingerprintManagerWrapper mFingerprintManager;
+ @Mock
+ DevicePolicyManager mDevicePolicyManager;
- @Mock private SetNewPasswordController.Ui mUi;
+ @Mock
+ private SetNewPasswordController.Ui mUi;
private SetNewPasswordController mSetNewPasswordController;
@Before
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index a34c106..cef1874 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -17,7 +17,6 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
-
import static org.robolectric.RuntimeEnvironment.application;
import static org.robolectric.Shadows.shadowOf;
@@ -28,14 +27,12 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.settings.password.ChooseLockPassword.IntentBuilder;
import com.android.settings.password.SetupChooseLockPassword.SetupChooseLockPasswordFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After;
@@ -48,7 +45,6 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowActivity.IntentForResult;
import org.robolectric.shadows.ShadowAlertDialog;
import org.robolectric.shadows.ShadowDialog;
@@ -56,16 +52,12 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResourcesImpl.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- ShadowEventLogWriter.class,
- ShadowUtils.class
- })
+@Config(shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowResourcesImpl.class,
+ SettingsShadowResources.SettingsShadowTheme.class,
+ ShadowUtils.class
+})
public class SetupChooseLockPasswordTest {
@Before
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
index ea32641..e0df818 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
@@ -17,7 +17,6 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
-
import static org.robolectric.RuntimeEnvironment.application;
import android.app.Activity;
@@ -30,13 +29,11 @@
import com.android.settings.R;
import com.android.settings.SetupRedactionInterstitial;
-import com.android.settings.TestConfig;
import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
import com.android.settings.password.ChooseLockPattern.IntentBuilder;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.Before;
@@ -46,26 +43,21 @@
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowAlertDialog;
-import org.robolectric.shadows.ShadowPackageManager.ComponentState;
+import org.robolectric.shadows.ShadowPackageManager;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResourcesImpl.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- ShadowEventLogWriter.class,
- ShadowUtils.class
- })
+@Config(shadows = {
+ SettingsShadowResourcesImpl.class,
+ SettingsShadowResources.SettingsShadowTheme.class,
+ ShadowUtils.class
+})
public class SetupChooseLockPatternTest {
private SetupChooseLockPattern mActivity;
@Before
public void setUp() {
- Shadows.shadowOf(application.getPackageManager()).setComponentEnabledSetting(
+ application.getPackageManager().setComponentEnabledSetting(
new ComponentName(application, SetupRedactionInterstitial.class),
PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
@@ -84,11 +76,11 @@
public void chooseLockSaved_shouldEnableRedactionInterstitial() {
findFragment(mActivity).onChosenLockSaveFinished(false, null);
- ComponentState redactionComponentState =
- Shadows.shadowOf(application.getPackageManager()).getComponentState(
- new ComponentName(application, SetupRedactionInterstitial.class));
- assertThat(redactionComponentState.newState).named("Redaction component state")
- .isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+ ShadowPackageManager spm = Shadows.shadowOf(application.getPackageManager());
+ ComponentName cname = new ComponentName(application, SetupRedactionInterstitial.class);
+ final int componentEnabled = spm.getComponentEnabledSettingFlags(cname)
+ & PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+ assertThat(componentEnabled).isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
}
@Config(qualifiers = "sw400dp")
diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
index 0e6f28a..d0a062b 100644
--- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
@@ -18,16 +18,13 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.robolectric.RuntimeEnvironment.application;
import android.app.Activity;
import android.app.AlertDialog;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.Before;
@@ -39,14 +36,10 @@
import org.robolectric.shadows.ShadowAlertDialog;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- ShadowEventLogWriter.class,
- ShadowUtils.class
- })
+@Config(shadows = {
+ SettingsShadowResources.SettingsShadowTheme.class,
+ ShadowUtils.class
+})
public class SetupSkipDialogTest {
private Activity mActivity;
@@ -64,9 +57,9 @@
AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
assertNotNull(alertDialog);
ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
- assertEquals(application.getString(R.string.lock_screen_intro_skip_title),
+ assertEquals(mActivity.getString(R.string.lock_screen_intro_skip_title),
shadowAlertDialog.getTitle());
- assertEquals(application.getString(R.string.lock_screen_intro_skip_dialog_text),
+ assertEquals(mActivity.getString(R.string.lock_screen_intro_skip_dialog_text),
shadowAlertDialog.getMessage());
}
@@ -78,10 +71,9 @@
AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
assertNotNull(alertDialog);
ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
- assertEquals(application.getString(R.string.lock_screen_intro_skip_title),
+ assertEquals(mActivity.getString(R.string.lock_screen_intro_skip_title),
shadowAlertDialog.getTitle());
- assertEquals(application.getString(R.string.lock_screen_intro_skip_dialog_text_frp),
+ assertEquals(mActivity.getString(R.string.lock_screen_intro_skip_dialog_text_frp),
shadowAlertDialog.getMessage());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
index bf4733a..3862532 100644
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
@@ -33,7 +33,6 @@
import android.printservice.PrintServiceInfo;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.PrintManagerWrapper;
import com.android.settingslib.RestrictedPreference;
@@ -47,15 +46,12 @@
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PrintSettingsPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
index f5d3793..905361c 100644
--- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -16,7 +16,6 @@
package com.android.settings.search;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -25,7 +24,6 @@
import android.provider.SearchIndexableResource;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,12 +37,10 @@
import org.robolectric.annotation.Config;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class BaseSearchIndexProviderTest {
private static final String TEST_PREF_KEY = "test_pref_key";
@@ -64,9 +60,10 @@
assertThat(mIndexProvider.getNonIndexableKeys(mContext)).isEmpty();
}
- public static class AvailablePreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin {
- public AvailablePreferenceController(Context context) {
+ public static class AvailablePreferenceController
+ extends AbstractPreferenceController
+ implements PreferenceControllerMixin {
+ private AvailablePreferenceController(Context context) {
super(context);
}
@@ -100,7 +97,7 @@
boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.location_settings;
- return Arrays.asList(sir);
+ return Collections.singletonList(sir);
}
@Override
@@ -122,9 +119,11 @@
assertThat(controllers).hasSize(3);
}
- public static class NotAvailablePreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin {
- public NotAvailablePreferenceController(Context context) {
+ public static class NotAvailablePreferenceController
+ extends AbstractPreferenceController
+ implements PreferenceControllerMixin {
+
+ private NotAvailablePreferenceController(Context context) {
super(context);
}
@@ -153,10 +152,10 @@
final BaseSearchIndexProvider provider = new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
- boolean enabled) {
+ boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.data_usage;
- return Arrays.asList(sir);
+ return Collections.singletonList(sir);
}
@Override
@@ -165,8 +164,8 @@
}
};
- final List<String> nonIndexableKeys = provider
- .getNonIndexableKeys(RuntimeEnvironment.application);
+ final List<String> nonIndexableKeys =
+ provider.getNonIndexableKeys(RuntimeEnvironment.application);
assertThat(nonIndexableKeys).contains("status_header");
}
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
index 2687041..e99b0ea 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
@@ -30,9 +30,7 @@
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
-import android.content.pm.ProviderInfo;
import android.content.pm.ResolveInfo;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
@@ -40,7 +38,6 @@
import android.provider.SearchIndexableData;
import android.util.ArrayMap;
-import com.android.settings.TestConfig;
import com.android.settings.search.indexing.PreIndexData;
import com.android.settings.testutils.DatabaseTestUtils;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -65,12 +62,9 @@
import java.util.Set;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowRunnableAsyncTask.class,}
-)
+@Config(shadows = ShadowRunnableAsyncTask.class)
public class DatabaseIndexingManagerTest {
+
private final String localeStr = "en_US";
private final int rank = 8;
@@ -95,9 +89,6 @@
private final int userId = -1;
private final boolean enabled = true;
- private final String AUTHORITY_ONE = "authority";
- private final String PACKAGE_ONE = "com.android.settings";
-
private final String TITLE_ONE = "title one";
private final String TITLE_TWO = "title two";
private final String KEY_ONE = "key one";
@@ -170,8 +161,8 @@
SearchIndexableRaw rawData = getFakeRaw();
PreIndexData data = getPreIndexData(rawData);
doReturn(data).when(mManager).getIndexDataFromProviders(anyList(), anyBoolean());
- doReturn(true).when(mManager).isFullIndex(any(Context.class), anyString(), anyString(),
- anyString());
+ doReturn(true).when(mManager)
+ .isFullIndex(any(Context.class), anyString(), anyString(), anyString());
mManager.performIndexing();
@@ -183,8 +174,8 @@
// Initialize the Manager and force rebuild
DatabaseIndexingManager manager =
spy(new DatabaseIndexingManager(mContext));
- doReturn(false).when(mManager).isFullIndex(any(Context.class), anyString(), anyString(),
- anyString());
+ doReturn(false).when(mManager)
+ .isFullIndex(any(Context.class), anyString(), anyString(), anyString());
// Insert data point which will be dropped
insertSpecialCase("Ceci n'est pas un pipe", true, "oui oui mon ami");
@@ -202,8 +193,8 @@
SearchIndexableRaw rawData = getFakeRaw();
PreIndexData data = getPreIndexData(rawData);
doReturn(data).when(mManager).getIndexDataFromProviders(anyList(), anyBoolean());
- doReturn(true).when(mManager).isFullIndex(any(Context.class), anyString(), anyString(),
- anyString());
+ doReturn(true).when(mManager)
+ .isFullIndex(any(Context.class), anyString(), anyString(), anyString());
mManager.performIndexing();
@@ -394,17 +385,4 @@
data.dataToUpdate.add(fakeData);
return data;
}
-
- private List<ResolveInfo> getDummyResolveInfo() {
- List<ResolveInfo> infoList = new ArrayList<>();
- ResolveInfo info = new ResolveInfo();
- info.providerInfo = new ProviderInfo();
- info.providerInfo.exported = true;
- info.providerInfo.authority = AUTHORITY_ONE;
- info.providerInfo.packageName = PACKAGE_ONE;
- info.providerInfo.applicationInfo = new ApplicationInfo();
- infoList.add(info);
-
- return infoList;
- }
}
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
index 13481c4..777e5dd 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
@@ -21,7 +21,6 @@
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -29,12 +28,10 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.Map;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DatabaseIndexingUtilsTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
index fc15205..d6276a6 100644
--- a/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
@@ -1,20 +1,19 @@
package com.android.settings.search;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import android.content.Intent;
import android.os.Parcel;
-import com.android.settings.TestConfig;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class InlineListPayloadTest {
private static final String DUMMY_SETTING = "inline_list_key";
@@ -65,8 +64,7 @@
parcel.writeInt(InlineSwitchPayload.TRUE);
parcel.setDataPosition(0);
- InlineListPayload payload = InlineListPayload
- .CREATOR.createFromParcel(parcel);
+ InlineListPayload payload = InlineListPayload.CREATOR.createFromParcel(parcel);
final Intent builtIntent = payload.getIntent();
assertThat(payload.getKey()).isEqualTo(uri);
diff --git a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java
index 8bb558f..cbd68c0 100644
--- a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java
@@ -1,28 +1,27 @@
package com.android.settings.search;
-import android.content.Context;
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.ContentResolver;
+import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
-import com.android.settings.TestConfig;
+
import com.android.settings.search.ResultPayload.SettingsSource;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class InlinePayloadTest {
- private Context mContext;
+ private static final String KEY = "key";
- private final String KEY = "key";
+ private Context mContext;
@Before
public void setUp() {
@@ -106,9 +105,9 @@
true /* isDeviceSupported */);
}
- class ConcreteInlinePayload extends InlinePayload {
+ private class ConcreteInlinePayload extends InlinePayload {
- public ConcreteInlinePayload(String key, @SettingsSource int source, Intent intent,
+ private ConcreteInlinePayload(String key, @SettingsSource int source, Intent intent,
boolean isDeviceSupported) {
super(key, source, intent, isDeviceSupported, 0 /* defaultValue */);
}
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
index 64778a0..eb6ad6e 100644
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
@@ -17,27 +17,25 @@
package com.android.settings.search;
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.ContentResolver;
+import android.content.Context;
import android.content.Intent;
import android.os.Parcel;
import android.provider.Settings;
-import android.content.Context;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.search.ResultPayload.Availability;
import com.android.settings.search.ResultPayload.SettingsSource;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class InlineSwitchPayloadTest {
private static final String DUMMY_SETTING = "inline_test";
@@ -61,8 +59,8 @@
final Intent intent = new Intent();
intent.putExtra(intentKey, intentVal);
- InlineSwitchPayload payload = new InlineSwitchPayload(uri, source, 1, intent, true,
- 1 /* default */);
+ InlineSwitchPayload payload =
+ new InlineSwitchPayload(uri, source, 1, intent, true, 1 /* default */);
final Intent retainedIntent = payload.getIntent();
assertThat(payload.getKey()).isEqualTo(uri);
assertThat(payload.getType()).isEqualTo(type);
diff --git a/tests/robotests/src/com/android/settings/search/PreferenceXmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/PreferenceXmlParserUtilTest.java
index 999e93a..0c5f788 100644
--- a/tests/robotests/src/com/android/settings/search/PreferenceXmlParserUtilTest.java
+++ b/tests/robotests/src/com/android/settings/search/PreferenceXmlParserUtilTest.java
@@ -26,7 +26,6 @@
import android.util.Xml;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.core.PreferenceXmlParserUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -49,7 +48,6 @@
* with another preference with a matchin replacement attribute.
*/
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PreferenceXmlParserUtilTest {
private Context mContext;
@@ -118,8 +116,8 @@
String entries = PreferenceXmlParserUtils.getDataEntries(mContext, attrs);
String[] expEntries = mContext.getResources()
.getStringArray(R.array.app_install_location_entries);
- for (int i = 0; i < expEntries.length; i++) {
- assertThat(entries).contains(expEntries[i]);
+ for (String expEntry : expEntries) {
+ assertThat(entries).contains(expEntry);
}
}
@@ -171,8 +169,8 @@
@Config(qualifiers = "mcc999")
public void extractMetadata_shouldContainKeyAndControllerName()
throws IOException, XmlPullParserException {
- final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
- R.xml.location_settings);
+ final List<Bundle> metadata =
+ PreferenceXmlParserUtils.extractMetadata(mContext, R.xml.location_settings);
assertThat(metadata).isNotEmpty();
for (Bundle bundle : metadata) {
diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
index 0bb43c5..52e7f98 100644
--- a/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
@@ -17,25 +17,21 @@
package com.android.settings.search;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Intent;
import android.os.Parcel;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ResultPayloadTest {
- private ResultPayload mPayload;
- private final String EXTRA_KEY = "key";
- private final String EXTRA_VALUE = "value";
+ private static final String EXTRA_KEY = "key";
+ private static final String EXTRA_VALUE = "value";
@Test
public void testParcelOrdering_StaysValid() {
@@ -43,13 +39,13 @@
intent.putExtra(EXTRA_KEY, EXTRA_VALUE);
Parcel parcel = Parcel.obtain();
- mPayload = new ResultPayload(intent);
- mPayload.writeToParcel(parcel, 0);
+ final ResultPayload payload = new ResultPayload(intent);
+ payload.writeToParcel(parcel, 0);
// Reset parcel for reading
parcel.setDataPosition(0);
ResultPayload newPayload = ResultPayload.CREATOR.createFromParcel(parcel);
- String originalIntentExtra = mPayload.getIntent().getStringExtra(EXTRA_KEY);
+ String originalIntentExtra = payload.getIntent().getStringExtra(EXTRA_KEY);
String copiedIntentExtra = newPayload.getIntent().getStringExtra(EXTRA_KEY);
assertThat(originalIntentExtra).isEqualTo(copiedIntentExtra);
}
diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
index 50bdb84..38d90e4 100644
--- a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java
@@ -17,25 +17,24 @@
package com.android.settings.search;
+import static com.google.common.truth.Truth.assertThat;
+import static junit.framework.Assert.fail;
+
import android.content.Intent;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static junit.framework.Assert.fail;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ResultPayloadUtilsTest {
- private ResultPayload payload;
- private final String EXTRA_KEY = "key";
- private final String EXTRA_VALUE = "value";
+ private static final String EXTRA_KEY = "key";
+ private static final String EXTRA_VALUE = "value";
+
+ private ResultPayload payload;
@Before
public void setUp() {
@@ -50,7 +49,7 @@
try {
ResultPayloadUtils.unmarshall(badData, ResultPayload.CREATOR);
fail("unmarshall should throw exception");
- } catch ( RuntimeException e) {
+ } catch (RuntimeException e) {
assertThat(e).isNotNull();
}
}
@@ -65,12 +64,11 @@
@Test
public void testUnmarshall_PreservedData() {
byte[] marshalledPayload = ResultPayloadUtils.marshall(payload);
- ResultPayload newPayload = ResultPayloadUtils.unmarshall(marshalledPayload,
- ResultPayload.CREATOR);
+ ResultPayload newPayload =
+ ResultPayloadUtils.unmarshall(marshalledPayload, ResultPayload.CREATOR);
String originalIntentExtra = payload.getIntent().getStringExtra(EXTRA_KEY);
String copiedIntentExtra = newPayload.getIntent().getStringExtra(EXTRA_KEY);
assertThat(originalIntentExtra).isEqualTo(copiedIntentExtra);
}
-
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index aa35f9f..eeebdee 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -19,29 +19,22 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
-import static org.robolectric.Shadows.shadowOf;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Intent;
import android.widget.Toolbar;
-import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
+import org.robolectric.Shadows;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
- SettingsShadowSystemProperties.class
-})
public class SearchFeatureProviderImplTest {
private SearchFeatureProviderImpl mProvider;
@@ -49,16 +42,11 @@
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
+ FakeFeatureFactory.setupForTest();
mActivity = Robolectric.buildActivity(Activity.class).create().visible().get();
mProvider = spy(new SearchFeatureProviderImpl());
}
- @After
- public void tearDown() {
- SettingsShadowSystemProperties.clear();
- }
-
@Test
public void initSearchToolbar_shouldInitWithOnClickListener() {
mProvider.initSearchToolbar(mActivity, null);
@@ -69,7 +57,7 @@
toolbar.performClick();
- final Intent launchIntent = shadowOf(mActivity).getNextStartedActivity();
+ final Intent launchIntent = Shadows.shadowOf(mActivity).getNextStartedActivity();
assertThat(launchIntent.getAction())
.isEqualTo("com.android.settings.action.SETTINGS_SEARCH");
@@ -94,8 +82,8 @@
@Test
public void verifyLaunchSearchResultPageCaller_settingsIntelligenceCaller_shouldNotCrash() {
- final ComponentName cn =
- new ComponentName(mProvider.getSettingsIntelligencePkgName(), "class");
+ final String packageName = mProvider.getSettingsIntelligencePkgName();
+ final ComponentName cn = new ComponentName(packageName, "class");
mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
}
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
index 5aa2a24..dcf68aa 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
@@ -19,14 +19,13 @@
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
import static com.google.common.truth.Truth.assertThat;
import static junit.framework.Assert.fail;
-import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import android.database.Cursor;
import android.text.TextUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wifi.WifiSettings;
@@ -36,13 +35,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SearchIndexableResourcesTest {
- SearchFeatureProviderImpl mSearchProvider;
+ private SearchFeatureProviderImpl mSearchProvider;
private FakeFeatureFactory mFakeFeatureFactory;
@Before
@@ -54,24 +51,22 @@
@After
public void cleanUp() {
- mFakeFeatureFactory.searchFeatureProvider = mock(
- SearchFeatureProvider.class);
+ mFakeFeatureFactory.searchFeatureProvider = mock(SearchFeatureProvider.class);
}
@Test
public void testAddIndex() {
- final Class stringClass = java.lang.String.class;
// Confirms that String.class isn't contained in SearchIndexableResources.
assertThat(mSearchProvider.getSearchIndexableResources().getProviderValues())
- .doesNotContain(stringClass);
+ .doesNotContain(String.class);
final int beforeCount =
mSearchProvider.getSearchIndexableResources().getProviderValues().size();
((SearchIndexableResourcesImpl) mSearchProvider.getSearchIndexableResources())
- .addIndex(java.lang.String.class);
+ .addIndex(String.class);
assertThat(mSearchProvider.getSearchIndexableResources().getProviderValues())
- .contains(stringClass);
+ .contains(String.class);
final int afterCount =
mSearchProvider.getSearchIndexableResources().getProviderValues().size();
assertThat(afterCount).isEqualTo(beforeCount + 1);
@@ -91,7 +86,7 @@
SettingsSearchIndexablesProvider provider = spy(new SettingsSearchIndexablesProvider());
- doReturn(RuntimeEnvironment.application).when(provider).getContext();
+ when(provider.getContext()).thenReturn(RuntimeEnvironment.application);
Cursor cursor = provider.queryNonIndexableKeys(null);
boolean hasTestKey = false;
diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
index 389b0aa..f6e1473 100644
--- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
@@ -1,19 +1,16 @@
package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import android.Manifest;
-import android.content.Context;
import android.content.pm.ProviderInfo;
import android.database.Cursor;
import android.net.Uri;
import android.provider.SearchIndexablesContract;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.search.indexing.FakeSettingsFragment;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -26,40 +23,34 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsSearchIndexablesProviderTest {
- private final String BASE_AUTHORITY = "com.android.settings";
+ private static final String BASE_AUTHORITY = "com.android.settings";
private SettingsSearchIndexablesProvider mProvider;
- private SearchFeatureProvider mFeatureProvider;
private FakeFeatureFactory mFakeFeatureFactory;
- Context mContext;
@Before
public void setUp() {
- mContext = RuntimeEnvironment.application;
-
mProvider = spy(new SettingsSearchIndexablesProvider());
ProviderInfo info = new ProviderInfo();
info.exported = true;
info.grantUriPermissions = true;
info.authority = BASE_AUTHORITY;
info.readPermission = Manifest.permission.READ_SEARCH_INDEXABLES;
- mProvider.attachInfo(mContext, info);
+ mProvider.attachInfo(RuntimeEnvironment.application, info);
- mFeatureProvider = new SearchFeatureProviderImpl();
- mFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
- mFeatureProvider.getSearchIndexableResources().getProviderValues()
+ final SearchFeatureProvider featureProvider = new SearchFeatureProviderImpl();
+ featureProvider.getSearchIndexableResources().getProviderValues().clear();
+ featureProvider.getSearchIndexableResources().getProviderValues()
.add(FakeSettingsFragment.class);
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
- mFakeFeatureFactory.searchFeatureProvider = mFeatureProvider;
+ mFakeFeatureFactory.searchFeatureProvider = featureProvider;
}
@After
public void cleanUp() {
- mFakeFeatureFactory.searchFeatureProvider = mock(
- SearchFeatureProvider.class);
+ mFakeFeatureFactory.searchFeatureProvider = mock(SearchFeatureProvider.class);
}
@Test
@@ -108,7 +99,6 @@
public void testNonIndexablesColumnFetched() {
Uri rawUri = Uri.parse("content://" + BASE_AUTHORITY + "/" +
SearchIndexablesContract.NON_INDEXABLES_KEYS_PATH);
- //final ContentResolver resolver = mContext.getContentResolver();
final Cursor cursor = mProvider.query(rawUri,
SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS, null, null, null);
diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
index d6e8c63..7ff4acc 100644
--- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
@@ -26,7 +26,6 @@
import android.view.MenuItem;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.ObservableFragment;
import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
@@ -36,10 +35,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SearchMenuControllerTest {
@Mock
@@ -84,11 +81,9 @@
verifyZeroInteractions(mMenu);
}
- public static class TestPreferenceFragment extends ObservablePreferenceFragment {
-
+ private static class TestPreferenceFragment extends ObservablePreferenceFragment {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-
}
}
}
diff --git a/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java
index 0f2ab56..620cb0c 100644
--- a/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java
+++ b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java
@@ -21,7 +21,6 @@
import android.provider.SearchIndexableResource;
import android.text.TextUtils;
-import com.android.settings.TestConfig;
import com.android.settings.R;
import com.android.settings.search.ResultPayload;
import com.android.settings.search.ResultPayloadUtils;
@@ -46,10 +45,10 @@
import static org.mockito.Mockito.spy;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, qualifiers = "mcc999")
+@Config(qualifiers = "mcc999")
public class IndexDataConverterTest {
- private final String localeStr = "en_US";
+ private static final String localeStr = "en_US";
private static final String title = "title\u2011title";
private static final String updatedTitle = "title-title";
@@ -72,7 +71,7 @@
private static final boolean enabled = true;
// There are 6 entries in the fake display_settings.xml preference.
- private final int NUM_DISPLAY_ENTRIES = 6;
+ private static final int NUM_DISPLAY_ENTRIES = 6;
private static final String PAGE_TITLE = "page_title";
private static final String TITLE_ONE = "pref_title_1";
private static final String TITLE_TWO = "pref_title_2";
@@ -81,14 +80,8 @@
private static final String TITLE_FIVE = "pref_title_5";
private static final String DISPLAY_SPACE_DELIM_KEYWORDS = "keywords1 keywords2 keywords3";
- // There are 6 display entries from resources, and 1 raw.
- private static final int NUM_FAKE_FRAGMENT_ENTRIES = 7;
- private static final int NUM_ENABLED_FAKE_FRAGMENT_ENTRIES = 5;
- private static final String FAKE_CLASS_NAME =
- "com.android.settings.search.indexing.FakeSettingsFragment";
-
// There is a title and one preference.
- private final int NUM_LEGAL_SETTINGS = 2;
+ private static final int NUM_LEGAL_SETTINGS = 2;
private Context mContext;
@@ -131,8 +124,8 @@
assertThat(row.key).isEqualTo(key);
assertThat(row.userId).isEqualTo(userId);
assertThat(row.payloadType).isEqualTo(0);
- ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(row.payload,
- ResultPayload.CREATOR);
+ ResultPayload unmarshalledPayload =
+ ResultPayloadUtils.unmarshall(row.payload, ResultPayload.CREATOR);
assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
}
@@ -230,12 +223,10 @@
List<IndexData> indexData = mConverter.convertPreIndexDataToIndexData(preIndexData);
String checkBoxSummaryOn = "summary_on";
- String checkBoxSummaryOff = "summary_off";
String checkBoxKey = "pref_key_5";
final IndexData row = findIndexDataForTitle(indexData, TITLE_FIVE);
- assertDisplaySetting(row, TITLE_FIVE, checkBoxSummaryOn, checkBoxSummaryOff,
- checkBoxKey);
+ assertDisplaySetting(row, TITLE_FIVE, checkBoxSummaryOn, checkBoxKey);
}
@Test
@@ -250,7 +241,7 @@
String listKey = "pref_key_4";
final IndexData row = findIndexDataForTitle(indexData, TITLE_FOUR);
- assertDisplaySetting(row, TITLE_FOUR, listSummary, "", listKey);
+ assertDisplaySetting(row, TITLE_FOUR, listSummary, listKey);
}
@Test
@@ -263,6 +254,7 @@
final IndexData row = findIndexDataForTitle(indexData, TITLE_THREE);
+ assertThat(row).isNotNull();
assertThat(row.iconResId).isGreaterThan(0);
}
@@ -279,6 +271,7 @@
assertThat(indexData.size()).isEqualTo(NUM_LEGAL_SETTINGS - 1);
assertThat(numEnabled).isEqualTo(NUM_LEGAL_SETTINGS - 1);
+ assertThat(nonTitlePref).isNotNull();
assertThat(nonTitlePref.enabled).isTrue();
}
@@ -293,8 +286,7 @@
assertThat(indexData).isEmpty();
}
- private void assertDisplaySetting(IndexData row, String title, String summaryOn,
- String summaryOff, String key) {
+ private void assertDisplaySetting(IndexData row, String title, String summaryOn, String key) {
assertThat(row.normalizedTitle).isEqualTo(title);
assertThat(row.locale).isEqualTo(localeStr);
assertThat(row.updatedSummaryOn).isEqualTo(summaryOn);
@@ -304,22 +296,11 @@
assertThat(row.enabled).isEqualTo(true);
assertThat(row.key).isEqualTo(key);
assertThat(row.payloadType).isEqualTo(0);
- ResultPayload unmarshalledPayload = ResultPayloadUtils.unmarshall(row.payload,
- ResultPayload.CREATOR);
+ ResultPayload unmarshalledPayload =
+ ResultPayloadUtils.unmarshall(row.payload, ResultPayload.CREATOR);
assertThat(unmarshalledPayload).isInstanceOf(ResultPayload.class);
}
- private void assertFakeFragment(IndexData row) {
- assertThat(row.normalizedTitle).isEqualTo(FakeSettingsFragment.TITLE);
- assertThat(row.updatedSummaryOn).isEqualTo(FakeSettingsFragment.SUMMARY_ON);
- assertThat(row.spaceDelimitedKeywords)
- .isEqualTo(FakeSettingsFragment.SPACE_KEYWORDS);
- assertThat(row.screenTitle).isEqualTo(FakeSettingsFragment.SCREEN_TITLE);
- assertThat(row.className).isEqualTo(FakeSettingsFragment.CLASS_NAME);
- assertThat(row.enabled).isEqualTo(FakeSettingsFragment.ENABLED);
- assertThat(row.key).isEqualTo(FakeSettingsFragment.KEY);
- }
-
private SearchIndexableRaw getFakeRaw() {
return getFakeRaw(localeStr);
}
@@ -370,8 +351,7 @@
private static IndexData findIndexDataForTitle(List<IndexData> indexData,
String indexDataTitle) {
- for (int i = 0; i < indexData.size(); i++) {
- IndexData row = indexData.get(i);
+ for (IndexData row : indexData) {
if (TextUtils.equals(row.updatedTitle, indexDataTitle)) {
return row;
}
@@ -380,8 +360,7 @@
}
private static IndexData findIndexDataForKey(List<IndexData> indexData, String indexDataKey) {
- for (int i = 0; i < indexData.size(); i++) {
- IndexData row = indexData.get(i);
+ for (IndexData row : indexData) {
if (TextUtils.equals(row.key, indexDataKey)) {
return row;
}
diff --git a/tests/robotests/src/com/android/settings/search/indexing/IndexDataTest.java b/tests/robotests/src/com/android/settings/search/indexing/IndexDataTest.java
index 1a05a2b..6ab5fad 100644
--- a/tests/robotests/src/com/android/settings/search/indexing/IndexDataTest.java
+++ b/tests/robotests/src/com/android/settings/search/indexing/IndexDataTest.java
@@ -23,7 +23,6 @@
import android.content.Context;
import android.content.Intent;
-import com.android.settings.TestConfig;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settings.search.ResultPayloadUtils;
@@ -33,11 +32,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class IndexDataTest {
+
private IndexData.Builder mBuilder;
private static final String LOCALE = "en_US";
@@ -100,8 +98,8 @@
@Test
public void testGenericIntent_addedToPayload() {
final IndexData row = generateRow();
- final ResultPayload payload = ResultPayloadUtils.unmarshall(row.payload,
- ResultPayload.CREATOR);
+ final ResultPayload payload =
+ ResultPayloadUtils.unmarshall(row.payload, ResultPayload.CREATOR);
final ComponentName name = payload.getIntent().getComponent();
assertThat(name.getClassName()).isEqualTo(INTENT_TARGET_CLASS);
assertThat(name.getPackageName()).isEqualTo(INTENT_TARGET_PACKAGE);
@@ -114,8 +112,8 @@
1 /* onValue */, null /* intent */, true /* isDeviceSupported */, 1 /* default */);
mBuilder.setPayload(payload);
final IndexData row = generateRow();
- final InlineSwitchPayload unmarshalledPayload = ResultPayloadUtils
- .unmarshall(row.payload, InlineSwitchPayload.CREATOR);
+ final InlineSwitchPayload unmarshalledPayload =
+ ResultPayloadUtils.unmarshall(row.payload, InlineSwitchPayload.CREATOR);
assertThat(row.payloadType).isEqualTo(ResultPayload.PayloadType.INLINE_SWITCH);
assertThat(unmarshalledPayload.getKey()).isEqualTo(URI);
@@ -124,8 +122,8 @@
@Test
public void testRowWithInlinePayload_intentAddedToInlinePayload() {
final String URI = "test uri";
- final ComponentName component = new ComponentName(INTENT_TARGET_PACKAGE,
- INTENT_TARGET_CLASS);
+ final ComponentName component =
+ new ComponentName(INTENT_TARGET_PACKAGE, INTENT_TARGET_CLASS);
final Intent intent = new Intent();
intent.setComponent(component);
diff --git a/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java b/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java
index 2bb03cb..18f05b6 100644
--- a/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java
+++ b/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java
@@ -17,54 +17,51 @@
package com.android.settings.search.indexing;
-import android.content.ContentResolver;
-import android.content.Context;
-
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ProviderInfo;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.provider.SearchIndexableResource;
-import com.android.settings.TestConfig;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ProviderInfo;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.List;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PreIndexDataCollectorTest {
- private final String AUTHORITY_ONE = "authority";
- private final String PACKAGE_ONE = "com.android.settings";
+ private static final String AUTHORITY_ONE = "authority";
+ private static final String PACKAGE_ONE = "com.android.settings";
@Mock
- ContentResolver mResolver;
+ private ContentResolver mResolver;
- Context mContext;
+ private Context mContext;
- PreIndexDataCollector mDataCollector;
+ private PreIndexDataCollector mDataCollector;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
doReturn(mResolver).when(mContext).getContentResolver();
- //doReturn(mPackageManager).when(mContext).getPackageManager();
mDataCollector = spy(new PreIndexDataCollector(mContext));
}
@@ -78,8 +75,8 @@
doReturn(resources).when(mDataCollector).getIndexablesForXmlResourceUri(
any(Context.class), anyString(), any(Uri.class), any(String[].class));
- PreIndexData data = mDataCollector.collectIndexableData(providerInfo,
- true /* isFullIndex */);
+ PreIndexData data =
+ mDataCollector.collectIndexableData(providerInfo, true /* isFullIndex */);
assertThat(data.dataToUpdate).containsAllIn(resources);
}
@@ -94,8 +91,8 @@
anyString(), any(Uri.class), any(String[].class));
- PreIndexData data = mDataCollector.collectIndexableData(providerInfo,
- true /* isFullIndex */);
+ PreIndexData data =
+ mDataCollector.collectIndexableData(providerInfo, true /* isFullIndex */);
assertThat(data.dataToUpdate).containsAllIn(rawData);
}
@@ -107,8 +104,8 @@
List<String> niks = getFakeNonIndexables();
- doReturn(niks).when(mDataCollector).getNonIndexablesKeysFromRemoteProvider(anyString(),
- anyString());
+ doReturn(niks).when(mDataCollector)
+ .getNonIndexablesKeysFromRemoteProvider(anyString(), anyString());
PreIndexData data = mDataCollector.collectIndexableData(providerInfo,
true /* isFullIndex */);
diff --git a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java
index 4aaf5f4..6cc1704 100644
--- a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.security;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -26,7 +25,6 @@
import android.os.UserManager;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -40,12 +38,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowUtils.class
- })
+@Config(shadows = ShadowUtils.class)
public class ChangeScreenLockPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
index ab7512f..a09bd99 100644
--- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
+++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
@@ -16,29 +16,20 @@
package com.android.settings.security;
-
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.content.DialogInterface;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.android.controller.FragmentController;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = ShadowEventLogWriter.class
-)
public class ConfigureKeyGuardDialogTest {
@Test
diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
index 638fb51..1b0549c 100644
--- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
@@ -22,7 +22,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowKeyStore;
@@ -33,10 +32,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowKeyStore.class
- })
+@Config(shadows = ShadowKeyStore.class)
public class CredentialStoragePreferenceControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
index 60e7dee..6e49f1e 100644
--- a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
@@ -26,7 +26,6 @@
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.TestConfig;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,14 +34,12 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EncryptionAndCredentialTest {
@Mock
@@ -50,16 +47,15 @@
@Mock
private DevicePolicyManager mDevicePolicyManager;
- private ShadowApplication mApplication;
private Context mContext;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mApplication = ShadowApplication.getInstance();
- mApplication.setSystemService(Context.DEVICE_POLICY_SERVICE, mDevicePolicyManager);
- mApplication.setSystemService(Context.USER_SERVICE, mUserManager);
- mContext = mApplication.getApplicationContext();
+ ShadowApplication application = ShadowApplication.getInstance();
+ application.setSystemService(Context.DEVICE_POLICY_SERVICE, mDevicePolicyManager);
+ application.setSystemService(Context.USER_SERVICE, mUserManager);
+ mContext = application.getApplicationContext();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
index b042736..6f736b1 100644
--- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
@@ -16,33 +16,27 @@
package com.android.settings.security;
-import static com.android.settings.security.EncryptionStatusPreferenceController
- .PREF_KEY_ENCRYPTION_DETAIL_PAGE;
-import static com.android.settings.security.EncryptionStatusPreferenceController
- .PREF_KEY_ENCRYPTION_SECURITY_PAGE;
+import static com.android.settings.security.EncryptionStatusPreferenceController.PREF_KEY_ENCRYPTION_DETAIL_PAGE;
+import static com.android.settings.security.EncryptionStatusPreferenceController.PREF_KEY_ENCRYPTION_SECURITY_PAGE;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
+import android.os.UserManager;
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
-import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowUserManager.class,
- ShadowLockPatternUtils.class
- })
+@Config(shadows = ShadowLockPatternUtils.class)
public class EncryptionStatusPreferenceControllerTest {
private Context mContext;
@@ -52,21 +46,23 @@
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- mController = new EncryptionStatusPreferenceController(mContext,
- PREF_KEY_ENCRYPTION_DETAIL_PAGE);
+ mController =
+ new EncryptionStatusPreferenceController(mContext, PREF_KEY_ENCRYPTION_DETAIL_PAGE);
mPreference = new Preference(mContext);
}
@Test
public void isAvailable_admin_true() {
- ShadowUserManager.getShadow().setIsAdminUser(true);
+ UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+ Shadows.shadowOf(userManager).setIsAdminUser(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_notAdmin_false() {
- ShadowUserManager.getShadow().setIsAdminUser(false);
+ UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+ Shadows.shadowOf(userManager).setIsAdminUser(false);
assertThat(mController.isAvailable()).isFalse();
}
@@ -88,22 +84,22 @@
mController.updateState(mPreference);
- assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getText(R.string.summary_placeholder));
+ final CharSequence summary = mContext.getText(R.string.summary_placeholder);
+ assertThat(mPreference.getSummary()).isEqualTo(summary);
assertThat(mController.getPreferenceKey()).isNotEqualTo(PREF_KEY_ENCRYPTION_SECURITY_PAGE);
assertThat(mPreference.getFragment()).isEqualTo(CryptKeeperSettings.class.getName());
}
@Test
public void updateSummary_unencrypted_securityPage_shouldNotHaveEncryptionFragment() {
- mController = new EncryptionStatusPreferenceController(mContext,
- PREF_KEY_ENCRYPTION_SECURITY_PAGE);
+ mController =
+ new EncryptionStatusPreferenceController(mContext, PREF_KEY_ENCRYPTION_SECURITY_PAGE);
ShadowLockPatternUtils.setDeviceEncryptionEnabled(false);
mController.updateState(mPreference);
- assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getText(R.string.summary_placeholder));
+ final CharSequence summary = mContext.getText(R.string.summary_placeholder);
+ assertThat(mPreference.getSummary()).isEqualTo(summary);
assertThat(mPreference.getFragment()).isNotEqualTo(CryptKeeperSettings.class.getName());
}
diff --git a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java
index 2b612e1..50f26c2 100644
--- a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.security;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.when;
@@ -28,7 +27,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,12 +36,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LockUnificationPreferenceControllerTest {
private static final int FAKE_PROFILE_USER_ID = 1234;
@@ -74,8 +70,7 @@
.thenReturn(mLockPatternUtils);
mController = new LockUnificationPreferenceController(mContext, mHost);
- when(mScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mPreference);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mPreference = new Preference(mContext);
}
diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
index 7738f86..023324c 100644
--- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
@@ -16,11 +16,7 @@
package com.android.settings.security;
import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -29,7 +25,6 @@
import android.support.v14.preference.SwitchPreference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,12 +33,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LockdownButtonPreferenceControllerTest {
+
@Mock
private LockPatternUtils mLockPatternUtils;
private SwitchPreference mPreference;
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
index bb667f2..ec963b5 100644
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -18,19 +18,16 @@
import static com.google.common.truth.Truth.assertThat;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LockscreenDashboardFragmentTest {
private LockscreenDashboardFragment mFragment;
diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
index 4f05e81..f047454 100644
--- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.security;
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;
@@ -35,7 +34,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.users.OwnerInfoSettings;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -46,12 +44,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class OwnerInfoPreferenceControllerTest {
@Mock
@@ -75,8 +71,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- ShadowApplication shadowContext = ShadowApplication.getInstance();
- mContext = spy(shadowContext.getApplicationContext());
+ mContext = spy(RuntimeEnvironment.application);
when(mFragment.isAdded()).thenReturn(true);
when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
@@ -181,9 +176,7 @@
@Test
public void performClick_shouldLaunchOwnerInfoSettings() {
- final ShadowApplication application = ShadowApplication.getInstance();
- final RestrictedPreference preference =
- new RestrictedPreference(application.getApplicationContext());
+ final RestrictedPreference preference = new RestrictedPreference(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(preference);
doReturn(false).when(mController).isDeviceOwnerInfoEnabled();
doReturn(false).when(mLockPatternUtils).isLockScreenDisabled(anyInt());
@@ -197,5 +190,4 @@
verify(mFragment.getFragmentManager().beginTransaction())
.add(any(OwnerInfoSettings.class), anyString());
}
-
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
index ee3f0ec..0ca41eb 100644
--- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
@@ -22,7 +22,6 @@
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -35,10 +34,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowUserManager.class
- })
+@Config(shadows = ShadowUserManager.class)
public class RestrictedEncryptionPreferenceControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
index c5177ac..818dc68 100644
--- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
@@ -16,15 +16,14 @@
package com.android.settings.security;
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.google.common.truth.Truth.assertThat;
+import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.After;
@@ -36,7 +35,6 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ScreenPinningPreferenceControllerTest {
private Context mContext;
@@ -54,8 +52,8 @@
@After
public void tearDown() {
- Settings.System.putInt(mContext.getContentResolver(),
- Settings.System.LOCK_TO_APP_ENABLED, 0);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.System.putInt(contentResolver, Settings.System.LOCK_TO_APP_ENABLED, 0);
}
@Test
@@ -71,8 +69,8 @@
@Test
public void updateState_isOff_shouldDisableOffSummary() {
- Settings.System.putInt(mContext.getContentResolver(),
- Settings.System.LOCK_TO_APP_ENABLED, 0);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.System.putInt(contentResolver, Settings.System.LOCK_TO_APP_ENABLED, 0);
mController.updateState(mPreference);
@@ -82,13 +80,12 @@
@Test
public void updateState_isOn_shouldDisableOnSummary() {
- Settings.System.putInt(mContext.getContentResolver(),
- Settings.System.LOCK_TO_APP_ENABLED, 1);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.System.putInt(contentResolver, Settings.System.LOCK_TO_APP_ENABLED, 1);
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.switch_on_text));
}
-
}
diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
index 86ba40f..829210d 100644
--- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
@@ -19,10 +19,8 @@
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import android.content.pm.PackageManager;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.security.trustagent.TrustAgentManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,17 +29,15 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SecurityFeatureProviderImplTest {
private Context mContext;
private SecurityFeatureProviderImpl mImpl;
@Before
- public void setUp() throws PackageManager.NameNotFoundException {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mImpl = new SecurityFeatureProviderImpl();
@@ -62,5 +58,4 @@
assertThat(l1).isSameAs(l2);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/security/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/security/SecuritySettingsTest.java
index 421efe8..7d93ec2 100644
--- a/tests/robotests/src/com/android/settings/security/SecuritySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/security/SecuritySettingsTest.java
@@ -25,7 +25,6 @@
import android.hardware.fingerprint.FingerprintManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,10 +34,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SecuritySettingsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
index 6bcb1d3..0da3d13 100644
--- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
@@ -16,12 +16,11 @@
package com.android.settings.security;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.content.ContentResolver;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
@@ -29,7 +28,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,7 +40,6 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ShowPasswordPreferenceControllerTest {
@Mock
@@ -65,8 +62,7 @@
mController = new ShowPasswordPreferenceController(mContext);
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
- when(mScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mPreference);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@Test
@@ -82,16 +78,16 @@
@Test
public void isChecked_settingIsOff_false() {
- Settings.System.putInt(mContext.getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
- 0);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.System.putInt(contentResolver, Settings.System.TEXT_SHOW_PASSWORD, 0);
assertThat(mController.isChecked()).isFalse();
}
@Test
public void isChecked_settingIsOn_true() {
- Settings.System.putInt(mContext.getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
- 1);
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.System.putInt(contentResolver, Settings.System.TEXT_SHOW_PASSWORD, 1);
assertThat(mController.isChecked()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
index a3a4fe3..afca089 100644
--- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
@@ -32,7 +32,6 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
-import com.android.settings.TestConfig;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,14 +41,12 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SimLockPreferenceControllerTest {
@Mock
@@ -63,26 +60,22 @@
@Mock
private PreferenceScreen mScreen;
- private Context mContext;
private SimLockPreferenceController mController;
private Preference mPreference;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE,
mSubscriptionManager);
shadowApplication.setSystemService(Context.CARRIER_CONFIG_SERVICE, mCarrierManager);
shadowApplication.setSystemService(Context.USER_SERVICE, mUserManager);
shadowApplication.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
- mController = new SimLockPreferenceController(mContext);
- mPreference = new Preference(mContext);
+ mController = new SimLockPreferenceController(RuntimeEnvironment.application);
+ mPreference = new Preference(RuntimeEnvironment.application);
mPreference.setKey(mController.getPreferenceKey());
- when(mScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mPreference);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@Test
@@ -144,8 +137,7 @@
final List<SubscriptionInfo> subscriptionInfoList = new ArrayList<>();
SubscriptionInfo info = mock(SubscriptionInfo.class);
subscriptionInfoList.add(info);
- when(mTelephonyManager.hasIccCard(anyInt()))
- .thenReturn(true);
+ when(mTelephonyManager.hasIccCard(anyInt())).thenReturn(true);
when(mSubscriptionManager.getActiveSubscriptionInfoList())
.thenReturn(subscriptionInfoList);
}
@@ -154,10 +146,8 @@
final List<SubscriptionInfo> subscriptionInfoList = new ArrayList<>();
SubscriptionInfo info = mock(SubscriptionInfo.class);
subscriptionInfoList.add(info);
- when(mTelephonyManager.getSimState(anyInt()))
- .thenReturn(SIM_STATE_READY);
+ when(mTelephonyManager.getSimState(anyInt())).thenReturn(SIM_STATE_READY);
when(mSubscriptionManager.getActiveSubscriptionInfoList())
.thenReturn(subscriptionInfoList);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java
index 23d2731..4e37aa7 100644
--- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.security;
-
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
@@ -34,7 +33,6 @@
import android.os.UserManager;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,11 +43,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VisiblePatternProfilePreferenceControllerTest {
private static final int FAKE_PROFILE_USER_ID = 1234;
@@ -75,9 +71,9 @@
mContext = spy(RuntimeEnvironment.application);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)).thenReturn(true);
- ShadowApplication.getInstance().setSystemService(Context.FINGERPRINT_SERVICE,
- mFingerprintManager);
- ShadowApplication.getInstance().setSystemService(Context.USER_SERVICE, mUm);
+ final ShadowApplication application = ShadowApplication.getInstance();
+ application.setSystemService(Context.FINGERPRINT_SERVICE, mFingerprintManager);
+ application.setSystemService(Context.USER_SERVICE, mUm);
mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java
index 6afd25e..5538b4c 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java
@@ -17,9 +17,7 @@
package com.android.settings.security.screenlock;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -30,10 +28,8 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
-import android.support.v7.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.TimeoutListPreference;
import com.android.settings.security.trustagent.TrustAgentManager;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -51,8 +47,7 @@
import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowDevicePolicyManagerWrapper.class})
+@Config(shadows = ShadowDevicePolicyManagerWrapper.class)
public class LockAfterTimeoutPreferenceControllerTest {
private static final int TEST_USER_ID = 0;
@@ -131,7 +126,7 @@
Settings.System.putInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, displayTimeout);
ShadowDevicePolicyManagerWrapper.setMaximumTimeToLock(userId, adminTimeout);
- mController.updateState((Preference) mPreference);
+ mController.updateState(mPreference);
verify(mPreference).removeUnusableTimeouts(adminTimeout - displayTimeout, null);
}
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java
index f1a5d9b..17e61ee 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java
@@ -33,7 +33,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -44,11 +43,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LockScreenPreferenceControllerTest {
private static final int FAKE_PROFILE_USER_ID = 1234;
@@ -83,7 +80,6 @@
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
mController = new LockScreenPreferenceController(mContext, mLifecycle);
-
}
@Test
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java
index 6958d40..ca2854e 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java
@@ -25,7 +25,6 @@
import android.support.v14.preference.SwitchPreference;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,10 +33,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PatternVisiblePreferenceControllerTest {
private static final int TEST_USER_ID = 0;
@@ -52,8 +49,8 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = new PatternVisiblePreferenceController(
- mContext, TEST_USER_ID, mLockPatternUtils);
+ mController =
+ new PatternVisiblePreferenceController(mContext, TEST_USER_ID, mLockPatternUtils);
mPreference = new SwitchPreference(mContext);
}
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
index b3821a3..e17e797 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
@@ -26,7 +26,6 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.security.trustagent.TrustAgentManager;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,10 +36,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PowerButtonInstantLockPreferenceControllerTest {
private static final int TEST_USER_ID = 0;
@@ -129,5 +126,4 @@
verify(mLockPatternUtils).setPowerButtonInstantlyLocks(true, TEST_USER_ID);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java
index 374b7ec..c1d7dd2 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java
@@ -22,7 +22,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.security.OwnerInfoPreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -30,7 +29,6 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
@@ -38,7 +36,6 @@
import java.util.Map;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ScreenLockSettingsTest {
private ScreenLockSettings mSettings;
@@ -68,5 +65,4 @@
verify(controller).updateSummary();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
index 64a0cea..f7d30a1 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
@@ -25,7 +25,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
-import com.android.settings.TestConfig;
+import com.android.settings.security.trustagent.TrustAgentManager.TrustAgentComponentInfo;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,10 +38,9 @@
import org.robolectric.annotation.Config;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ManageTrustAgentsPreferenceControllerTest {
@Mock
@@ -107,7 +106,7 @@
public void updateState_isSecure_hasTrustAgent_shouldShowDetailedSummary() {
when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
when(mTrustAgentManager.getActiveTrustAgents(mContext, mLockPatternUtils))
- .thenReturn(Arrays.asList(new TrustAgentManager.TrustAgentComponentInfo()));
+ .thenReturn(Collections.singletonList(new TrustAgentComponentInfo()));
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
index 258833e..9bd7064 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
@@ -16,11 +16,8 @@
package com.android.settings.security.trustagent;
-
-import static com.android.settings.security.trustagent.TrustAgentListPreferenceController
- .PREF_KEY_SECURITY_CATEGORY;
-import static com.android.settings.security.trustagent.TrustAgentListPreferenceController
- .PREF_KEY_TRUST_AGENT;
+import static com.android.settings.security.trustagent.TrustAgentListPreferenceController.PREF_KEY_SECURITY_CATEGORY;
+import static com.android.settings.security.trustagent.TrustAgentListPreferenceController.PREF_KEY_TRUST_AGENT;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeastOnce;
@@ -38,7 +35,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.TestConfig;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.security.SecuritySettings;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -57,7 +53,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TrustAgentListPreferenceControllerTest {
@Mock
@@ -78,7 +73,6 @@
private TrustAgentListPreferenceController mController;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -87,13 +81,12 @@
mLifecycle = new Lifecycle(mLifecycleOwner);
mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(any(Context.class)))
- .thenReturn(mLockPatternUtils);
+ .thenReturn(mLockPatternUtils);
when(mFeatureFactory.securityFeatureProvider.getTrustAgentManager())
- .thenReturn(mTrustAgentManager);
+ .thenReturn(mTrustAgentManager);
when(mCategory.getKey()).thenReturn(PREF_KEY_SECURITY_CATEGORY);
when(mCategory.getContext()).thenReturn(mActivity);
- when(mScreen.findPreference(PREF_KEY_SECURITY_CATEGORY))
- .thenReturn(mCategory);
+ when(mScreen.findPreference(PREF_KEY_SECURITY_CATEGORY)).thenReturn(mCategory);
mController = new TrustAgentListPreferenceController(mActivity, mFragment, mLifecycle);
}
@@ -127,15 +120,15 @@
@Test
public void onResume_shouldAddNewAgents() {
final List<TrustAgentManager.TrustAgentComponentInfo> agents = new ArrayList<>();
- final TrustAgentManager.TrustAgentComponentInfo agent = mock(
- TrustAgentManager.TrustAgentComponentInfo.class);
+ final TrustAgentManager.TrustAgentComponentInfo agent =
+ mock(TrustAgentManager.TrustAgentComponentInfo.class);
agent.title = "Test_title";
agent.summary = "test summary";
agent.componentName = new ComponentName("pkg", "agent");
agent.admin = null;
agents.add(agent);
when(mTrustAgentManager.getActiveTrustAgents(mActivity, mLockPatternUtils))
- .thenReturn(agents);
+ .thenReturn(agents);
mController.displayPreference(mScreen);
mController.onResume();
@@ -147,8 +140,8 @@
@Config(qualifiers = "mcc999")
public void onResume_ifNotAvailable_shouldNotAddNewAgents() {
final List<TrustAgentManager.TrustAgentComponentInfo> agents = new ArrayList<>();
- final TrustAgentManager.TrustAgentComponentInfo agent = mock(
- TrustAgentManager.TrustAgentComponentInfo.class);
+ final TrustAgentManager.TrustAgentComponentInfo agent =
+ mock(TrustAgentManager.TrustAgentComponentInfo.class);
agent.title = "Test_title";
agent.summary = "test summary";
agent.componentName = new ComponentName("pkg", "agent");
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java
index a2b6263..9cee3d1 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java
@@ -23,7 +23,6 @@
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -31,10 +30,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TrustAgentManagerTest {
private static final String CANNED_PACKAGE_NAME = "com.test.package";
@@ -45,7 +42,7 @@
private TrustAgentManager mTrustAgentManager;
@Before
- public void setUp() throws PackageManager.NameNotFoundException {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
mTrustAgentManager = new TrustAgentManager();
}
@@ -60,8 +57,7 @@
ResolveInfo resolveInfo = new ResolveInfo();
resolveInfo.serviceInfo = serviceInfo;
- assertThat(mTrustAgentManager.shouldProvideTrust(resolveInfo, mPackageManager))
- .isTrue();
+ assertThat(mTrustAgentManager.shouldProvideTrust(resolveInfo, mPackageManager)).isTrue();
}
@Test
@@ -74,7 +70,6 @@
ResolveInfo resolveInfo = new ResolveInfo();
resolveInfo.serviceInfo = serviceInfo;
- assertThat(mTrustAgentManager.shouldProvideTrust(resolveInfo, mPackageManager))
- .isFalse();
+ assertThat(mTrustAgentManager.shouldProvideTrust(resolveInfo, mPackageManager)).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index 3512ded..50f47ff 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -18,18 +18,17 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
-import android.content.ContentResolver;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.DatabaseTestUtils;
import com.android.settings.testutils.FakeToggleController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,14 +38,15 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.HashMap;
import androidx.app.slice.Slice;
+import java.util.HashMap;
+
+/**
+ * TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider)
+ */
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsSliceProviderTest {
private final String KEY = "KEY";
@@ -66,6 +66,7 @@
mContext = spy(RuntimeEnvironment.application);
mProvider = spy(new SettingsSliceProvider());
mProvider.mSliceDataCache = new HashMap<>();
+ mProvider.mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(mContext);
mDb = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
SlicesDatabaseHelper.getInstance(mContext).setIndexedState();
}
@@ -76,7 +77,12 @@
}
@Test
- public void testInitialSliceReturned_emmptySlice() {
+ public void testInitialSliceReturned_emptySlice() {
+ insertSpecialCase(KEY);
+ ContentResolver mockResolver = mock(ContentResolver.class);
+ doReturn(mockResolver).when(mContext).getContentResolver();
+ when(mProvider.getContext()).thenReturn(mContext);
+
Uri uri = SettingsSliceProvider.getUri(KEY);
Slice slice = mProvider.onBindSlice(uri);
@@ -97,8 +103,7 @@
public void testLoadSlice_returnsSliceFromAccessor() {
ContentResolver mockResolver = mock(ContentResolver.class);
doReturn(mockResolver).when(mContext).getContentResolver();
- doReturn(mContext).when(mProvider).getContext();
- mProvider.mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(mContext);
+ when(mProvider.getContext()).thenReturn(mContext);
insertSpecialCase(KEY);
Uri uri = SettingsSliceProvider.getUri(KEY);
@@ -111,7 +116,7 @@
@Test
public void testLoadSlice_cachedEntryRemovedOnBuild() {
- doReturn(mContext).when(mProvider).getContext();
+ when(mProvider.getContext()).thenReturn(mContext);
SliceData data = getDummyData();
mProvider.mSliceDataCache.put(data.getUri(), data);
mProvider.onBindSlice(data.getUri());
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
index 1c5899d..965bec3 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
@@ -18,7 +18,6 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import android.content.ContentValues;
@@ -26,7 +25,6 @@
import android.content.Intent;
import android.database.sqlite.SQLiteDatabase;
-import com.android.settings.TestConfig;
import com.android.settings.search.FakeIndexProvider;
import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.search.SearchFeatureProviderImpl;
@@ -39,10 +37,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SliceBroadcastReceiverTest {
private final String fakeTitle = "title";
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index 184be5f..5a2271a 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -16,10 +16,7 @@
package com.android.settings.slices;
-import static com.android.settings.TestConfig.SDK_VERSION;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -27,7 +24,6 @@
import android.net.Uri;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeToggleController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,12 +32,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import androidx.app.slice.Slice;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = SDK_VERSION)
public class SliceBuilderUtilsTest {
private final String KEY = "KEY";
@@ -70,16 +64,16 @@
@Test
public void testGetPreferenceController_buildsMatchingController() {
- BasePreferenceController controller = SliceBuilderUtils.getPreferenceController(
- mContext, getDummyData());
+ BasePreferenceController controller =
+ SliceBuilderUtils.getPreferenceController(mContext, getDummyData());
assertThat(controller).isInstanceOf(FakeToggleController.class);
}
@Test
public void testGetPreferenceController_contextOnly_buildsMatchingController() {
- BasePreferenceController controller = SliceBuilderUtils.getPreferenceController(mContext,
- getDummyData(PREF_CONTROLLER2));
+ BasePreferenceController controller =
+ SliceBuilderUtils.getPreferenceController(mContext, getDummyData(PREF_CONTROLLER2));
assertThat(controller).isInstanceOf(FakeContextOnlyPreferenceController.class);
}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlTest.java b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlTest.java
index 9c079a7..bf979c6 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlTest.java
@@ -16,10 +16,7 @@
package com.android.settings.slices;
-import static com.android.settings.TestConfig.SDK_VERSION;
-
import static com.google.common.truth.Truth.assertWithMessage;
-
import static org.mockito.Mockito.spy;
import android.content.Context;
@@ -29,7 +26,6 @@
import android.util.AttributeSet;
import android.util.Xml;
-import com.android.settings.TestConfig;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.core.codeinspection.ClassScanner;
import com.android.settings.core.codeinspection.CodeInspector;
@@ -46,21 +42,19 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.xmlpull.v1.XmlPullParser;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = SDK_VERSION)
public class SliceControllerInXmlTest {
- private static final List<Class> mSliceControllerClasses = new ArrayList<>(Arrays.asList(
- TogglePreferenceController.class
- ));
+ private static final List<Class> mSliceControllerClasses = Collections.singletonList(
+ TogglePreferenceController.class
+ );
private final List<String> mXmlDeclaredControllers = new ArrayList<>();
private final List<String> mGrandfatheredClasses = new ArrayList<>();
@@ -73,7 +67,7 @@
private Context mContext;
- SearchFeatureProvider mSearchProvider;
+ private SearchFeatureProvider mSearchProvider;
private FakeFeatureFactory mFakeFeatureFactory;
@Before
@@ -125,8 +119,8 @@
@Test
public void testAllControllersDeclaredInXml() throws Exception {
- final List<Class<?>> classes = new ClassScanner().getClassesForPackage(
- mContext.getPackageName());
+ final List<Class<?>> classes =
+ new ClassScanner().getClassesForPackage(mContext.getPackageName());
final List<String> missingControllersInXml = new ArrayList<>();
for (Class<?> clazz : classes) {
@@ -144,8 +138,8 @@
// Removed whitelisted classes
missingControllersInXml.removeAll(mGrandfatheredClasses);
- final String missingControllerError = buildErrorMessage(ERROR_MISSING_CONTROLLER,
- missingControllersInXml);
+ final String missingControllerError =
+ buildErrorMessage(ERROR_MISSING_CONTROLLER, missingControllersInXml);
assertWithMessage(missingControllerError).that(missingControllersInXml).isEmpty();
}
@@ -176,7 +170,6 @@
.getProviderValues();
for (Class clazz : indexableClasses) {
-
Indexable.SearchIndexProvider provider = DatabaseIndexingUtils.getSearchIndexProvider(
clazz);
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
index 98a7d6c..4d6c08d 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
@@ -17,12 +17,8 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
-import android.content.Context;
-
-import com.android.settings.TestConfig;
import com.android.settings.search.FakeIndexProvider;
import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.search.SearchFeatureProviderImpl;
@@ -39,7 +35,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SliceDataConverterTest {
private final String fakeKey = "key";
@@ -49,16 +44,13 @@
private final String fakeFragmentClassName = FakeIndexProvider.class.getName();
private final String fakeControllerName = FakePreferenceController.class.getName();
- Context mContext;
-
- SliceDataConverter mSliceDataConverter;
- SearchFeatureProvider mSearchFeatureProvider;
+ private SliceDataConverter mSliceDataConverter;
+ private SearchFeatureProvider mSearchFeatureProvider;
private FakeFeatureFactory mFakeFeatureFactory;
@Before
public void setUp() {
- mContext = RuntimeEnvironment.application;
- mSliceDataConverter = new SliceDataConverter(mContext);
+ mSliceDataConverter = new SliceDataConverter(RuntimeEnvironment.application);
mSearchFeatureProvider = new SearchFeatureProviderImpl();
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
mFakeFeatureFactory.searchFeatureProvider = mSearchFeatureProvider;
@@ -66,8 +58,7 @@
@After
public void cleanUp() {
- mFakeFeatureFactory.searchFeatureProvider = mock(
- SearchFeatureProvider.class);
+ mFakeFeatureFactory.searchFeatureProvider = mock(SearchFeatureProvider.class);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
index ee6fe96..7cd19b5 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
@@ -16,20 +16,16 @@
package com.android.settings.slices;
-
import static com.google.common.truth.Truth.assertThat;
import android.net.Uri;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SliceDataTest {
private final String KEY = "KEY";
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
index 106e6fe..8989de9 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
@@ -18,7 +18,6 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import android.content.ContentValues;
@@ -26,7 +25,6 @@
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
-import com.android.settings.TestConfig;
import com.android.settings.search.FakeIndexProvider;
import com.android.settings.testutils.DatabaseTestUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,10 +34,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SlicesDatabaseAccessorTest {
private final String fakeTitle = "title";
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
index 52c4e42..7d1b401 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
@@ -17,7 +17,6 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -26,7 +25,6 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
-import com.android.settings.TestConfig;
import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns;
import com.android.settings.testutils.DatabaseTestUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,12 +34,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.Locale;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SlicesDatabaseHelperTest {
private Context mContext;
@@ -65,7 +61,7 @@
Cursor cursor = mDatabase.rawQuery("SELECT * FROM slices_index", null);
String[] columnNames = cursor.getColumnNames();
- String[] expectedNames = new String[]{
+ String[] expectedNames = {
IndexColumns.KEY,
IndexColumns.TITLE,
IndexColumns.SUMMARY,
@@ -124,9 +120,7 @@
}
private ContentValues getDummyRow() {
- ContentValues values;
-
- values = new ContentValues();
+ final ContentValues values = new ContentValues();
values.put(IndexColumns.KEY, "key");
values.put(IndexColumns.TITLE, "title");
values.put(IndexColumns.SUMMARY, "summary");
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
index ed4f3ff..ca198cb 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -27,7 +26,6 @@
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
-import com.android.settings.TestConfig;
import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns;
import com.android.settings.testutils.DatabaseTestUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,14 +35,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SlicesIndexerTest {
private final String[] KEYS = new String[]{"key1", "key2", "key3"};
@@ -93,7 +88,7 @@
@Test
public void testInsertSliceData_indexedStateSet() {
- SlicesDatabaseHelper helper = SlicesDatabaseHelper.getInstance(mContext);
+ final SlicesDatabaseHelper helper = SlicesDatabaseHelper.getInstance(mContext);
helper.setIndexedState();
doReturn(new ArrayList<SliceData>()).when(mManager).getSliceData();
@@ -104,26 +99,26 @@
@Test
public void testInsertSliceData_mockDataInserted() {
- List<SliceData> sliceData = getDummyIndexableData();
+ final List<SliceData> sliceData = getDummyIndexableData();
doReturn(sliceData).when(mManager).getSliceData();
mManager.run();
- Cursor cursor = mDb.rawQuery("SELECT * FROM slices_index", null);
+ final Cursor cursor = mDb.rawQuery("SELECT * FROM slices_index", null);
assertThat(cursor.getCount()).isEqualTo(sliceData.size());
cursor.moveToFirst();
for (int i = 0; i < sliceData.size(); i++) {
- assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.KEY))).isEqualTo(
- KEYS[i]);
- assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.TITLE))).isEqualTo(
- TITLES[i]);
+ assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.KEY)))
+ .isEqualTo(KEYS[i]);
+ assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.TITLE)))
+ .isEqualTo(TITLES[i]);
cursor.moveToNext();
}
}
private void insertSpecialCase(String key, String title) {
- ContentValues values = new ContentValues();
+ final ContentValues values = new ContentValues();
values.put(IndexColumns.KEY, key);
values.put(IndexColumns.TITLE, title);
@@ -131,18 +126,17 @@
}
private List<SliceData> getDummyIndexableData() {
- List<SliceData> sliceData = new ArrayList<>();
- SliceData.Builder builder = new SliceData.Builder();
- builder.setSummary(SUMMARY)
- .setScreenTitle(SCREEN_TITLE)
- .setFragmentName(FRAGMENT_NAME)
- .setIcon(ICON)
- .setUri(URI)
- .setPreferenceControllerClassName(PREF_CONTROLLER);
+ final SliceData.Builder builder = new SliceData.Builder()
+ .setSummary(SUMMARY)
+ .setScreenTitle(SCREEN_TITLE)
+ .setFragmentName(FRAGMENT_NAME)
+ .setIcon(ICON)
+ .setUri(URI)
+ .setPreferenceControllerClassName(PREF_CONTROLLER);
+ final List<SliceData> sliceData = new ArrayList<>();
for (int i = 0; i < KEYS.length; i++) {
- builder.setKey(KEYS[i])
- .setTitle(TITLES[i]);
+ builder.setKey(KEYS[i]).setTitle(TITLES[i]);
sliceData.add(builder.build());
}
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index 9dff925..bb14667 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -16,95 +16,106 @@
package com.android.settings.suggestions;
-import static com.android.settings.TestConfig.MANIFEST_PATH;
import static com.google.common.truth.Truth.assertThat;
import android.annotation.StringRes;
+import android.content.ComponentName;
import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
import com.android.settings.R;
-import com.android.settings.TestConfig;
+import com.android.settings.Settings;
+import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;
import com.android.settings.fingerprint.FingerprintSuggestionActivity;
+import com.android.settings.support.NewDeviceIntroSuggestionActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wallpaper.WallpaperSuggestionActivity;
+import com.android.settings.wifi.calling.WifiCallingSuggestionActivity;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.manifest.ActivityData;
-import org.robolectric.manifest.AndroidManifest;
-import org.robolectric.manifest.IntentFilterData;
-import org.robolectric.shadows.ShadowApplication;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsSuggestionsTest {
- private static final String CATEGORY_FIRST_IMPRESSION =
- "com.android.settings.suggested.category.FIRST_IMPRESSION";
-
- private static final String CATEGORY_SETTINGS_ONLY =
- "com.android.settings.suggested.category.SETTINGS_ONLY";
-
@Test
public void wallpaperSuggestion_isValid() {
- assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
- CATEGORY_FIRST_IMPRESSION,
- R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
+ assertSuggestionEquals(
+ WallpaperSuggestionActivity.class.getName(),
+ R.string.wallpaper_suggestion_title,
+ R.string.wallpaper_suggestion_summary);
}
@Test
public void fingerprintSuggestion_isValid() {
assertSuggestionEquals(
- FingerprintSuggestionActivity.class.getName(),
- CATEGORY_FIRST_IMPRESSION,
- R.string.suggestion_additional_fingerprints,
- R.string.suggestion_additional_fingerprints_summary);
+ FingerprintSuggestionActivity.class.getName(),
+ R.string.suggestion_additional_fingerprints,
+ R.string.suggestion_additional_fingerprints_summary);
+ }
+
+ @Test
+ public void fingerprintEnrollSuggestion_isValid() {
+ assertSuggestionEquals(
+ FingerprintEnrollSuggestionActivity.class.getName(),
+ R.string.suggested_fingerprint_lock_settings_title,
+ R.string.suggested_fingerprint_lock_settings_summary);
}
@Test
public void wifiCallingSuggestion_isValid() {
- assertSuggestionEquals("com.android.settings.wifi.calling.WifiCallingSuggestionActivity",
- CATEGORY_FIRST_IMPRESSION,
- R.string.wifi_calling_suggestion_title, R.string.wifi_calling_suggestion_summary);
+ assertSuggestionEquals(
+ WifiCallingSuggestionActivity.class.getName(),
+ R.string.wifi_calling_suggestion_title,
+ R.string.wifi_calling_suggestion_summary);
}
@Test
public void nightDisplaySuggestion_isValid() {
- assertSuggestionEquals("Settings$NightDisplaySuggestionActivity",
- CATEGORY_FIRST_IMPRESSION,
- R.string.night_display_suggestion_title, R.string.night_display_suggestion_summary);
+ assertSuggestionEquals(
+ Settings.NightDisplaySuggestionActivity.class.getName(),
+ R.string.night_display_suggestion_title,
+ R.string.night_display_suggestion_summary);
}
- private void assertSuggestionEquals(String activityName, String category, @StringRes int title,
- @StringRes int summary) {
- final AndroidManifest androidManifest = ShadowApplication.getInstance().getAppManifest();
- final ActivityData activityData = androidManifest.getActivityData(activityName);
- final Map<String, Object> metaData = activityData.getMetaData().getValueMap();
+ @Test
+ public void newDeviceIntroSuggestion_isValid() {
+ assertSuggestionEquals(
+ NewDeviceIntroSuggestionActivity.class.getName(),
+ R.string.new_device_suggestion_title,
+ R.string.new_device_suggestion_summary);
+ }
+
+ private void assertSuggestionEquals(String activityName, @StringRes int titleRes,
+ @StringRes int summaryRes) {
+
final Context context = RuntimeEnvironment.application;
- final String expectedTitle = context.getString(title);
- final String expectedSummary = context.getString(summary);
-
- final String pName = context.getPackageName();
- final String actualTitle = context.getString(context.getResources().getIdentifier(
- ((String) metaData.get("com.android.settings.title")).substring(8), "string",
- pName));
- final String actualSummary = context.getString(context.getResources().getIdentifier(
- ((String) metaData.get("com.android.settings.summary")).substring(8), "string",
- pName));
- assertThat(actualTitle).isEqualTo(expectedTitle);
- assertThat(actualSummary).isEqualTo(expectedSummary);
-
- final List<IntentFilterData> intentFilters = activityData.getIntentFilters();
- final List<String> categories = new ArrayList<>();
- for (IntentFilterData intentFilter : intentFilters) {
- categories.addAll(intentFilter.getCategories());
+ final PackageManager pm = context.getPackageManager();
+ final ComponentName componentName = new ComponentName(context, activityName);
+ final ActivityInfo info;
+ try {
+ info = pm.getActivityInfo(componentName, PackageManager.GET_META_DATA);
+ } catch (NameNotFoundException e) {
+ throw new RuntimeException(e);
}
- assertThat(categories).contains(category);
+ final String pName = context.getPackageName();
+ final Resources resources = context.getResources();
+
+ final String title = (String) info.metaData.get("com.android.settings.title");
+ final String actualTitle =
+ context.getString(resources.getIdentifier(title.substring(8), "string", pName));
+ final String expectedTitle = context.getString(titleRes);
+ assertThat(actualTitle).isEqualTo(expectedTitle);
+
+ final String summary = (String) info.metaData.get("com.android.settings.summary");
+ final String actualSummary =
+ context.getString(resources.getIdentifier(summary.substring(8), "string", pName));
+ final String expectedSummary = context.getString(summaryRes);
+ assertThat(actualSummary).isEqualTo(expectedSummary);
}
}
diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
index 57fda9f..1597568 100644
--- a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java
@@ -16,20 +16,13 @@
package com.android.settings.support;
-
-import static com.android.settings.support.NewDeviceIntroSuggestionActivity
- .PERMANENT_DISMISS_THRESHOLD;
-import static com.android.settings.support.NewDeviceIntroSuggestionActivity
- .PREF_KEY_SUGGGESTION_COMPLETE;
-import static com.android.settings.support.NewDeviceIntroSuggestionActivity
- .PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME;
+import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PERMANENT_DISMISS_THRESHOLD;
+import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PREF_KEY_SUGGGESTION_COMPLETE;
+import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME;
import static com.android.settings.support.NewDeviceIntroSuggestionActivity.isSuggestionComplete;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
-import static org.robolectric.RuntimeEnvironment.application;
import android.content.Context;
import android.content.Intent;
@@ -37,7 +30,6 @@
import android.content.pm.ResolveInfo;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -47,28 +39,27 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPackageManager;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NewDeviceIntroSuggestionActivityTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mMockContext;
- private FakeFeatureFactory mFeatureFactory;
private Context mContext;
+ private FakeFeatureFactory mFeatureFactory;
private ShadowPackageManager mShadowPackageManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mFeatureFactory = FakeFeatureFactory.setupForTest();
- mContext = application;
- mShadowPackageManager = Shadows.shadowOf(application.getPackageManager());
+ mContext = RuntimeEnvironment.application;
+ mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mFeatureFactory.suggestionsFeatureProvider.getSharedPrefs(any(Context.class)))
.thenReturn(getSharedPreferences());
}
@@ -79,8 +70,7 @@
.getBoolean(R.bool.config_new_device_intro_suggestion_supported))
.thenReturn(false);
- assertThat(isSuggestionComplete(mContext))
- .isTrue();
+ assertThat(isSuggestionComplete(mContext)).isTrue();
}
@Test
@@ -89,16 +79,14 @@
getSharedPreferences().edit().putLong(PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME,
currentTime - 2 * PERMANENT_DISMISS_THRESHOLD);
- assertThat(isSuggestionComplete(mContext))
- .isTrue();
+ assertThat(isSuggestionComplete(mContext)).isTrue();
}
@Test
public void isSuggestionComplete_noUrl_shouldReturnTrue() {
when(mFeatureFactory.supportFeatureProvider.getNewDeviceIntroUrl(any(Context.class)))
.thenReturn(null);
- assertThat(isSuggestionComplete(mContext))
- .isTrue();
+ assertThat(isSuggestionComplete(mContext)).isTrue();
}
@Test
@@ -108,8 +96,7 @@
getSharedPreferences().edit().putBoolean(PREF_KEY_SUGGGESTION_COMPLETE, true).commit();
- assertThat(isSuggestionComplete(mContext))
- .isTrue();
+ assertThat(isSuggestionComplete(mContext)).isTrue();
}
@Test
@@ -125,5 +112,4 @@
private SharedPreferences getSharedPreferences() {
return mContext.getSharedPreferences("test_new_device_sugg", Context.MODE_PRIVATE);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
index 28b0a9d..44e4f2b 100644
--- a/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportConfigTest.java
@@ -16,19 +16,16 @@
package com.android.settings.support;
+import static com.google.common.truth.Truth.assertThat;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SupportConfigTest {
@Test
diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
index 178e4ec..bff4fc0 100644
--- a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
@@ -16,38 +16,32 @@
package com.android.settings.support;
-
import static com.google.common.truth.Truth.assertThat;
-import static org.robolectric.RuntimeEnvironment.application;
-
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SupportDashboardActivityTest {
private Context mContext;
@Before
public void setUp() {
- mContext = application;
+ mContext = RuntimeEnvironment.application;
}
@Test
@@ -69,15 +63,13 @@
@Test
public void shouldHandleIntentAction() {
- PackageManager packageManager = application.getPackageManager();
- Shadows.shadowOf(packageManager).setQueryIntentImplicitly(true);
+ PackageManager packageManager = mContext.getPackageManager();
// Intent action used by setup wizard to start support settings
Intent intent = new Intent("com.android.settings.action.SUPPORT_SETTINGS");
- ResolveInfo resolveInfo = packageManager.resolveActivity(
- intent,
- PackageManager.MATCH_DEFAULT_ONLY);
+ ResolveInfo resolveInfo =
+ packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
assertThat(resolveInfo).isNotNull();
- assertThat(resolveInfo.activityInfo.targetActivity)
+ assertThat(resolveInfo.activityInfo.name)
.isEqualTo(SupportDashboardActivity.class.getName());
}
}
diff --git a/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.java b/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.java
index b86511f..a78187f 100644
--- a/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/support/actionbar/HelpMenuControllerTest.java
@@ -23,7 +23,6 @@
import android.content.Context;
import android.os.Bundle;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
@@ -32,10 +31,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HelpMenuControllerTest {
@Mock
@@ -60,7 +57,6 @@
mHost.getLifecycle().onCreateOptionsMenu(null /* menu */, null /* inflater */);
verify(mContext).getString(123);
-
}
@Test
@@ -72,13 +68,12 @@
verify(mContext).getString(mHost.getHelpResource());
}
-
- public static class TestFragment extends ObservablePreferenceFragment
- implements HelpResourceProvider {
+ private static class TestFragment
+ extends ObservablePreferenceFragment
+ implements HelpResourceProvider {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-
}
}
}
diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
index 69574a6..63df36e 100644
--- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
+++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
@@ -4,7 +4,6 @@
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -15,7 +14,6 @@
import android.content.IntentFilter;
import android.support.v4.content.LocalBroadcastManager;
-import com.android.settings.TestConfig;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.overlay.SurveyFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -28,20 +26,17 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.HashMap;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SurveyMixinTest {
private static final String FAKE_KEY = "fake_key";
private static final String FAKE_SURVEY_ID = "fake_id";
- private FakeFeatureFactory mFactory;
private Context mContext;
private SurveyFeatureProvider mProvider;
@Mock
@@ -53,9 +48,8 @@
public void setUp() {
// set up the fakefeature factory to mock out the survey provider
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application.getApplicationContext());
- mFactory = FakeFeatureFactory.setupForTest();
- mProvider = mFactory.getSurveyFeatureProvider(mContext);
+ mContext = RuntimeEnvironment.application;
+ mProvider = FakeFeatureFactory.setupForTest().getSurveyFeatureProvider(mContext);
when(mProvider.getSurveyId(any(), eq(FAKE_KEY))).thenReturn(FAKE_SURVEY_ID);
}
@@ -151,5 +145,4 @@
// Verify we do nothing
verify(mProvider, never()).showSurveyIfAvailable(any(), any());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java
index 43f48c0..a1473a7 100644
--- a/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/AdditionalSystemUpdatePreferenceControllerTest.java
@@ -19,7 +19,6 @@
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -30,7 +29,6 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AdditionalSystemUpdatePreferenceControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
index f71ae93..ff09412 100644
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
@@ -16,78 +16,73 @@
package com.android.settings.system;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-import android.accounts.AccountManager;
import android.content.Context;
import android.os.UserManager;
+import android.provider.Settings;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.Shadows;
+import org.robolectric.shadows.ShadowUserManager;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowSecureSettings.class, ShadowUtils.class}
-)
public class FactoryResetPreferenceControllerTest {
private static final String FACTORY_RESET_KEY = "factory_reset";
- @Mock
- private UserManager mUserManager;
- @Mock
- private AccountManager mAccountManager;
+ private ShadowUserManager mShadowUserManager;
private Context mContext;
private FactoryResetPreferenceController mController;
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- ShadowApplication.getInstance().setSystemService(Context.USER_SERVICE, mUserManager);
- ShadowApplication.getInstance().setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
+ UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+ mShadowUserManager = Shadows.shadowOf(userManager);
+
mController = new FactoryResetPreferenceController(mContext);
}
@After
public void tearDown() {
ShadowUtils.reset();
+ mShadowUserManager.setIsAdminUser(false);
+ mShadowUserManager.setIsDemoUser(false);
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVICE_DEMO_MODE, 0);
}
@Test
public void isAvailable_systemUser() {
- when(mUserManager.isAdminUser()).thenReturn(true);
+ mShadowUserManager.setIsAdminUser(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_nonSystemUser() {
- when(mUserManager.isAdminUser()).thenReturn(false);
- ShadowUtils.setIsDemoUser(false);
+ mShadowUserManager.setIsAdminUser(false);
+ mShadowUserManager.setIsDemoUser(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isAvailable_demoUser() {
- when(mUserManager.isAdminUser()).thenReturn(false);
- ShadowUtils.setIsDemoUser(true);
+ mShadowUserManager.setIsAdminUser(false);
+
+ // Place the device in demo mode.
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEVICE_DEMO_MODE, 1);
+
+ // Indicate the user is a demo user.
+ mShadowUserManager.setIsDemoUser(true);
assertThat(mController.isAvailable()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
index cd25953..597389a 100644
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
@@ -17,19 +17,12 @@
package com.android.settings.system;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
import android.content.Context;
-import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.After;
import org.junit.Before;
@@ -41,11 +34,7 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowUserManager.class,
- SettingsShadowResources.class,
- })
+@Config(shadows = SettingsShadowResources.class)
public class SystemDashboardFragmentTest {
@Before
@@ -61,10 +50,7 @@
@Test
public void testNonIndexableKeys_existInXmlLayout() {
- final Context context = spy(RuntimeEnvironment.application);
- UserManager manager = mock(UserManager.class);
- when(manager.isAdminUser()).thenReturn(false);
- doReturn(manager).when(context).getSystemService(Context.USER_SERVICE);
+ final Context context = RuntimeEnvironment.application;
final List<String> niks = SystemDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(context);
final int xmlId = (new SystemDashboardFragment()).getPreferenceScreenResId();
diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
index 95a18a1..1b4c543 100644
--- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
@@ -27,33 +27,29 @@
import android.os.Build;
import android.os.Bundle;
import android.os.SystemUpdateManager;
+import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowUserManager;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.shadows.ShadowUserManager;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowUserManager.class
- })
public class SystemUpdatePreferenceControllerTest {
@Mock
@@ -62,6 +58,7 @@
private SystemUpdateManager mSystemUpdateManager;
private Context mContext;
+ private ShadowUserManager mShadowUserManager;
private SystemUpdatePreferenceController mController;
private Preference mPreference;
@@ -69,6 +66,9 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
+ UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+ mShadowUserManager = Shadows.shadowOf(userManager);
+
ShadowApplication.getInstance().setSystemService(Context.SYSTEM_UPDATE_SERVICE,
mSystemUpdateManager);
mController = new SystemUpdatePreferenceController(mContext);
@@ -77,10 +77,15 @@
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
+ @After
+ public void cleanUp() {
+ mShadowUserManager.setIsAdminUser(false);
+ }
+
@Test
public void updateNonIndexable_ifAvailable_shouldNotUpdate() {
final List<String> keys = new ArrayList<>();
- ShadowUserManager.getShadow().setIsAdminUser(true);
+ mShadowUserManager.setIsAdminUser(true);
mController.updateNonIndexableKeys(keys);
@@ -89,7 +94,7 @@
@Test
public void updateNonIndexable_ifNotAvailable_shouldUpdate() {
- ShadowUserManager.getShadow().setIsAdminUser(false);
+ mShadowUserManager.setIsAdminUser(false);
final List<String> keys = new ArrayList<>();
mController.updateNonIndexableKeys(keys);
@@ -99,7 +104,7 @@
@Test
public void displayPrefs_ifVisible_butNotAdminUser_shouldNotDisplay() {
- ShadowUserManager.getShadow().setIsAdminUser(false);
+ mShadowUserManager.setIsAdminUser(false);
mController.displayPreference(mScreen);
assertThat(mPreference.isVisible()).isFalse();
@@ -108,7 +113,7 @@
@Test
@Config(qualifiers = "mcc999")
public void displayPrefs_ifAdminUser_butNotVisible_shouldNotDisplay() {
- ShadowUserManager.getShadow().setIsAdminUser(true);
+ mShadowUserManager.setIsAdminUser(true);
mController.displayPreference(mScreen);
assertThat(mPreference.isVisible()).isFalse();
@@ -116,7 +121,7 @@
@Test
public void displayPrefs_ifAvailable_shouldDisplay() {
- ShadowUserManager.getShadow().setIsAdminUser(true);
+ mShadowUserManager.setIsAdminUser(true);
mController.displayPreference(mScreen);
@@ -131,8 +136,8 @@
mController.updateState(mPreference);
- assertThat(mPreference.getSummary()).isEqualTo(
- mContext.getString(R.string.android_version_summary, Build.VERSION.RELEASE));
+ assertThat(mPreference.getSummary())
+ .isEqualTo(mContext.getString(R.string.android_version_summary, Build.VERSION.RELEASE));
}
@Test
@@ -146,8 +151,8 @@
mController.updateState(mPreference);
- assertThat(mPreference.getSummary()).isEqualTo(
- mContext.getString(R.string.android_version_summary, testReleaseName));
+ assertThat(mPreference.getSummary())
+ .isEqualTo(mContext.getString(R.string.android_version_summary, testReleaseName));
}
@Test
@@ -158,7 +163,7 @@
mController.updateState(mPreference);
- assertThat(mPreference.getSummary()).isEqualTo(
- mContext.getString(R.string.android_version_pending_update_summary));
+ assertThat(mPreference.getSummary())
+ .isEqualTo(mContext.getString(R.string.android_version_pending_update_summary));
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index b0cd484..768e6ea 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -45,7 +45,7 @@
* Shadow Resources and Theme classes to handle resource references that Robolectric shadows cannot
* handle because they are too new or private.
*/
-@Implements(Resources.class)
+@Implements(value = Resources.class, inheritImplementationMethods = true)
public class SettingsShadowResources extends ShadowResources {
@RealObject
@@ -177,7 +177,7 @@
ClassParameter.from(int.class, id));
}
- @Implements(Theme.class)
+ @Implements(value = Theme.class, inheritImplementationMethods = true)
public static class SettingsShadowTheme extends ShadowTheme {
@RealObject
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
index 42b02f3..361b7b3 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
@@ -30,6 +30,7 @@
@Implements(
value = ResourcesImpl.class,
+ inheritImplementationMethods = true,
isInAndroidSdk = false,
minSdk = 26
)
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowSystemProperties.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowSystemProperties.java
deleted file mode 100644
index 45eb432..0000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowSystemProperties.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.os.SystemProperties;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowSystemProperties;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class provides write capability to ShadowSystemProperties.
- */
-@Implements(SystemProperties.class)
-public class SettingsShadowSystemProperties extends ShadowSystemProperties {
-
- private static final Map<String, String> sValues = new HashMap<>();
-
- @Implementation
- public static synchronized boolean getBoolean(String key, boolean def) {
- if (sValues.containsKey(key)) {
- String val = sValues.get(key);
- return "y".equals(val) || "yes".equals(val) || "1".equals(val) || "true".equals(val)
- || "on".equals(val);
- }
- return ShadowSystemProperties.getBoolean(key, def);
- }
-
- @Implementation
- public static synchronized String get(String key) {
- if (sValues.containsKey(key)) {
- return sValues.get(key);
- }
- return ShadowSystemProperties.get(key);
- }
-
- public static synchronized void set(String key, String val) {
- sValues.put(key, val);
- }
-
- @Implementation
- public static String get(String key, String def) {
- String value = sValues.get(key);
- return value == null ? def : value;
- }
-
- public static synchronized void clear() {
- sValues.clear();
- }
-
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
index fc19b44..62a4e72 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
@@ -22,7 +22,7 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-@Implements(ConnectivityManager.class)
+@Implements(value = ConnectivityManager.class, inheritImplementationMethods = true)
public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowConnectivityManager {
private final SparseBooleanArray mSupportedNetworkTypes = new SparseBooleanArray();
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
index 2e346a2..50c0330 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
@@ -26,6 +26,7 @@
import android.provider.SearchIndexablesContract;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java
deleted file mode 100644
index 3bc807a..0000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManager.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.testutils.shadow;
-
-import android.os.PowerManager;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-@Implements(PowerManager.class)
-public class ShadowPowerManager extends org.robolectric.shadows.ShadowPowerManager {
- @Implementation
- public boolean setPowerSaveMode(boolean mode) {
- setIsPowerSaveMode(mode);
- return true;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
index 8b2a27b..c3cdb69 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
@@ -18,13 +18,16 @@
import android.content.ContentResolver;
import android.provider.Settings;
+
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table;
-import java.util.Map;
-import java.util.WeakHashMap;
+
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
+import java.util.Map;
+import java.util.WeakHashMap;
+
@Implements(Settings.Secure.class)
public class ShadowSecureSettings {
@@ -33,7 +36,7 @@
@Implementation
public static boolean putStringForUser(ContentResolver resolver, String name, String value,
- int userHandle) {
+ String tag, boolean makeDefault, int userHandle) {
final Table<Integer, String, Object> userTable = getUserTable(resolver);
synchronized (userTable) {
if (value != null) {
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
index 2df2b04..dfd4b7f 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
@@ -36,29 +36,18 @@
import java.util.List;
import java.util.Map;
-@Implements(UserManager.class)
+@Implements(value = UserManager.class, inheritImplementationMethods = true)
public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager {
private SparseArray<UserInfo> mUserInfos = new SparseArray<>();
- private boolean mAdminUser;
private final List<String> mRestrictions = new ArrayList<>();
private final Map<String, List<EnforcingUser>> mRestrictionSources = new HashMap<>();
-
- public void setIsAdminUser(boolean isAdminUser) {
- mAdminUser = isAdminUser;
- }
-
@Resetter
public void reset() {
mRestrictions.clear();
}
- @Implementation
- public boolean isAdminUser() {
- return mAdminUser;
- }
-
public void setUserInfo(int userHandle, UserInfo userInfo) {
mUserInfos.put(userHandle, userInfo);
}
@@ -79,11 +68,6 @@
}
@Implementation
- public static UserManager get(Context context) {
- return (UserManager) context.getSystemService(Context.USER_SERVICE);
- }
-
- @Implementation
public boolean hasBaseUserRestriction(String restrictionKey, UserHandle userHandle) {
return mRestrictions.contains(restrictionKey);
}
diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
index 3882d92..46ee27e 100644
--- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
@@ -29,7 +29,6 @@
import android.provider.Settings.Global;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -39,11 +38,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AddUserWhenLockedPreferenceControllerTest {
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -123,5 +120,4 @@
assertThat(Global.getInt(mContext.getContentResolver(), Global.ADD_USERS_WHEN_LOCKED, 0))
.isEqualTo(0);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java
index 680f080..03ea115 100644
--- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java
@@ -29,7 +29,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,14 +36,13 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AutoSyncDataPreferenceControllerTest {
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -85,7 +83,7 @@
@Test
public void displayPref_linkedUser_shouldDisplay() {
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(true);
+ when(mUserManager.isRestrictedProfile()).thenReturn(true);
mController.displayPreference(mScreen);
@@ -97,7 +95,7 @@
List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
mController.displayPreference(mScreen);
@@ -111,7 +109,7 @@
infos.add(new UserInfo(1, "user 1", 0));
infos.add(new UserInfo(2, "user 2", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
mController.displayPreference(mScreen);
@@ -121,8 +119,7 @@
@Test
public void autoSyncData_shouldNotBeSetOnCancel() {
- final ShadowApplication application = ShadowApplication.getInstance();
- final Context context = application.getApplicationContext();
+ final Context context = RuntimeEnvironment.application;
final SwitchPreference preference = new SwitchPreference(context);
preference.setChecked(false);
mController = new AutoSyncDataPreferenceController(context, mFragment);
diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java
index 50b4ec3..d15eae5 100644
--- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java
@@ -27,7 +27,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,14 +34,12 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AutoSyncPersonalDataPreferenceControllerTest {
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -80,7 +77,7 @@
@Test
public void displayPref_linkedUser_shouldNotDisplay() {
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(true);
+ when(mUserManager.isRestrictedProfile()).thenReturn(true);
mController.displayPreference(mScreen);
@@ -92,7 +89,7 @@
List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
mController.displayPreference(mScreen);
@@ -106,12 +103,11 @@
infos.add(new UserInfo(1, "user 1", 0));
infos.add(new UserInfo(2, "user 2", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
mController.displayPreference(mScreen);
assertThat(mPreference.isVisible()).isTrue();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java
index 22dae37..176d1b0 100644
--- a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.users;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.eq;
@@ -28,7 +27,6 @@
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,16 +34,14 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AutoSyncWorkDataPreferenceControllerTest {
- private static int MANAGED_PROFILE_ID = 10;
+ private static final int MANAGED_PROFILE_ID = 10;
@Mock(answer = RETURNS_DEEP_STUBS)
private UserManager mUserManager;
@@ -74,7 +70,7 @@
@Test
public void checkIsAvailable_linkedUser_shouldNotDisplay() {
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(true);
+ when(mUserManager.isRestrictedProfile()).thenReturn(true);
assertThat(mController.isAvailable()).isFalse();
}
@@ -82,7 +78,7 @@
@Test
public void checkIsAvailable_singleUserProfile_shouldNotDisplay() {
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(UserHandle.USER_SYSTEM, "user 1", 0 /* flags */));
@@ -94,7 +90,7 @@
@Test
public void checkIsAvailable_null_workProfileUserHandle_shouldNotDisplay() {
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(UserHandle.USER_SYSTEM, "user 1", 0 /* flags */));
@@ -109,7 +105,7 @@
@Test
public void multipleProfile_shouldInitWithWorkProfileUserHandle() {
when(mUserManager.isManagedProfile()).thenReturn(false);
- when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.isRestrictedProfile()).thenReturn(false);
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(UserHandle.USER_SYSTEM, "user 1", 0 /* flags */));
diff --git a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java
index 4228ca0..d85f2fa 100644
--- a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java
@@ -17,13 +17,11 @@
package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -31,10 +29,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UserCapabilitiesTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
index e1bc157..2eeecaa 100644
--- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
@@ -16,31 +16,29 @@
package com.android.settings.users;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import java.util.Arrays;
import java.util.List;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UserFeatureProviderImplTest {
- public static final int FIRST_USER_ID = 0;
- public static final int SECOND_USER_ID = 4;
+
+ private static final int FIRST_USER_ID = 0;
+ private static final int SECOND_USER_ID = 4;
@Mock
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
index 5b31a82..ef8fae6 100644
--- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
@@ -25,7 +25,6 @@
import android.view.View;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.RestrictedPreferenceHelper;
import org.junit.Before;
@@ -34,11 +33,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UserPreferenceTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 56f3949..a7fe916 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -27,7 +27,6 @@
import android.os.UserManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,14 +36,14 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UserSettingsTest {
- @Mock private UserManager mUserManager;
- @Mock private SummaryLoader mSummaryLoader;
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private SummaryLoader mSummaryLoader;
private Activity mActivity;
private SummaryLoader.SummaryProvider mSummaryProvider;
@@ -54,8 +53,8 @@
mActivity = spy(Robolectric.buildActivity(Activity.class).get());
when((Object) mActivity.getSystemService(UserManager.class)).thenReturn(mUserManager);
- mSummaryProvider = UserSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
- mActivity, mSummaryLoader);
+ mSummaryProvider =
+ UserSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, mSummaryLoader);
}
@Test
@@ -67,8 +66,8 @@
mSummaryProvider.setListening(true);
- verify(mSummaryLoader).setSummary(mSummaryProvider,
- mActivity.getString(R.string.users_summary, name));
+ verify(mSummaryLoader)
+ .setSummary(mSummaryProvider, mActivity.getString(R.string.users_summary, name));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
index 690c292..23938a5 100644
--- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
+++ b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
@@ -16,40 +16,27 @@
package com.android.settings.utils;
+import static com.google.common.truth.Truth.assertThat;
+
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LocalClassLoaderContextThemeWrapperTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mBaseContext;
private LocalClassLoaderContextThemeWrapper mContextThemeWrapper;
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- }
-
@Test
public void getClassLoader_shouldUseLocalClassLoader() {
- mContextThemeWrapper = new LocalClassLoaderContextThemeWrapper(
- LocalClassLoaderContextThemeWrapperTest.class, mBaseContext, 0);
+ final Context context = RuntimeEnvironment.application;
+ final Class clazz = LocalClassLoaderContextThemeWrapperTest.class;
+ mContextThemeWrapper = new LocalClassLoaderContextThemeWrapper(clazz, context, 0);
- assertThat(mContextThemeWrapper.getClassLoader()).isSameAs(
- LocalClassLoaderContextThemeWrapperTest.class.getClassLoader());
+ assertThat(mContextThemeWrapper.getClassLoader()).isSameAs(clazz.getClassLoader());
}
}
diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
index 4b4f3fb..f57402a 100644
--- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
@@ -23,17 +23,14 @@
import android.content.pm.PackageInfo;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppDialogFragmentTest {
@Mock
@@ -49,16 +46,16 @@
@Test
public void notManagingOrConnected_shouldNotShow() {
- AppDialogFragment.show(mParent, mPackageInfo, "label", false /* manage */,
- false /* connected */);
+ AppDialogFragment
+ .show(mParent, mPackageInfo, "label", false /* manage */, false /* connected */);
verify(mParent, never()).isAdded();
}
@Test
public void notManagingAndConnected_showShow() {
- AppDialogFragment.show(mParent, mPackageInfo, "label", false /* manage */,
- true /* connected */);
+ AppDialogFragment
+ .show(mParent, mPackageInfo, "label", false /* manage */, true /* connected */);
verify(mParent).isAdded();
}
diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
index 9442892..f354c43 100644
--- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
@@ -16,23 +16,17 @@
package com.android.settings.vpn2;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-/**
- * Tests for {@link VpnUtils}.
- */
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class VpnUtilsTest {
@Test
public void testIsAlwaysOnVpnSet() {
diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
index daaf4b3..6ebbef3 100644
--- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
@@ -17,7 +17,6 @@
package com.android.settings.wallpaper;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
@@ -27,7 +26,6 @@
import android.content.res.Resources;
import com.android.settings.SubSettings;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.WallpaperManagerWrapper;
@@ -37,21 +35,20 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowPackageManager;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WallpaperSuggestionActivityTest {
@Mock
private Context mContext;
@Mock
- private PackageManager mPackageManager;
- @Mock
private Resources mResources;
private ActivityController<WallpaperSuggestionActivity> mController;
@@ -59,12 +56,15 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- when(mContext.getPackageManager()).thenReturn(mPackageManager);
mController = Robolectric.buildActivity(WallpaperSuggestionActivity.class);
}
@Test
public void launch_primarySuggestionActivityDoesNotExist_shouldFallback() {
+ ShadowPackageManager packageManager =
+ shadowOf(RuntimeEnvironment.application.getPackageManager());
+ packageManager.removePackage("com.android.settings");
+
ShadowActivity activity = shadowOf(mController.setup().get());
final Intent intent = activity.getNextStartedActivity();
@@ -76,11 +76,10 @@
@Test
public void wallpaperServiceEnabled_no_shouldReturnFalse() {
when(mContext.getResources()).thenReturn(mResources);
- when(mResources.getBoolean(
- com.android.internal.R.bool.config_enableWallpaperService)).thenReturn(false);
+ when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))
+ .thenReturn(false);
- assertThat(WallpaperSuggestionActivity.isSuggestionComplete(mContext))
- .isFalse();
+ assertThat(WallpaperSuggestionActivity.isSuggestionComplete(mContext)).isFalse();
}
@Test
@@ -88,8 +87,7 @@
public void hasWallpaperSet_no_shouldReturnFalse() {
ShadowWallpaperManagerWrapper.setWallpaperId(0);
- assertThat(WallpaperSuggestionActivity.isSuggestionComplete(mContext))
- .isFalse();
+ assertThat(WallpaperSuggestionActivity.isSuggestionComplete(mContext)).isFalse();
}
@Test
@@ -97,8 +95,7 @@
public void hasWallpaperSet_yes_shouldReturnTrue() {
ShadowWallpaperManagerWrapper.setWallpaperId(100);
- assertThat(WallpaperSuggestionActivity.isSuggestionComplete(mContext))
- .isTrue();
+ assertThat(WallpaperSuggestionActivity.isSuggestionComplete(mContext)).isTrue();
}
@Implements(WallpaperManagerWrapper.class)
@@ -106,7 +103,7 @@
private static int sWallpaperId;
- public static void setWallpaperId(int id) {
+ private static void setWallpaperId(int id) {
sWallpaperId = id;
}
@@ -115,7 +112,6 @@
}
public void __constructor__(Context context) {
-
}
@Implementation
diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java
index 0c6a9f8..a39ad9f 100644
--- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java
@@ -1,7 +1,6 @@
package com.android.settings.wallpaper;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -13,7 +12,6 @@
import android.content.Intent;
import android.support.v7.preference.Preference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -21,10 +19,8 @@
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WallpaperTypeSettingsTest {
private Preference mPreference;
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index a381075..7ed8756 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -17,9 +17,7 @@
package com.android.settings.webview;
import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
-
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.eq;
@@ -42,7 +40,6 @@
import android.content.pm.UserInfo;
import android.os.UserManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settings.wrapper.UserPackageWrapper;
@@ -57,21 +54,21 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.Arrays;
+import java.util.Collections;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WebViewAppPickerTest {
+
+ private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
+
private Context mContext;
private UserInfo mFirstUser;
private UserInfo mSecondUser;
- private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
-
@Mock
private Activity mActivity;
@Mock
@@ -137,8 +134,8 @@
}
private void testSuccessfulClickChangesProvider() {
- when(mWvusWrapper.getValidWebViewApplicationInfos(any())).thenReturn(
- Arrays.asList(createApplicationInfo(DEFAULT_PACKAGE_NAME)));
+ when(mWvusWrapper.getValidWebViewApplicationInfos(any()))
+ .thenReturn(Collections.singletonList(createApplicationInfo(DEFAULT_PACKAGE_NAME)));
when(mWvusWrapper.setWebViewProvider(eq(DEFAULT_PACKAGE_NAME))).thenReturn(true);
RadioButtonPreference defaultPackagePref = mock(RadioButtonPreference.class);
@@ -151,8 +148,8 @@
}
private void testFailingClickUpdatesSetting() {
- when(mWvusWrapper.getValidWebViewApplicationInfos(any())).thenReturn(
- Arrays.asList(createApplicationInfo(DEFAULT_PACKAGE_NAME)));
+ when(mWvusWrapper.getValidWebViewApplicationInfos(any()))
+ .thenReturn(Collections.singletonList(createApplicationInfo(DEFAULT_PACKAGE_NAME)));
when(mWvusWrapper.setWebViewProvider(eq(DEFAULT_PACKAGE_NAME))).thenReturn(false);
RadioButtonPreference defaultPackagePref = mock(RadioButtonPreference.class);
@@ -168,17 +165,14 @@
@Test
public void testDisabledPackageShownAsDisabled() {
- String disabledReason = "disabled";
DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
- createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
+ createApplicationInfo(DEFAULT_PACKAGE_NAME), "disabled");
- RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
- mPicker.bindPreference(mockPreference,
- DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
- mPicker.bindPreferenceExtra(mockPreference,
- DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
- verify(mockPreference, times(1)).setEnabled(eq(false));
- verify(mockPreference, never()).setEnabled(eq(true));
+ RadioButtonPreference preference = mock(RadioButtonPreference.class);
+ mPicker.bindPreference(preference, DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
+ mPicker.bindPreferenceExtra(preference, DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
+ verify(preference, times(1)).setEnabled(eq(false));
+ verify(preference, never()).setEnabled(eq(true));
}
@Test
@@ -187,13 +181,11 @@
DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
- RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
- mPicker.bindPreference(mockPreference,
- DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
- mPicker.bindPreferenceExtra(mockPreference,
- DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
- verify(mockPreference, times(1)).setEnabled(eq(true));
- verify(mockPreference, never()).setEnabled(eq(false));
+ RadioButtonPreference preference = mock(RadioButtonPreference.class);
+ mPicker.bindPreference(preference, DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
+ mPicker.bindPreferenceExtra(preference, DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
+ verify(preference, times(1)).setEnabled(eq(true));
+ verify(preference, never()).setEnabled(eq(false));
}
@Test
@@ -202,28 +194,23 @@
DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
- RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
- mPicker.bindPreference(mockPreference,
- DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
- mPicker.bindPreferenceExtra(mockPreference,
- DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
- verify(mockPreference, times(1)).setSummary(eq(disabledReason));
+ RadioButtonPreference preference = mock(RadioButtonPreference.class);
+ mPicker.bindPreference(preference, DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
+ mPicker.bindPreferenceExtra(preference, DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
+ verify(preference, times(1)).setSummary(eq(disabledReason));
// Ensure we haven't called setSummary several times.
- verify(mockPreference, times(1)).setSummary(any());
+ verify(preference, times(1)).setSummary(any());
}
@Test
public void testEnabledPackageShowsEmptySummary() {
- String disabledReason = null;
DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
- createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
+ createApplicationInfo(DEFAULT_PACKAGE_NAME), null);
- RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
- mPicker.bindPreference(mockPreference,
- DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
- mPicker.bindPreferenceExtra(mockPreference,
- DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
- verify(mockPreference, never()).setSummary(any());
+ RadioButtonPreference preference = mock(RadioButtonPreference.class);
+ mPicker.bindPreference(preference, DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
+ mPicker.bindPreferenceExtra(preference, DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
+ verify(preference, never()).setSummary(any());
}
@Test
@@ -251,9 +238,8 @@
when(packageForSecondUser.isInstalledPackage()).thenReturn(true);
WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
- when(wvusWrapper.getPackageInfosAllUsers(
- any(), eq(DEFAULT_PACKAGE_NAME))).thenReturn(
- Arrays.asList(packageForFirstUser, packageForSecondUser));
+ when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
+ .thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
assertThat(mPicker.getDisabledReason(wvusWrapper, mContext, DEFAULT_PACKAGE_NAME)).isNull();
}
@@ -267,12 +253,11 @@
WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
- .thenReturn(Arrays.asList(packageForFirstUser));
+ .thenReturn(Collections.singletonList(packageForFirstUser));
- final String EXPECTED_DISABLED_REASON = String.format(
- "(disabled for user %s)", mFirstUser.name);
- assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
- DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
+ final String expectedReason = String.format("(disabled for user %s)", mFirstUser.name);
+ assertThat(mPicker.getDisabledReason(wvusWrapper, mContext, DEFAULT_PACKAGE_NAME))
+ .isEqualTo(expectedReason);
}
@Test
@@ -284,12 +269,11 @@
WebViewUpdateServiceWrapper wvusWrapper = mock(WebViewUpdateServiceWrapper.class);
when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
- .thenReturn(Arrays.asList(packageForFirstUser));
+ .thenReturn(Collections.singletonList(packageForFirstUser));
- final String EXPECTED_DISABLED_REASON = String.format(
- "(uninstalled for user %s)", mFirstUser.name);
- assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
- DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
+ final String expectedReason = String.format("(uninstalled for user %s)", mFirstUser.name);
+ assertThat(mPicker.getDisabledReason(wvusWrapper, mContext, DEFAULT_PACKAGE_NAME))
+ .isEqualTo(expectedReason);
}
@Test
@@ -308,10 +292,9 @@
when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
.thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
- final String EXPECTED_DISABLED_REASON = String.format(
- "(disabled for user %s)", mFirstUser.name);
- assertThat(mPicker.getDisabledReason(
- wvusWrapper, mContext, DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
+ final String expectedReason = String.format("(disabled for user %s)", mFirstUser.name);
+ assertThat(mPicker.getDisabledReason(wvusWrapper, mContext, DEFAULT_PACKAGE_NAME))
+ .isEqualTo(expectedReason);
}
/**
@@ -334,10 +317,9 @@
when(wvusWrapper.getPackageInfosAllUsers(any(), eq(DEFAULT_PACKAGE_NAME)))
.thenReturn(Arrays.asList(packageForFirstUser, packageForSecondUser));
- final String EXPECTED_DISABLED_REASON = String.format(
- "(uninstalled for user %s)", mFirstUser.name);
- assertThat(mPicker.getDisabledReason(wvusWrapper, mContext,
- DEFAULT_PACKAGE_NAME)).isEqualTo(EXPECTED_DISABLED_REASON);
+ final String expectedReason = String.format("(uninstalled for user %s)", mFirstUser.name);
+ assertThat(mPicker.getDisabledReason(wvusWrapper, mContext, DEFAULT_PACKAGE_NAME))
+ .isEqualTo(expectedReason);
}
/**
@@ -359,10 +341,9 @@
when(mPackageManager.getPackageManager()).thenReturn(pm);
RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
- mPicker.bindPreference(mockPreference,
- DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
- mPicker.bindPreferenceExtra(mockPreference,
- DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
+ mPicker.bindPreference(mockPreference, DEFAULT_PACKAGE_NAME, webviewAppInfo, null);
+ mPicker
+ .bindPreferenceExtra(mockPreference, DEFAULT_PACKAGE_NAME, webviewAppInfo, null, null);
verify(mockPreference, times(1)).setTitle(eq("myPackage myVersionName"));
verify(mockPreference, times(1)).setTitle(any());
}
diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
index fc634d2..a387d78 100644
--- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
@@ -30,7 +30,6 @@
import android.net.wifi.p2p.WifiP2pManager;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,10 +38,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiDisplaySettingsTest {
@Mock
@@ -59,13 +56,12 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- when(mActivity.getSystemService(Context.MEDIA_ROUTER_SERVICE))
- .thenReturn(mMediaRouter);
+ when(mActivity.getSystemService(Context.MEDIA_ROUTER_SERVICE)).thenReturn(mMediaRouter);
when(mActivity.getPackageManager()).thenReturn(mPackageManager);
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)).thenReturn(true);
- mSummaryProvider = WifiDisplaySettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
- mActivity, mSummaryLoader);
+ mSummaryProvider = WifiDisplaySettings.SUMMARY_PROVIDER_FACTORY
+ .createSummaryProvider(mActivity, mSummaryLoader);
}
@Test
@@ -92,28 +88,24 @@
@Test
public void isAvailable_nullService_shouldReturnFalse() {
- assertThat(WifiDisplaySettings.isAvailable(mActivity))
- .isFalse();
+ assertThat(WifiDisplaySettings.isAvailable(mActivity)).isFalse();
}
@Test
public void isAvailable_noWifiDirectFeature_shouldReturnFalse() {
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT))
- .thenReturn(false);
+ .thenReturn(false);
- assertThat(WifiDisplaySettings.isAvailable(mActivity))
- .isFalse();
+ assertThat(WifiDisplaySettings.isAvailable(mActivity)).isFalse();
}
@Test
public void isAvailable_hasService_shouldReturnTrue() {
when(mActivity.getSystemService(Context.DISPLAY_SERVICE))
- .thenReturn(mock(DisplayManager.class));
+ .thenReturn(mock(DisplayManager.class));
when(mActivity.getSystemService(Context.WIFI_P2P_SERVICE))
- .thenReturn(mock(WifiP2pManager.class));
+ .thenReturn(mock(WifiP2pManager.class));
- assertThat(WifiDisplaySettings.isAvailable(mActivity))
- .isTrue();
+ assertThat(WifiDisplaySettings.isAvailable(mActivity)).isTrue();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
index d53af9d..f964224 100644
--- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
@@ -16,12 +16,9 @@
package com.android.settings.widget;
-
import static android.arch.lifecycle.Lifecycle.Event.ON_START;
import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -33,7 +30,6 @@
import android.support.v7.widget.RecyclerView;
import android.view.View;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,10 +39,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ActionBarShadowControllerTest {
@Mock
@@ -116,5 +110,4 @@
controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
// no crash
}
-
}
diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java
index a080bc6..78493bf 100644
--- a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java
@@ -16,7 +16,6 @@
package com.android.settings.widget;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
@@ -30,17 +29,14 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ActionButtonPreferenceTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java
index d540a62..af867e6 100644
--- a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java
@@ -21,17 +21,14 @@
import android.content.Context;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppCheckBoxPreferenceTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
index 6556f1c..33f2b82 100644
--- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
@@ -23,21 +23,16 @@
import android.view.View;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppPreferenceTest {
- private static final int EXPECTED_APP_ICON_SIZE_DP = 32;
-
private Context mContext;
private View mRootView;
private AppPreference mPref;
@@ -80,9 +75,7 @@
@Test
public void foobar_testName() {
- // Can't use isEquals() to compare float. Use isWithIn().of() instead.
- assertThat(mContext.getResources().getDimension(R.dimen.secondary_app_icon_size))
- .isWithin(0.01f)
- .of(EXPECTED_APP_ICON_SIZE_DP);
+ float iconSize = mContext.getResources().getDimension(R.dimen.secondary_app_icon_size);
+ assertThat(Float.floatToIntBits(iconSize)).isEqualTo(Float.floatToIntBits(32));
}
}
diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java
index a7c8d7c..de58307 100644
--- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java
@@ -23,17 +23,14 @@
import android.view.View;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppSwitchPreferenceTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java b/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java
index dd6138c..bb55692 100644
--- a/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java
+++ b/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java
@@ -21,18 +21,15 @@
import android.content.Context;
import android.view.View;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AspectRatioFrameLayoutTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
index 7fcf328..480b53d 100644
--- a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
@@ -16,20 +16,17 @@
package com.android.settings.widget;
+import static junit.framework.Assert.assertEquals;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertEquals;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultIndicatorSeekBarTest {
private DefaultIndicatorSeekBar mDefaultIndicatorSeekBar;
@@ -50,5 +47,4 @@
mDefaultIndicatorSeekBar.setDefaultProgress(40);
assertEquals(40, mDefaultIndicatorSeekBar.getDefaultProgress());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index 7b47f97..0d294d5 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -43,7 +43,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -55,10 +54,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EntityHeaderControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -115,8 +112,8 @@
@Test
public void bindViews_shouldBindAllData() {
final String testString = "test";
- final View header = mLayoutInflater.inflate(
- R.layout.settings_entity_header, null /* root */);
+ final View header =
+ mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
final TextView label = header.findViewById(R.id.entity_header_title);
final TextView version = header.findViewById(R.id.entity_header_summary);
@@ -126,7 +123,9 @@
mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
mController.done(mActivity);
+ assertThat(label).isNotNull();
assertThat(label.getText()).isEqualTo(testString);
+ assertThat(version).isNotNull();
assertThat(version.getText()).isEqualTo(testString);
}
@@ -136,8 +135,8 @@
info.activityInfo = new ActivityInfo();
info.activityInfo.packageName = "123";
info.activityInfo.name = "321";
- final View appLinks = mLayoutInflater
- .inflate(R.layout.settings_entity_header, null /* root */);
+ final View appLinks =
+ mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
when(mActivity.getApplicationContext()).thenReturn(mContext);
when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
.thenReturn(info);
@@ -149,6 +148,7 @@
mController.done(mActivity);
final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
+ assertThat(button1).isNotNull();
assertThat(button1.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(button1.getDrawable()).isNotNull();
assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
@@ -186,10 +186,10 @@
mController.done(mActivity);
final ImageButton button1 = view.findViewById(android.R.id.button1);
+ assertThat(button1).isNotNull();
assertThat(button1.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(button1.getDrawable()).isNotNull();
- assertThat(view.findViewById(android.R.id.button2).getVisibility())
- .isEqualTo(View.GONE);
+ assertThat(view.findViewById(android.R.id.button2).getVisibility()).isEqualTo(View.GONE);
}
@Test
@@ -198,8 +198,7 @@
info.activityInfo = new ActivityInfo();
info.activityInfo.packageName = "123";
info.activityInfo.name = "321";
- final View view = mLayoutInflater
- .inflate(R.layout.settings_entity_header, null /* root */);
+ final View view = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
when(mActivity.getApplicationContext()).thenReturn(mContext);
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
@@ -208,19 +207,17 @@
EntityHeaderController.ActionType.ACTION_NONE);
mController.done(mActivity);
- assertThat(view.findViewById(android.R.id.button1).getVisibility())
- .isEqualTo(View.GONE);
- assertThat(view.findViewById(android.R.id.button2).getVisibility())
- .isEqualTo(View.GONE);
+ assertThat(view.findViewById(android.R.id.button1).getVisibility()).isEqualTo(View.GONE);
+ assertThat(view.findViewById(android.R.id.button2).getVisibility()).isEqualTo(View.GONE);
}
@Test
public void bindButton_noAppPref_shouldNotShowButton() {
- final View appLinks = mLayoutInflater
- .inflate(R.layout.settings_entity_header, null /* root */);
+ final View appLinks =
+ mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
- .thenReturn(null);
+ .thenReturn(null);
mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
mController.setButtonActions(
@@ -229,6 +226,7 @@
mController.done(mActivity);
final ImageButton button1 = appLinks.findViewById(android.R.id.button1);
+ assertThat(button1).isNotNull();
assertThat(button1.getVisibility()).isEqualTo(View.GONE);
assertThat(button1.getDrawable()).isNull();
assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
@@ -237,8 +235,8 @@
@Test
public void bindButton_noAppInfo_shouldNotAttachClickListener() {
- final View appLinks = mLayoutInflater
- .inflate(R.layout.settings_entity_header, null /* root */);
+ final View appLinks =
+ mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
final Activity activity = mock(Activity.class);
when(mFragment.getActivity()).thenReturn(activity);
@@ -262,8 +260,8 @@
@Test
public void bindButton_hasAppInfo_shouldAttachClickListener() {
- final View appLinks = mLayoutInflater
- .inflate(R.layout.settings_entity_header, null /* root */);
+ final View appLinks =
+ mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
final Activity activity = mock(Activity.class);
when(mFragment.getActivity()).thenReturn(activity);
when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
@@ -278,14 +276,14 @@
mController.done(mActivity);
appLinks.findViewById(R.id.entity_header_content).performClick();
- verify(activity).startActivityForResultAsUser(
- any(Intent.class), anyInt(), any(UserHandle.class));
+ verify(activity)
+ .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
}
@Test
public void iconContentDescription_shouldWorkWithSetIcon() {
- final View view = mLayoutInflater
- .inflate(R.layout.settings_entity_header, null /* root */);
+ final View view =
+ mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
when(mFragment.getActivity()).thenReturn(mock(Activity.class));
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
String description = "Fake Description";
diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
index 0d9a77b..94188d8 100644
--- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
@@ -15,6 +15,10 @@
*/
package com.android.settings.widget;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.support.v7.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
@@ -23,7 +27,6 @@
import android.widget.TextView;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -31,14 +34,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FixedLineSummaryPreferenceTest {
@Mock
@@ -55,8 +52,8 @@
mContext = RuntimeEnvironment.application;
mPreference = new FixedLineSummaryPreference(mContext, null);
LayoutInflater inflater = LayoutInflater.from(mContext);
- final View view = inflater.inflate(mPreference.getLayoutResource(),
- new LinearLayout(mContext), false);
+ final View view =
+ inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext), false);
mHolder = spy(PreferenceViewHolder.createInstanceForTests(view));
when(mHolder.findViewById(android.R.id.summary)).thenReturn(mSummary);
}
diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
index 8869c30..668907f 100644
--- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
@@ -16,7 +16,6 @@
package com.android.settings.widget;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
@@ -39,7 +38,6 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -48,11 +46,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HighlightablePreferenceGroupAdapterTest {
private static final String TEST_KEY = "key";
@@ -207,5 +203,4 @@
assertThat(mViewHolder.itemView.getBackground()).isNotInstanceOf(ColorDrawable.class);
assertThat(mViewHolder.itemView.getTag(R.id.preference_highlighted)).isEqualTo(false);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java b/tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java
index dc14ae7..e2c82c2 100644
--- a/tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java
@@ -16,7 +16,6 @@
package com.android.settings.widget;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -24,7 +23,6 @@
import android.content.Context;
import android.graphics.Canvas;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,11 +30,9 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowCanvas;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LinearColorBarTest {
private static final int HEIGHT = 100;
diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
index 09b52c8..37d055e 100644
--- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
@@ -16,28 +16,25 @@
package com.android.settings.widget;
-import android.content.Context;
-import android.os.Handler;
-import android.view.View;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import android.content.Context;
+import android.os.Handler;
+import android.view.View;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LoadingViewControllerTest {
private Context mContext;
@@ -70,5 +67,4 @@
verify(handler).postDelayed(any(Runnable.class), anyLong());
}
-
}
diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
index 55ce27f..db40ee9 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
@@ -17,7 +17,6 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -26,21 +25,18 @@
import android.support.v7.preference.PreferenceViewHolder;
import android.view.LayoutInflater;
import android.view.View;
-import android.widget.LinearLayout;
import android.widget.CheckBox;
+import android.widget.LinearLayout;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MasterCheckBoxPreferenceTest {
private Context mContext;
@@ -129,6 +125,8 @@
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_two_target, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
+ assertThat(widgetView).isNotNull();
+
inflater.inflate(R.layout.preference_widget_master_checkbox, widgetView, true);
final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
mPreference.onBindViewHolder(holder);
@@ -146,6 +144,8 @@
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_two_target, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
+ assertThat(widgetView).isNotNull();
+
inflater.inflate(R.layout.preference_widget_master_checkbox, widgetView, true);
final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
mPreference.onBindViewHolder(holder);
diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
index 1c449cc..5456cac 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
@@ -16,6 +16,10 @@
package com.android.settings.widget;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
import android.content.Context;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceViewHolder;
@@ -26,21 +30,14 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class MasterSwitchPreferenceTest {
private Context mContext;
@@ -110,6 +107,8 @@
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_two_target, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
+ assertThat(widgetView).isNotNull();
+
inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true);
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
preference.onBindViewHolder(holder);
@@ -128,6 +127,8 @@
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
inflater.inflate(R.layout.preference_two_target, null));
final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
+ assertThat(widgetView).isNotNull();
+
inflater.inflate(R.layout.preference_widget_master_switch, widgetView, true);
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
preference.onBindViewHolder(holder);
diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
index 23aa378..7ae592c 100644
--- a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
@@ -22,7 +22,6 @@
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -30,13 +29,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PreferenceCategoryControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
index c8b3ef6..77ae382 100644
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
@@ -27,7 +27,6 @@
import android.os.UserManager;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -39,13 +38,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RadioButtonPickerFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
index a1a2f24..d14203d 100644
--- a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
@@ -16,22 +16,19 @@
package com.android.settings.widget;
+import static junit.framework.Assert.assertEquals;
+
import android.content.Context;
import android.view.View.MeasureSpec;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static junit.framework.Assert.assertEquals;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class RingProgressBarTest {
private Context mContext = RuntimeEnvironment.application;
diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
index 78afc43..ec128ca 100644
--- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
@@ -16,29 +16,24 @@
package com.android.settings.widget;
+import static com.google.common.truth.Truth.assertThat;
+
import android.os.Parcelable;
import android.support.v4.view.PagerAdapter;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.ShadowTextUtils;
-import java.util.Locale;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.RuntimeEnvironment;
-import static com.google.common.truth.Truth.assertThat;
+import java.util.Locale;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {ShadowTextUtils.class}
-)
public class RtlCompatibleViewPagerTest {
private Locale mLocaleEn;
@@ -47,8 +42,7 @@
@Before
public void setUp() {
- mViewPager = new RtlCompatibleViewPager(
- ShadowApplication.getInstance().getApplicationContext());
+ mViewPager = new RtlCompatibleViewPager(RuntimeEnvironment.application);
mViewPager.setAdapter(new ViewPagerAdapter());
mLocaleEn = new Locale("en");
mLocaleHe = new Locale("he");
diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
index 5755015..77e18ac 100644
--- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
@@ -17,7 +17,6 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.eq;
@@ -31,17 +30,14 @@
import android.widget.FrameLayout;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
-import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowView;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ScrollToParentEditTextTest {
private static final int EDIT_TEXT_SIZE = 20;
@@ -53,9 +49,8 @@
@Before
public void setUp() {
- mEditText = new ScrollToParentEditText(
- application,
- Robolectric.buildAttributeSet().build());
+ mEditText =
+ new ScrollToParentEditText(application, Robolectric.buildAttributeSet().build());
mEditText.layout(0, 0, EDIT_TEXT_SIZE, EDIT_TEXT_SIZE);
mParent = spy(new FrameLayout(application));
diff --git a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
index 7a042a0..8f7063c 100644
--- a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
@@ -21,18 +21,16 @@
import android.content.Context;
import android.os.Parcelable;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SeekBarPreferenceTest {
+
private static final int MAX = 75;
private static final int MIN = 5;
private static final int PROGRESS = 16;
diff --git a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
index 2f42550..d91b0f8 100644
--- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
@@ -16,10 +16,12 @@
package com.android.settings.widget;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -27,14 +29,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SummaryUpdaterTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
index 8eb19cd..bd99bbb 100644
--- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
@@ -24,7 +24,6 @@
import android.widget.TextView;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,10 +31,8 @@
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SwitchBarTest {
private static final int COLOR_BACKGROUND = 1;
diff --git a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceControllerTest.java
index a289815..d6df25d 100644
--- a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -27,7 +26,6 @@
import android.view.View;
import android.widget.Button;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,11 +34,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TwoStateButtonPreferenceControllerTest {
+
private static final String KEY = "pref_key";
@Mock
@@ -101,8 +98,8 @@
/**
* Controller to test methods in {@link TwoStateButtonPreferenceController}
*/
- public static class TestButtonsPreferenceController extends
- TwoStateButtonPreferenceController {
+ public static class TestButtonsPreferenceController
+ extends TwoStateButtonPreferenceController {
TestButtonsPreferenceController(Context context, String key) {
super(context, key);
diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
index 59be160..c7cae0f 100644
--- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
@@ -16,7 +16,6 @@
package com.android.settings.widget;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -30,7 +29,6 @@
import android.view.View;
import android.widget.EditText;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -39,10 +37,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ValidatedEditTextPreferenceTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java
index bd4c558..a5ecd94 100644
--- a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java
@@ -16,14 +16,8 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-
-import android.app.AppOpsManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -32,25 +26,19 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AppStateChangeWifiStateBridgeTest {
@Mock
private AppEntry mEntry;
@Mock
private AppStateChangeWifiStateBridge.WifiSettingsState mState;
- private Context mContext;
private AppFilter mFilter;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
-
- mContext = RuntimeEnvironment.application;
mFilter = AppStateChangeWifiStateBridge.FILTER_CHANGE_WIFI_STATE;
}
diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
index 415cd92..eb58452 100644
--- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
@@ -16,11 +16,12 @@
package com.android.settings.wifi;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
-import android.net.wifi.WifiManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -28,19 +29,12 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class CellularFallbackPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
- @Mock
- private WifiManager mWifiManager;
private CellularFallbackPreferenceController mController;
diff --git a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
index 4a8bbef..012a763 100644
--- a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
@@ -25,31 +25,25 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ChangeWifiStateDetailsTest {
+
private static final String PACKAGE_NAME = "app";
private FakeFeatureFactory mFeatureFactory;
private ChangeWifiStateDetails mFragment;
private Context mContext;
@Mock
- private AppEntry mAppEntry;
- @Mock
private AppStateChangeWifiStateBridge.WifiSettingsState mState;
@Before
@@ -80,14 +74,14 @@
@Test
public void testGetSummary_permissibleTrue_returnAllowed() {
when(mState.isPermissible()).thenReturn(true);
- assertThat(mFragment.getSummary(mContext, mState)).isEqualTo(
- mContext.getString(R.string.app_permission_summary_allowed));
+ assertThat(ChangeWifiStateDetails.getSummary(mContext, mState))
+ .isEqualTo(mContext.getString(R.string.app_permission_summary_allowed));
}
@Test
public void testGetSummary_permissibleFalse_returnNotAllowed() {
when(mState.isPermissible()).thenReturn(false);
- assertThat(mFragment.getSummary(mContext, mState)).isEqualTo(
- mContext.getString(R.string.app_permission_summary_not_allowed));
+ assertThat(ChangeWifiStateDetails.getSummary(mContext, mState))
+ .isEqualTo(mContext.getString(R.string.app_permission_summary_not_allowed));
}
}
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
index f32177c..a0befc0 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
@@ -1,7 +1,6 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -10,7 +9,7 @@
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
-import com.android.settings.TestConfig;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
@@ -23,7 +22,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ConfigureWifiSettingsTest {
private Context mContext;
@@ -35,8 +33,8 @@
@Test
public void testNonIndexableKeys_existInXmlLayout() {
- final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(mContext);
+ final List<String> niks =
+ ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
final int xmlId = new ConfigureWifiSettings().getPreferenceScreenResId();
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
@@ -47,11 +45,12 @@
@Test
@Config(qualifiers = "mcc999")
public void testNonIndexableKeys_ifPageDisabled_shouldNotIndexResource() {
- final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(mContext);
+ final List<String> niks =
+ ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
final int xmlId = new ConfigureWifiSettings().getPreferenceScreenResId();
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
+ assertThat(keys).isNotNull();
assertThat(niks).containsAllIn(keys);
}
@@ -61,8 +60,8 @@
when(manager.getActiveNetworkInfo()).thenReturn(null);
doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
- final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(mContext);
+ final List<String> niks =
+ ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
assertThat(niks).contains(ConfigureWifiSettings.KEY_IP_ADDRESS);
}
@@ -74,8 +73,8 @@
when(manager.getActiveNetworkInfo()).thenReturn(info);
doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
- final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(mContext);
+ final List<String> niks =
+ ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
assertThat(niks).contains(ConfigureWifiSettings.KEY_IP_ADDRESS);
}
@@ -87,8 +86,8 @@
when(manager.getActiveNetworkInfo()).thenReturn(info);
doReturn(manager).when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
- final List<String> niks = ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(mContext);
+ final List<String> niks =
+ ConfigureWifiSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
assertThat(niks).doesNotContain(ConfigureWifiSettings.KEY_IP_ADDRESS);
}
}
diff --git a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
index c122a65..8d1b8ac 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
@@ -17,16 +17,14 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.view.View;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wifi.AccessPoint;
@@ -36,11 +34,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ConnectedAccessPointPreferenceTest {
+
@Mock
private AccessPoint mAccessPoint;
@Mock
@@ -50,7 +47,6 @@
private Context mContext;
private ConnectedAccessPointPreference mConnectedAccessPointPreference;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -63,7 +59,7 @@
@Test
public void testOnClick_gearClicked_listenerInvoked() {
- doReturn(R.id.settings_button).when(mView).getId();
+ when(mView.getId()).thenReturn(R.id.settings_button);
mConnectedAccessPointPreference.onClick(mView);
@@ -79,7 +75,7 @@
@Test
public void testWidgetLayoutPreference() {
- assertThat(mConnectedAccessPointPreference.getWidgetLayoutResource()).isEqualTo(
- R.layout.preference_widget_gear_no_bg);
+ assertThat(mConnectedAccessPointPreference.getWidgetLayoutResource())
+ .isEqualTo(R.layout.preference_widget_gear_no_bg);
}
}
diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
index 9321827..1530288 100644
--- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
@@ -28,17 +28,14 @@
import com.android.settings.LinkifyUtils;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class LinkablePreferenceTest {
private static final String TITLE = "Title";
@@ -54,14 +51,13 @@
MockitoAnnotations.initMocks(this);
mPreference = new LinkablePreference(mContext);
- final CharSequence linkableDescription =
- mContext.getResources().getText(R.string.wifi_scan_notify_text);
+ final CharSequence linkableDescription = mContext.getText(R.string.wifi_scan_notify_text);
final LinkifyUtils.OnClickListener clickListener = () -> {/* Do nothing */ };
mPreference.setText(TITLE, linkableDescription, clickListener);
LayoutInflater inflater = LayoutInflater.from(mContext);
- mView = inflater.inflate(
- mPreference.getLayoutResource(), new LinearLayout(mContext), false);
+ mView =
+ inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext), false);
mHolder = PreferenceViewHolder.createInstanceForTests(mView);
mPreference.onBindViewHolder(mHolder);
@@ -70,6 +66,7 @@
@Test
public void prefWithLinkShouldHaveAccessibilityMovementMethodSet() {
TextView textView = mView.findViewById(android.R.id.title);
+ assertThat(textView).isNotNull();
assertThat(textView.getMovementMethod()).isNotNull();
}
}
diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
index b83a3e3..b8d9479 100644
--- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
@@ -17,9 +17,7 @@
package com.android.settings.wifi;
import static android.provider.Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -29,7 +27,6 @@
import android.support.v7.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
@@ -37,10 +34,8 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NotifyOpenNetworkPreferenceControllerTest {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
index a6c3b2b..ca63643 100644
--- a/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/SavedAccessPointsWifiSettingsTest.java
@@ -16,27 +16,28 @@
package com.android.settings.wifi;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager.ActionListener;
import android.os.Handler;
-import com.android.settings.TestConfig;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.WifiManagerWrapper;
import com.android.settingslib.wifi.AccessPoint;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SavedAccessPointsWifiSettingsTest {
@Mock private WifiManagerWrapper mockWifiManager;
@@ -67,21 +68,21 @@
mSettings.onForget(null);
- verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
+ verify(mHandler).sendEmptyMessage(SavedAccessPointsWifiSettings.MSG_UPDATE_PREFERENCES);
}
@Test
public void onForget_onSuccess_shouldSendMessageToHandler() {
mSettings.mForgetListener.onSuccess();
- verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
+ verify(mHandler).sendEmptyMessage(SavedAccessPointsWifiSettings.MSG_UPDATE_PREFERENCES);
}
@Test
public void onForget_onFailure_shouldSendMessageToHandler() {
mSettings.mForgetListener.onFailure(0);
- verify(mHandler).sendEmptyMessage(mSettings.MSG_UPDATE_PREFERENCES);
+ verify(mHandler).sendEmptyMessage(SavedAccessPointsWifiSettings.MSG_UPDATE_PREFERENCES);
}
@Test
@@ -89,12 +90,13 @@
mSettings.onSubmit(mockWifiDialog);
verify(mockWifiManager).save(eq(mockWifiConfiguration), any(ActionListener.class));
}
+
@Test
public void onForget_shouldInvokeForgetApi() {
ReflectionHelpers.setField(mSettings, "mSelectedAccessPoint", mockAccessPoint);
when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfiguration);
mSettings.onForget(mockWifiDialog);
- verify(mockWifiManager).forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
+ verify(mockWifiManager)
+ .forget(eq(mockWifiConfiguration.networkId), any(ActionListener.class));
}
}
-
diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
index 16d883a..46a7cb2 100644
--- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
@@ -37,12 +37,11 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.NetworkScoreManagerWrapper;
import com.android.settingslib.core.lifecycle.Lifecycle;
-
import com.google.common.collect.Lists;
+
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -52,14 +51,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class UseOpenWifiPreferenceControllerTest {
+
private static ComponentName sEnableActivityComponent;
private static NetworkScorerAppData sAppData;
private static NetworkScorerAppData sAppDataNoActivity;
@@ -71,10 +69,14 @@
sAppDataNoActivity = new NetworkScorerAppData(0, null, null, null, null);
}
- @Mock private Lifecycle mLifecycle;
- @Mock private Fragment mFragment;
- @Mock private NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
- @Captor private ArgumentCaptor<Intent> mIntentCaptor;
+ @Mock
+ private Lifecycle mLifecycle;
+ @Mock
+ private Fragment mFragment;
+ @Mock
+ private NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
+ @Captor
+ private ArgumentCaptor<Intent> mIntentCaptor;
private Context mContext;
private UseOpenWifiPreferenceController mController;
@@ -96,8 +98,8 @@
* First scorer in the list is the active scorer.
*/
private void setupScorers(@NonNull List<NetworkScorerAppData> scorers) {
- when(mNetworkScoreManagerWrapper.getActiveScorerPackage()).thenReturn(
- sEnableActivityComponent.getPackageName());
+ when(mNetworkScoreManagerWrapper.getActiveScorerPackage())
+ .thenReturn(sEnableActivityComponent.getPackageName());
when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(scorers);
when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(scorers.get(0));
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index e9b6146..bbe104c 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -16,6 +16,14 @@
package com.android.settings.wifi;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
@@ -25,7 +33,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settingslib.wifi.AccessPoint;
@@ -37,12 +44,8 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.*;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = ShadowConnectivityManager.class)
+@Config(shadows = ShadowConnectivityManager.class)
public class WifiConfigControllerTest {
@Mock
@@ -85,6 +88,7 @@
mController = new TestWifiConfigController(mConfigUiBase, mView, null /* accessPoint */,
WifiConfigUiBase.MODE_CONNECT);
final TextView ssid = mView.findViewById(R.id.ssid);
+ assertThat(ssid).isNotNull();
ssid.setText("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎");
mController.showWarningMessagesIfAppropriate();
@@ -98,6 +102,7 @@
WifiConfigUiBase.MODE_CONNECT);
final TextView ssid = mView.findViewById(R.id.ssid);
+ assertThat(ssid).isNotNull();
ssid.setText("123456789012345678901234567890");
mController.showWarningMessagesIfAppropriate();
@@ -114,6 +119,7 @@
@Test
public void isSubmittable_noSSID_shouldReturnFalse() {
final TextView ssid = mView.findViewById(R.id.ssid);
+ assertThat(ssid).isNotNull();
ssid.setText("");
assertThat(mController.isSubmittable()).isFalse();
}
@@ -121,6 +127,7 @@
@Test
public void isSubmittable_longPsk_shouldReturnFalse() {
final TextView password = mView.findViewById(R.id.password);
+ assertThat(password).isNotNull();
password.setText(LONG_PSK);
assertThat(mController.isSubmittable()).isFalse();
@@ -129,6 +136,7 @@
@Test
public void isSubmittable_shortPsk_shouldReturnFalse() {
final TextView password = mView.findViewById(R.id.password);
+ assertThat(password).isNotNull();
password.setText(SHORT_PSK);
assertThat(mController.isSubmittable()).isFalse();
}
@@ -136,6 +144,7 @@
@Test
public void isSubmittable_goodPsk_shouldReturnTrue() {
final TextView password = mView.findViewById(R.id.password);
+ assertThat(password).isNotNull();
password.setText(GOOD_PSK);
assertThat(mController.isSubmittable()).isTrue();
@@ -144,6 +153,7 @@
@Test
public void isSubmittable_hexPsk_shouldReturnTrue() {
final TextView password = mView.findViewById(R.id.password);
+ assertThat(password).isNotNull();
password.setText(HEX_PSK);
assertThat(mController.isSubmittable()).isTrue();
@@ -152,6 +162,7 @@
@Test
public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
final TextView password = mView.findViewById(R.id.password);
+ assertThat(password).isNotNull();
password.setText("");
when(mAccessPoint.isSaved()).thenReturn(true);
assertThat(mController.isSubmittable()).isTrue();
@@ -159,8 +170,8 @@
@Test
public void isSubmittable_nullAccessPoint_noException() {
- mController = new TestWifiConfigController(mConfigUiBase, mView, null,
- WifiConfigUiBase.MODE_CONNECT);
+ mController =
+ new TestWifiConfigController(mConfigUiBase, mView, null, WifiConfigUiBase.MODE_CONNECT);
mController.isSubmittable();
}
@@ -201,8 +212,8 @@
public class TestWifiConfigController extends WifiConfigController {
- public TestWifiConfigController(WifiConfigUiBase parent, View view,
- AccessPoint accessPoint, int mode) {
+ private TestWifiConfigController(
+ WifiConfigUiBase parent, View view, AccessPoint accessPoint, int mode) {
super(parent, view, accessPoint, mode);
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
index 394436c..8cdecff 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
@@ -17,13 +17,11 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import android.content.Intent;
import android.net.wifi.WifiConfiguration;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
@@ -40,19 +38,15 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- ShadowConnectivityManager.class,
- ShadowWifiManager.class
- }
+@Config(shadows = {
+ SettingsShadowResources.SettingsShadowTheme.class,
+ ShadowConnectivityManager.class,
+ ShadowWifiManager.class
+}
)
public class WifiDialogActivityTest {
- public static final String AP1_SSID = "\"ap1\"";
+ private static final String AP1_SSID = "\"ap1\"";
@Mock
private WifiConfigController mController;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
index 00941ad..7025100 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
@@ -5,12 +5,11 @@
import android.content.Context;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-
import com.android.settings.wifi.WifiDialog.WifiDialogListener;
import com.android.settingslib.wifi.AccessPoint;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -19,10 +18,8 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = ShadowEntityHeaderController.class)
+@Config(shadows = ShadowEntityHeaderController.class)
public class WifiDialogTest {
@Mock private AccessPoint mockAccessPoint;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
index 84549a6..b7bc33e 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
@@ -16,12 +16,15 @@
package com.android.settings.wifi;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -31,14 +34,8 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiEnablerTest {
@Mock
@@ -67,5 +64,4 @@
verify(mConnectivityManager).stopTethering(ConnectivityManager.TETHERING_WIFI);
}
-
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
index 08ee0ef..8c15d46 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
@@ -18,9 +18,7 @@
import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.verify;
@@ -34,7 +32,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -44,10 +41,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiInfoPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
index 82569c7..f6acafd 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
@@ -29,7 +29,6 @@
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.MasterSwitchPreference;
@@ -44,7 +43,6 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiMasterSwitchPreferenceControllerTest {
@Mock
@@ -56,14 +54,12 @@
private Context mContext;
private WifiMasterSwitchPreferenceController mController;
- private FakeFeatureFactory mFakeFeatureFactory;
private MetricsFeatureProvider mMetricsFeatureProvider;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
- mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
+ mMetricsFeatureProvider = FakeFeatureFactory.setupForTest().getMetricsFeatureProvider();
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
mController = new WifiMasterSwitchPreferenceController(mContext, mMetricsFeatureProvider);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
index 5f34800..ed312f4 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
@@ -16,12 +16,10 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.spy;
import android.content.Context;
-import com.android.settings.TestConfig;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,7 +33,6 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiSettingsTest {
private Context mContext;
@@ -49,8 +46,7 @@
@Test
public void testSearchIndexProvider_shouldIndexFragmentTitle() {
final List<SearchIndexableRaw> indexRes =
- WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext,
- true /* enabled */);
+ WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).key).isEqualTo(WifiSettings.DATA_KEY_REFERENCE);
@@ -60,8 +56,7 @@
@Config(qualifiers = "mcc999")
public void testSearchIndexProvider_ifWifiSettingsNotVisible_shouldNotIndexFragmentTitle() {
final List<SearchIndexableRaw> indexRes =
- WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext,
- true /* enabled */);
+ WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true /* enabled */);
assertThat(indexRes).isEmpty();
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
index 4507e54..fcfadda 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
@@ -16,6 +16,12 @@
package com.android.settings.wifi;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -24,7 +30,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
import com.android.settingslib.wifi.WifiStatusTracker;
@@ -35,16 +40,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiSummaryUpdaterTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -102,8 +99,8 @@
public void getSummary_wifiDisabled_shouldReturnDisabled() {
mWifiTracker.enabled = false;
- assertThat(mSummaryUpdater.getSummary()).isEqualTo(
- mContext.getString(R.string.switch_off_text));
+ assertThat(mSummaryUpdater.getSummary())
+ .isEqualTo(mContext.getString(R.string.switch_off_text));
}
@Test
@@ -111,8 +108,8 @@
mWifiTracker.enabled = true;
mWifiTracker.connected = false;
- assertThat(mSummaryUpdater.getSummary()).isEqualTo(
- mContext.getString(R.string.disconnected));
+ assertThat(mSummaryUpdater.getSummary())
+ .isEqualTo(mContext.getString(R.string.disconnected));
}
@Test
@@ -132,5 +129,4 @@
this.summary = summary;
}
}
-
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
index 1ccdb1f..197fd40 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
@@ -16,18 +16,14 @@
package com.android.settings.wifi;
+import static com.google.common.truth.Truth.assertThat;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiUtilsTest {
@Test
@@ -48,5 +44,4 @@
assertThat(WifiUtils.isPasswordValid("1234567890")).isTrue();
assertThat(WifiUtils.isPasswordValid(longPassword)).isFalse();
}
-
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
index 28ab166..7bc51e9 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
@@ -29,7 +29,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.After;
@@ -38,17 +37,10 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = { SettingsShadowResources.class })
public class WifiWakeupPreferenceControllerTest {
- private static final String TEST_SCORER_PACKAGE_NAME = "Test Scorer";
-
private Context mContext;
private WifiWakeupPreferenceController mController;
diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
index 5e10e0f..ce6bb71 100644
--- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
@@ -17,7 +17,6 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.when;
import android.app.Activity;
@@ -25,7 +24,6 @@
import android.view.inputmethod.InputMethodManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowNfcAdapter;
import com.android.settings.wrapper.WifiManagerWrapper;
@@ -40,14 +38,13 @@
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(
- manifest = TestConfig.MANIFEST_PATH,
- sdk = TestConfig.SDK_VERSION,
- shadows = ShadowNfcAdapter.class
-)
+@Config(shadows = ShadowNfcAdapter.class)
public class WriteWifiConfigToNfcDialogTest {
- @Mock Activity mActivity;
- @Mock WifiManagerWrapper mWifiManager;
+
+ @Mock
+ Activity mActivity;
+ @Mock
+ WifiManagerWrapper mWifiManager;
private WriteWifiConfigToNfcDialog mWriteWifiConfigToNfcDialog;
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index ca2cac0..a0238b4 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -16,14 +16,11 @@
package com.android.settings.wifi.details;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
@@ -63,7 +60,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBidiFormatter;
@@ -99,13 +95,12 @@
import java.util.stream.Collectors;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- ShadowDevicePolicyManagerWrapper.class,
- ShadowEntityHeaderController.class,
- ShadowPackageManagerWrapper.class,
- ShadowBidiFormatter.class
- })
+@Config(shadows = {
+ ShadowDevicePolicyManagerWrapper.class,
+ ShadowEntityHeaderController.class,
+ ShadowPackageManagerWrapper.class,
+ ShadowBidiFormatter.class
+})
public class WifiDetailPreferenceControllerTest {
private static final int LEVEL = 1;
@@ -117,41 +112,69 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PreferenceScreen mockScreen;
- @Mock private AccessPoint mockAccessPoint;
- @Mock private Activity mockActivity;
- @Mock private ConnectivityManager mockConnectivityManager;
- @Mock private ConnectivityManagerWrapper mockConnectivityManagerWrapper;
- @Mock private Network mockNetwork;
- @Mock private NetworkInfo mockNetworkInfo;
- @Mock private WifiConfiguration mockWifiConfig;
- @Mock private WifiInfo mockWifiInfo;
- @Mock private WifiNetworkDetailsFragment mockFragment;
- @Mock private WifiManager mockWifiManager;
- @Mock private MetricsFeatureProvider mockMetricsFeatureProvider;
- @Mock private WifiDetailPreferenceController.IconInjector mockIconInjector;
+ @Mock
+ private AccessPoint mockAccessPoint;
+ @Mock
+ private Activity mockActivity;
+ @Mock
+ private ConnectivityManager mockConnectivityManager;
+ @Mock
+ private ConnectivityManagerWrapper mockConnectivityManagerWrapper;
+ @Mock
+ private Network mockNetwork;
+ @Mock
+ private NetworkInfo mockNetworkInfo;
+ @Mock
+ private WifiConfiguration mockWifiConfig;
+ @Mock
+ private WifiInfo mockWifiInfo;
+ @Mock
+ private WifiNetworkDetailsFragment mockFragment;
+ @Mock
+ private WifiManager mockWifiManager;
+ @Mock
+ private MetricsFeatureProvider mockMetricsFeatureProvider;
+ @Mock
+ private WifiDetailPreferenceController.IconInjector mockIconInjector;
- @Mock (answer = Answers.RETURNS_DEEP_STUBS)
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private EntityHeaderController mockHeaderController;
- @Mock (answer = Answers.RETURNS_DEEP_STUBS)
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private LayoutPreference mockHeaderLayoutPreference;
- @Mock private ImageView mockHeaderIcon;
+ @Mock
+ private ImageView mockHeaderIcon;
- @Mock private ActionButtonPreference mockButtonsPref;
- @Mock private WifiDetailPreference mockSignalStrengthPref;
- @Mock private WifiDetailPreference mockLinkSpeedPref;
- @Mock private WifiDetailPreference mockFrequencyPref;
- @Mock private WifiDetailPreference mockSecurityPref;
- @Mock private WifiDetailPreference mockMacAddressPref;
- @Mock private WifiDetailPreference mockIpAddressPref;
- @Mock private WifiDetailPreference mockGatewayPref;
- @Mock private WifiDetailPreference mockSubnetPref;
- @Mock private WifiDetailPreference mockDnsPref;
- @Mock private PreferenceCategory mockIpv6Category;
- @Mock private WifiDetailPreference mockIpv6AddressesPref;
+ @Mock
+ private ActionButtonPreference mockButtonsPref;
+ @Mock
+ private WifiDetailPreference mockSignalStrengthPref;
+ @Mock
+ private WifiDetailPreference mockLinkSpeedPref;
+ @Mock
+ private WifiDetailPreference mockFrequencyPref;
+ @Mock
+ private WifiDetailPreference mockSecurityPref;
+ @Mock
+ private WifiDetailPreference mockMacAddressPref;
+ @Mock
+ private WifiDetailPreference mockIpAddressPref;
+ @Mock
+ private WifiDetailPreference mockGatewayPref;
+ @Mock
+ private WifiDetailPreference mockSubnetPref;
+ @Mock
+ private WifiDetailPreference mockDnsPref;
+ @Mock
+ private PreferenceCategory mockIpv6Category;
+ @Mock
+ private WifiDetailPreference mockIpv6AddressesPref;
- @Captor private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
- @Captor private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
- @Captor private ArgumentCaptor<Preference> mIpv6AddressCaptor;
+ @Captor
+ private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
+ @Captor
+ private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
+ @Captor
+ private ArgumentCaptor<Preference> mIpv6AddressCaptor;
private Context mContext;
private Lifecycle mLifecycle;
@@ -348,8 +371,8 @@
displayAndResume();
mController.onPause();
- verify(mockConnectivityManager, times(1)).unregisterNetworkCallback(
- mCallbackCaptor.getValue());
+ verify(mockConnectivityManager, times(1))
+ .unregisterNetworkCallback(mCallbackCaptor.getValue());
}
@Test
@@ -472,8 +495,7 @@
@Test
public void noLinkProperties_allIpDetailsHidden() {
when(mockConnectivityManager.getLinkProperties(mockNetwork)).thenReturn(null);
- reset(mockIpv6Category, mockIpAddressPref, mockSubnetPref, mockGatewayPref,
- mockDnsPref);
+ reset(mockIpv6Category, mockIpAddressPref, mockSubnetPref, mockGatewayPref, mockDnsPref);
displayAndResume();
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
index f624bd5..d568004 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.wifi.details;
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -25,7 +24,6 @@
import android.support.v7.preference.DropDownPreference;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -33,14 +31,13 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiMeteredPreferenceControllerTest {
- public static final int METERED_OVERRIDE_NONE = 0;
- public static final int METERED_OVERRIDE_METERED = 1;
- public static final int METERED_OVERRIDE_NOT_METERED = 2;
+
+ private static final int METERED_OVERRIDE_NONE = 0;
+ private static final int METERED_OVERRIDE_METERED = 1;
+ private static final int METERED_OVERRIDE_NOT_METERED = 2;
@Mock
private WifiConfiguration mWifiConfiguration;
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
index 4fad863..f57c7eb 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
@@ -27,7 +27,6 @@
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,10 +35,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class P2pCategoryPreferenceControllerTest {
@Mock
@@ -54,7 +51,6 @@
when(mPreferenceScreen.findPreference(anyString())).thenReturn(mCategory);
mController = new P2pCategoryPreferenceController(RuntimeEnvironment.application) {
-
@Override
public String getPreferenceKey() {
return "test_key";
@@ -68,7 +64,6 @@
assertThat(mController.isAvailable()).isTrue();
}
-
@Test
public void removeAllChildren_shouldRemove() {
mController.removeAllChildren();
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
index 62fd01f..d0f9481 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
@@ -16,13 +16,15 @@
package com.android.settings.wifi.p2p;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
import android.net.wifi.p2p.WifiP2pDevice;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
@@ -30,14 +32,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class P2pThisDevicePreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
index 5c141ec..86d4957 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -17,9 +17,7 @@
import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE;
import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME;
-
import static com.google.common.truth.Truth.assertThat;
-
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.times;
@@ -35,7 +33,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,10 +42,8 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiP2PPreferenceControllerTest {
@Mock
@@ -69,10 +64,8 @@
MockitoAnnotations.initMocks(this);
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
- when(mContext.getSystemService(WifiManager.class))
- .thenReturn(mWifiManager);
- when(mScreen.findPreference(anyString()))
- .thenReturn(mWifiDirectPreference);
+ when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
+ when(mScreen.findPreference(anyString())).thenReturn(mWifiDirectPreference);
mController = new WifiP2pPreferenceController(mContext, mLifecycle, mWifiManager);
}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
index 583bd52..b6bf7e7 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
@@ -25,39 +25,36 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.content.Intent;
import android.content.SharedPreferences;
import android.net.wifi.WifiManager;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import java.util.ArrayList;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.shadows.ShadowApplication.Wrapper;
import org.robolectric.util.ReflectionHelpers;
+import java.util.ArrayList;
+
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TetherServiceTest {
@Mock
private Context mContext;
- private ShadowApplication mShadowApplication;
private Context mAppContext;
private TetherService mService;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mShadowApplication = ShadowApplication.getInstance();
- mAppContext = mShadowApplication.getApplicationContext();
+ mAppContext = RuntimeEnvironment.application;
mService = new TetherService();
ReflectionHelpers.setField(mService, "mBase", mAppContext);
mService.setHotspotOffReceiver(new HotspotOffReceiver(mContext));
@@ -69,8 +66,15 @@
mService.scheduleAlarm();
- assertThat(mShadowApplication.hasReceiverForIntent(
- new Intent(WifiManager.WIFI_AP_STATE_CHANGED_ACTION))).isTrue();
+ boolean found = false;
+ for (Wrapper wrapper : ShadowApplication.getInstance().getRegisteredReceivers()) {
+ if (wrapper.intentFilter.matchAction(WifiManager.WIFI_AP_STATE_CHANGED_ACTION)) {
+ found = true;
+ break;
+ }
+ }
+
+ assertThat(found).isTrue();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
index 2a633d9..3f364f9 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
@@ -29,7 +29,6 @@
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -39,10 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiTetherApBandPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java
index 3f820c3..2b14e88 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java
@@ -22,7 +22,6 @@
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -30,11 +29,10 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiTetherAutoOffPreferenceControllerTest {
+
private static final String KEY_PREF = "wifi_tether_auto_off";
private static final int ON = 1;
private static final int OFF = 0;
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
index a6d536d..58f31b1 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import android.net.wifi.WifiManager;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.ValidatedEditTextPreference;
@@ -39,11 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiTetherPasswordPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
index 92303e0..48437c3 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
@@ -18,13 +18,10 @@
import static android.arch.lifecycle.Lifecycle.Event.ON_START;
import static android.arch.lifecycle.Lifecycle.Event.ON_STOP;
-
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.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -42,8 +39,6 @@
import android.provider.Settings;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.R;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.MasterSwitchPreference;
@@ -59,18 +54,14 @@
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowSettings;
import org.robolectric.util.ReflectionHelpers;
-import java.util.ArrayList;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows = {
- WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class,
- WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class,
- WifiTetherPreferenceControllerTest.ShadowWifiTetherSoftApManager.class
- })
+@Config(shadows = {
+ WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class,
+ WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class,
+ WifiTetherPreferenceControllerTest.ShadowWifiTetherSoftApManager.class
+})
public class WifiTetherPreferenceControllerTest {
private static final String SSID = "Pixel";
@@ -177,7 +168,7 @@
public void testReceiver_goingToAirplaneMode_shouldClearPreferenceSummary() {
final ContentResolver cr = mock(ContentResolver.class);
when(mContext.getContentResolver()).thenReturn(cr);
- ShadowSettings.ShadowGlobal.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, 1);
+ Settings.Global.putInt(cr, Settings.Global.AIRPLANE_MODE_ON, 1);
mController.displayPreference(mScreen);
final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
final Intent broadcast = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
@@ -242,8 +233,8 @@
@Implements(WifiTetherSwitchBarController.class)
public static final class ShadowWifiTetherSwitchBarController {
- public static boolean onStartCalled;
- public static boolean onStopCalled;
+ private static boolean onStartCalled;
+ private static boolean onStopCalled;
public static void reset() {
onStartCalled = false;
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
index 1cba30e..f5e643d 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import android.net.wifi.WifiManager;
import android.support.v7.preference.PreferenceScreen;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.ValidatedEditTextPreference;
@@ -39,10 +38,8 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiTetherSSIDPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
index 9cb19c0..8c84575 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -20,15 +20,12 @@
import android.net.wifi.WifiConfiguration;
-import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class WifiTetherSettingsTest {
@Test